BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
790395a
)
Fix issues with merge conflicts
author
Cherian Mathew
<c.mathew@bgbm.org>
Tue, 23 Jun 2015 11:01:02 +0000
(13:01 +0200)
committer
Cherian Mathew
<c.mathew@bgbm.org>
Tue, 23 Jun 2015 11:01:02 +0000
(13:01 +0200)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
index 5e33668e57a1e86744a9c0a8e23b71c23bab8058..3279e09ffa7a8fcd504354cbd89a69d26df2d3cd 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
@@
-942,5
+942,13
@@
public class TransientClassificationService implements IClassificationService {
return defaultService.createHierarchyInClassification(arg1, arg2);
}
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
+ */
+ @Override
+ public DeleteResult delete(UUID arg0) {
+ return defaultService.delete(arg0);
+ }
+
}
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
index bfd484b5e2a4e0c609c316f0d12e4a93301a48e4..fccff4b0e7ff964d02dcf1b3d3104cd763892943 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
@@
-704,12
+704,9
@@
public class TransientCollectionService implements ICollectionService {
return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
}
-<<<<<<< Updated upstream
@Override
public DeleteResult delete(UUID arg0) {
-
return defaultService.delete(arg0);
}
-=======
->>>>>>> Stashed changes
+
}