Editor file name broken by putting dots for long names. Fix #21

gitools · Feb 11, 2013 · b9cf202 · b9cf202 · mpschr · Feb 11, 2013
1 parent 79e1895
commit b9cf202
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 25 deletions.
diff --git a/gitools-ui-app/src/main/java/org/gitools/ui/actions/analysis/CombinationsAction.java b/gitools-ui-app/src/main/java/org/gitools/ui/actions/analysis/CombinationsAction.java
@@ -111,7 +111,6 @@ public void run(IProgressMonitor monitor) {
                         editor.setName(analysis.getTitle() + "." + FileSuffixes.COMBINATION);
                     else
                         editor.setName(editorPanel.deriveName(currentEditor.getName(), ext, "", FileSuffixes.COMBINATION));
-                    editor.abbreviateName(Settings.getDefault().getEditorTabLength());
 
 					SwingUtilities.invokeLater(new Runnable() {
 						@Override

diff --git a/gitools-ui-app/src/main/java/org/gitools/ui/actions/analysis/CorrelationsAction.java b/gitools-ui-app/src/main/java/org/gitools/ui/actions/analysis/CorrelationsAction.java
@@ -115,7 +115,6 @@ public void run(IProgressMonitor monitor) {
                         editor.setName(analysis.getTitle() + "."+FileSuffixes.CORRELATIONS);
                     else
 					    editor.setName(editorPanel.deriveName(currentEditor.getName(), ext, "", FileSuffixes.CORRELATIONS));
-                    editor.abbreviateName(Settings.getDefault().getEditorTabLength());
 
 					SwingUtilities.invokeLater(new Runnable() {
 						@Override

diff --git a/gitools-ui-app/src/main/java/org/gitools/ui/actions/analysis/GroupComparisonAction.java b/gitools-ui-app/src/main/java/org/gitools/ui/actions/analysis/GroupComparisonAction.java
@@ -103,7 +103,6 @@ public void run(IProgressMonitor monitor) {
                         editor.setName(analysis.getTitle() + "." + FileSuffixes.GROUP_COMPARISON);
                     else
                         editor.setName(editorPanel.deriveName(currentEditor.getName(), ext, "", FileSuffixes.GROUP_COMPARISON));
-                    editor.abbreviateName(Settings.getDefault().getEditorTabLength());
 
 
                     SwingUtilities.invokeLater(new Runnable() {

diff --git a/gitools-ui-app/src/main/java/org/gitools/ui/actions/analysis/OverlappingsAction.java b/gitools-ui-app/src/main/java/org/gitools/ui/actions/analysis/OverlappingsAction.java
@@ -115,7 +115,6 @@ public void run(IProgressMonitor monitor) {
                         editor.setName(analysis.getTitle() + "."+FileSuffixes.OVERLAPPING);
                     else
                         editor.setName(editorPanel.deriveName(currentEditor.getName(), ext, "", FileSuffixes.OVERLAPPING));
-                    editor.abbreviateName(Settings.getDefault().getEditorTabLength());
 
                     SwingUtilities.invokeLater(new Runnable() {
 						@Override

diff --git a/gitools-ui-app/src/main/java/org/gitools/ui/actions/file/OpenAnalysisAction.java b/gitools-ui-app/src/main/java/org/gitools/ui/actions/file/OpenAnalysisAction.java
@@ -129,7 +129,6 @@ else if (mime.equals(MimeTypes.GROUPCOMPARISON_ANALYSIS))
                             editor = new GroupComparisonAnalysisEditor((GroupComparisonAnalysis) analysis);
 
 						editor.setName(file.getName());
-                        editor.abbreviateName(Settings.getDefault().getEditorTabLength());
 
                         final AbstractEditor newEditor = editor;
 						SwingUtilities.invokeLater(new Runnable() {

diff --git a/gitools-ui-app/src/main/java/org/gitools/ui/commands/CommandLoadFile.java b/gitools-ui-app/src/main/java/org/gitools/ui/commands/CommandLoadFile.java
@@ -92,7 +92,6 @@ public void execute(IProgressMonitor monitor) throws CommandException {
         final HeatmapEditor editor = new HeatmapEditor(figure);
 
         editor.setName(PersistenceUtils.getFileName(file.getName()));
-        editor.abbreviateName(Settings.getDefault().getEditorTabLength());
 
         SwingUtilities.invokeLater(new Runnable() {
             @Override

diff --git a/gitools-ui-platform/src/main/java/org/gitools/ui/platform/component/EditorTabComponent.java b/gitools-ui-platform/src/main/java/org/gitools/ui/platform/component/EditorTabComponent.java
@@ -6,6 +6,7 @@
  */
 package org.gitools.ui.platform.component;
 
+import org.apache.commons.lang.StringUtils;
 import org.gitools.ui.platform.editor.AbstractEditor;
 import org.gitools.ui.platform.editor.EditorsPanel;
 import org.gitools.ui.platform.editor.IEditor;
@@ -23,6 +24,8 @@
  */
 public class EditorTabComponent extends JPanel {
 
+    public static final int DEFAULT_EDITOR_TAB_LENGTH = 20;
+
 	private final EditorsPanel editorPanel;
 	private final AbstractEditor editor;
 
@@ -79,7 +82,20 @@ private void updateLabel() {
 
 
         String name = editor.getName();
-		label.setText(name);
+        String extension = "";
+        String filename = name;
+        String newname;
+
+        int i = name.lastIndexOf('.');
+        if (i > 0) {
+            extension = "." + name.substring(i+1);
+            filename = name.substring(0, name.lastIndexOf('.'));
+        }
+
+        //TODO allow the default editor tab length to be configurable
+        newname = StringUtils.abbreviate(filename, DEFAULT_EDITOR_TAB_LENGTH) + extension;
+
+		label.setText(newname);
         label.setIcon(editor.getIcon());
         label.setIconTextGap(3);
         label.setHorizontalTextPosition(SwingConstants.RIGHT);

diff --git a/gitools-ui-platform/src/main/java/org/gitools/ui/platform/editor/AbstractEditor.java b/gitools-ui-platform/src/main/java/org/gitools/ui/platform/editor/AbstractEditor.java
@@ -55,24 +55,6 @@ public void setName(String name) {
 		}
 	}
 
-    public void abbreviateName(int maxLength) {
-
-        String extension = "";
-        String filename = getName();
-        String name = getName();
-        String newname;
-
-        int i = name.lastIndexOf('.');
-        if (i > 0) {
-            extension = "." + name.substring(i+1);
-            filename = name.substring(0, name.lastIndexOf('.'));
-        }
-
-        newname = StringUtils.abbreviate(filename, maxLength) + extension;
-
-        setName(newname);
-    }
-
 	public File getFile() {
 		return file;
 	}