Salome HOME
projects
/
tools
/
siman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e8e274a
)
File naming strategy is set to "asis" and generated number is in the prefix now inste...
author
rkv
<rkv@opencascade.com>
Tue, 15 Jan 2013 13:01:40 +0000
(13:01 +0000)
committer
rkv
<rkv@opencascade.com>
Tue, 15 Jan 2013 13:01:40 +0000
(13:01 +0000)
Workspace/Siman-Common/src/org/splat/service/DocumentServiceImpl.java
patch
|
blob
|
history
Workspace/Siman-Common/src/test/som.xml
patch
|
blob
|
history
Workspace/Siman/WebContent/conf/som.xml
patch
|
blob
|
history
diff --git
a/Workspace/Siman-Common/src/org/splat/service/DocumentServiceImpl.java
b/Workspace/Siman-Common/src/org/splat/service/DocumentServiceImpl.java
index 61cda0b46ee7e5c8ccfa885e202e0548e3f7b13c..c8494b13e70cf1fcd931b082cd3b4ca9ba3152ab 100644
(file)
--- a/
Workspace/Siman-Common/src/org/splat/service/DocumentServiceImpl.java
+++ b/
Workspace/Siman-Common/src/org/splat/service/DocumentServiceImpl.java
@@
-126,7
+126,7
@@
public class DocumentServiceImpl implements DocumentService {
Study owner = dprop.getOwner().getOwnerStudy();
// Synchronize the object with the current Hibernate session.
Study owner = dprop.getOwner().getOwnerStudy();
// Synchronize the object with the current Hibernate session.
- //owner = getStudyDAO().merge(owner);
+ //
owner = getStudyDAO().merge(owner);
SimpleDateFormat tostring = new SimpleDateFormat("yyyy"); // RKV: NOPMD: TODO: Use locale here?
String year = tostring.format(owner.getDate());
SimpleDateFormat tostring = new SimpleDateFormat("yyyy"); // RKV: NOPMD: TODO: Use locale here?
String year = tostring.format(owner.getDate());
@@
-144,7
+144,7
@@
public class DocumentServiceImpl implements DocumentService {
.toString();
aDoc.getFile().changePath(path);
owner = getStudyDAO().merge(owner);
.toString();
aDoc.getFile().changePath(path);
owner = getStudyDAO().merge(owner);
-
//
getStudyDAO().update(owner);
+
//
getStudyDAO().update(owner);
}
/**
}
/**
@@
-167,8
+167,8
@@
public class DocumentServiceImpl implements DocumentService {
encoding.append(scope.getReference()).append("_").append(
tostring.format(number));
} else { // title and (temporarily) asis
encoding.append(scope.getReference()).append("_").append(
tostring.format(number));
} else { // title and (temporarily) asis
- encoding.append(
aDoc.getTitle()).append("_"
).append(
-
tostring.format(number
));
+ encoding.append(
"_").append(tostring.format(number)
).append(
+
aDoc.getFile().getName(
));
}
return encoding.toString();
}
}
return encoding.toString();
}
@@
-318,7
+318,7
@@
public class DocumentServiceImpl implements DocumentService {
aDoc.getAllRelations().add(attach);
getDocumentDAO().merge(aDoc);
aDoc.getAllRelations().add(attach);
getDocumentDAO().merge(aDoc);
-
+
return attach;
}
return attach;
}
@@
-745,6
+745,7
@@
public class DocumentServiceImpl implements DocumentService {
/**
* Get the relationDAO.
/**
* Get the relationDAO.
+ *
* @return the relationDAO
*/
public RelationDAO getRelationDAO() {
* @return the relationDAO
*/
public RelationDAO getRelationDAO() {
@@
-753,7
+754,9
@@
public class DocumentServiceImpl implements DocumentService {
/**
* Set the relationDAO.
/**
* Set the relationDAO.
- * @param relationDAO the relationDAO to set
+ *
+ * @param relationDAO
+ * the relationDAO to set
*/
public void setRelationDAO(final RelationDAO relationDAO) {
_relationDAO = relationDAO;
*/
public void setRelationDAO(final RelationDAO relationDAO) {
_relationDAO = relationDAO;
diff --git
a/Workspace/Siman-Common/src/test/som.xml
b/Workspace/Siman-Common/src/test/som.xml
index d6a34ef1cf01e8941139a527e5ed1da9a32e04f5..0d54cadf1fb1dcaaa58328ce3ec57769e9783a04 100644
(file)
--- a/
Workspace/Siman-Common/src/test/som.xml
+++ b/
Workspace/Siman-Common/src/test/som.xml
@@
-42,7
+42,7
@@
- Whatever is the naming scheme used, in order to avoid name clashes, file names are anyway suffixed by an index
unique in the scope of the owner study.
-->
- Whatever is the naming scheme used, in order to avoid name clashes, file names are anyway suffixed by an index
unique in the scope of the owner study.
-->
- <files name="
encoded
"/>
+ <files name="
asis
"/>
<!-- 2.3 Document versions format
-->
<!-- 2.3 Document versions format
-->
diff --git
a/Workspace/Siman/WebContent/conf/som.xml
b/Workspace/Siman/WebContent/conf/som.xml
index fb349b79bfa91f34d90b642038cf2af57ffaa867..8316a292bdd3375af163740784e45c05805b8414 100644
(file)
--- a/
Workspace/Siman/WebContent/conf/som.xml
+++ b/
Workspace/Siman/WebContent/conf/som.xml
@@
-42,7
+42,7
@@
- Whatever is the naming scheme used, in order to avoid name clashes, file names are anyway suffixed by an index
unique in the scope of the owner study.
-->
- Whatever is the naming scheme used, in order to avoid name clashes, file names are anyway suffixed by an index
unique in the scope of the owner study.
-->
- <files name="
encoded
"/>
+ <files name="
asis
"/>
<!-- 2.3 Document versions format
-->
<!-- 2.3 Document versions format
-->