bz-1007781: Editors should not contain file extension of assets

AppFormer · Sep 18, 2013 · 6566d9a · 6566d9a
1 parent cda2c33
commit 6566d9a
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 2 deletions.
diff --git a/uberfire-api/src/main/java/org/uberfire/backend/vfs/impl/ObservablePathImpl.java b/uberfire-api/src/main/java/org/uberfire/backend/vfs/impl/ObservablePathImpl.java
@@ -62,6 +62,30 @@ public FileSystem getFileSystem() {
     public String getFileName() {
         return path.getFileName();
     }
+    @Override
+    public String getFileNameWithoutExtension() {
+        return removeExtension(path.getFileName());
+    }
+
+	public static String removeExtension(final String filename) {
+		if (filename == null) {
+			return null;
+		}
+		final int index = indexOfExtension(filename);
+		if (index == -1) {
+			return filename;
+		} else {
+			return filename.substring(0, index);
+		}
+	}
+
+	public static int indexOfExtension(final String filename) {
+		if (filename == null) {
+			return -1;
+		}
+		final int extensionPos = filename.lastIndexOf(".");
+		return extensionPos;
+	}
 
     @Override
     public String toURI() {

diff --git a/uberfire-backend/uberfire-backend-api/src/main/java/org/uberfire/backend/vfs/Path.java b/uberfire-backend/uberfire-backend-api/src/main/java/org/uberfire/backend/vfs/Path.java
@@ -21,6 +21,8 @@ public interface Path extends Comparable<Path> {
     FileSystem getFileSystem();
 
     String getFileName();
+
+    String getFileNameWithoutExtension();
 
     String toURI();
 

diff --git a/...fire-backend/uberfire-backend-api/src/main/java/org/uberfire/backend/vfs/PathFactory.java b/...fire-backend/uberfire-backend-api/src/main/java/org/uberfire/backend/vfs/PathFactory.java
@@ -81,7 +81,32 @@ public FileSystem getFileSystem() {
         public String getFileName() {
             return fileName;
         }
-
+
+        @Override
+        public String getFileNameWithoutExtension() {
+            return removeExtension(fileName);
+        }
+
+		public static String removeExtension(final String filename) {
+			if (filename == null) {
+				return null;
+			}
+			final int index = indexOfExtension(filename);
+			if (index == -1) {
+				return filename;
+			} else {
+				return filename.substring(0, index);
+			}
+		}
+
+		public static int indexOfExtension(final String filename) {
+			if (filename == null) {
+				return -1;
+			}
+			final int extensionPos = filename.lastIndexOf(".");
+			return extensionPos;
+		}
+
         @Override
         public String toURI() {
             return uri;
@@ -124,5 +149,4 @@ public String toString() {
                     '}';
         }
     }
-
 }
diff --git a/...-workbench/src/test/java/org/uberfire/client/mvp/AbstractWorkbenchEditorActivityTest.java b/...-workbench/src/test/java/org/uberfire/client/mvp/AbstractWorkbenchEditorActivityTest.java
@@ -50,6 +50,12 @@ public String toURI() {
             public int compareTo( final Path o ) {
                 return 0;
             }
+
+			@Override
+			public String getFileNameWithoutExtension() {
+				// TODO Auto-generated method stub
+				return null;
+			}
         } );
 
         final ObservablePath path = mock( ObservablePath.class );
@@ -102,6 +108,12 @@ public String toURI() {
             public int compareTo( final Path o ) {
                 return 0;
             }
+
+			@Override
+			public String getFileNameWithoutExtension() {
+				// TODO Auto-generated method stub
+				return null;
+			}
         } );
         final PlaceRequest somewhereTheSame = somewhere.clone();
 
@@ -161,6 +173,12 @@ public String toURI() {
             public int compareTo( final Path o ) {
                 return 0;
             }
+
+			@Override
+			public String getFileNameWithoutExtension() {
+				// TODO Auto-generated method stub
+				return null;
+			}
         } );
 
         final PlaceRequest somewhereElse = new PathPlaceRequest( new Path() {
@@ -183,6 +201,12 @@ public String toURI() {
             public int compareTo( final Path o ) {
                 return 0;
             }
+
+			@Override
+			public String getFileNameWithoutExtension() {
+				// TODO Auto-generated method stub
+				return null;
+			}
         } );
 
         //The first place