← Back to branch summary

~berthold-daum/zora/trunk

« back to all changes in this revision

Viewing changes to com.bdaum.zoom.operations/src/com/bdaum/zoom/operations/internal/MergeCatOperation.java

  • Committer: bdaum
  • Date: 2015-12-26 10:21:51 UTC
  • Revision ID: berthold.daum@bdaum.de-20151226102151-44f1j5113167thb9
Version 2.4.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
com.bdaum.zoom.operations/src/com/bdaum/zoom/operations/internal/MergeCatOperation.java
675
675
 
676
676
        private IdentifiableObject getPresentationShadow(IdentifiableObject show,
677
677
                        String value) {
678
 
                List<? extends IdentifiableObject> set = dbManager.obtainObjects(
679
 
                                show.getClass(), "name", value, QueryField.EQUALS); //$NON-NLS-1$
680
 
                return set.isEmpty() ? null : set.get(0);
 
678
                Iterator<? extends IdentifiableObject> it = dbManager.obtainObjects(
 
679
                                show.getClass(), "name", value, QueryField.EQUALS).iterator(); //$NON-NLS-1$
 
680
                return it.hasNext() ? it.next() : null;
681
681
        }
682
682
 
683
683
        private void mergeStructures(final String sourceAssetId,
907
907
        private IdentifiableObject findShadow(final IdentifiableObject orig) {
908
908
                String id = orig.getStringId();
909
909
                orig.setStringId(null);
910
 
                List<IdentifiableObject> artset = dbManager.queryByExample(orig);
 
910
                Iterator<IdentifiableObject> it = dbManager.queryByExample(orig).iterator();
911
911
                orig.setStringId(id);
912
 
                return (artset.isEmpty()) ? null : artset.get(0);
 
912
                return (it.hasNext()) ? it.next() : null;
913
913
        }
914
914
 
915
915
        private void mergeAsset(AssetImpl source, AssetImpl target) {