Revert PixelsProcessor changes so that naming for Images is unchanged

ome · Dec 9, 2016 · cc042d8 · cc042d8
1 parent 94575d5
commit cc042d8
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/components/blitz/src/ome/formats/model/PixelsProcessor.java b/components/blitz/src/ome/formats/model/PixelsProcessor.java
@@ -125,18 +125,18 @@ public void process(IObjectContainerStore store) throws ModelException {
       }
 
       // Ensure that the Image name is set
-
-      // name supplied by user
       String userSpecifiedName = store.getUserSpecifiedName();
       if (userSpecifiedName != null) {
         userSpecifiedName = userSpecifiedName.trim();
         if (userSpecifiedName.isEmpty()) {
           userSpecifiedName = null;
         }
       }
-      // name that will actually be set on the Image
+      if (userSpecifiedName == null) {
+        File originalFile = new File(reader.getCurrentFile());
+        userSpecifiedName = originalFile.getName();
+      }
       String saveName = "";
-      // name supplied by the reader
       String imageName;
       if (image.getName() != null && image.getName().getValue() != null) {
         imageName = image.getName().getValue().trim();
@@ -155,17 +155,9 @@ public void process(IObjectContainerStore store) throws ModelException {
           }
           saveName += " [" + imageName + "]";
         }
-      } else if (imageName != null) {
+      } else {
         saveName = imageName;
       }
-      else {
-        saveName = reader.getCurrentFile();
-        saveName = saveName.substring(saveName.lastIndexOf(File.separator) + 1);
-        if (reader.getSeriesCount() > 1) {
-          saveName += " [" + imageIndex + "]";
-        }
-      }
-      // TODO: remove this if/when name is switched to TEXT in the DB
       if (saveName != null && saveName.length() > 255) {
         saveName = '…' + saveName.substring(saveName.length() - 254);
       }