ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1374100 - in /ant/ivy/ivyde/trunk: doc/release-notes.html org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/FileListEditor.java org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java
Date Thu, 16 Aug 2012 23:10:54 GMT
Author: hibou
Date: Thu Aug 16 23:10:54 2012
New Revision: 1374100

URL: http://svn.apache.org/viewvc?rev=1374100&view=rev
Log:
IVYDE-318 : fix the update of the error marker each time the settings are updated

Modified:
    ant/ivy/ivyde/trunk/doc/release-notes.html
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/FileListEditor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java

Modified: ant/ivy/ivyde/trunk/doc/release-notes.html
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/doc/release-notes.html?rev=1374100&r1=1374099&r2=1374100&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/doc/release-notes.html (original)
+++ ant/ivy/ivyde/trunk/doc/release-notes.html Thu Aug 16 23:10:54 2012
@@ -128,6 +128,7 @@ List of changes since <a href="/ivy/ivyd
     <li>FIX: Divide by zero during IvyDE resolve (IVYDE-312) (thanks to Joe Sortelli)</li>
     <li>FIX: Ivy report view stopped working on Linux (IVYDE-292)</li>
     <li>FIX: Ivy settings URL is constructed incorrectly from environment variable
(IVYDE-314)</li>
+    <li>FIX: Incomplete variable substitution for ivysettings.xml (IVYDE-318)</li>
 </ul>
 <ul>
     <li>NEW: Support Accepted Types: * (IVYDE-306)</li>

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/FileListEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/FileListEditor.java?rev=1374100&r1=1374099&r2=1374100&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/FileListEditor.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/FileListEditor.java
Thu Aug 16 23:10:54 2012
@@ -91,6 +91,7 @@ public class FileListEditor extends Comp
                     if (!files.contains(dialog.getFile())) {
                         files.add(dialog.getFile());
                         filelist.refresh();
+                        fileListUpdated();
                     }
                 }
             }
@@ -104,6 +105,7 @@ public class FileListEditor extends Comp
                 List selection = ((IStructuredSelection) filelist.getSelection()).toList();
                 files.removeAll(selection);
                 filelist.refresh();
+                fileListUpdated();
                 remove.setEnabled(false);
             }
         });
@@ -118,6 +120,7 @@ public class FileListEditor extends Comp
                 files.set(i, files.get(i - 1));
                 files.set(i - 1, f);
                 filelist.refresh();
+                fileListUpdated();
                 updateUpDownEnableButtons(true);
             }
         });
@@ -132,6 +135,7 @@ public class FileListEditor extends Comp
                 files.set(i, files.get(i + 1));
                 files.set(i + 1, f);
                 filelist.refresh();
+                fileListUpdated();
                 updateUpDownEnableButtons(true);
             }
         });
@@ -161,27 +165,12 @@ public class FileListEditor extends Comp
         remove.setEnabled(false);
     }
 
-    public List getFiles() {
-        return files;
-    }
-
-    protected void addVariable(String variable) {
-        // TODO Auto-generated method stub
-        filelist.refresh();
-    }
-
-    protected void setFile(String file) {
-        if (!files.contains(file)) {
-            files.add(file);
-            filelist.refresh();
-        }
+    protected void fileListUpdated() {
+        // to be override to listen to changes
     }
 
-    protected void setWorkspaceLoc(String workspaceLoc) {
-        if (!files.contains(workspaceLoc)) {
-            files.add(workspaceLoc);
-            filelist.refresh();
-        }
+    public List getFiles() {
+        return files;
     }
 
     public void setEnabled(boolean enabled) {

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java?rev=1374100&r1=1374099&r2=1374100&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsSetupEditor.java
Thu Aug 16 23:10:54 2012
@@ -142,15 +142,24 @@ public class SettingsSetupEditor extends
             }
 
             protected void textUpdated() {
-                settingsPathUpdated();
+                settingsUpdated();
             }
         };
         settingsEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 
-        ivyUserDirEditor = new PathEditor(this, SWT.NONE, "Ivy user dir:", project, null);
+        ivyUserDirEditor = new PathEditor(this, SWT.NONE, "Ivy user dir:", project, null)
{
+            protected void textUpdated() {
+                settingsUpdated();
+            }
+        };
         ivyUserDirEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
-        
-        propFilesEditor = new FileListEditor(this, SWT.NONE, "Property files:", "Property
file:", project, "*.properties");
+
+        propFilesEditor = new FileListEditor(this, SWT.NONE, "Property files:", "Property
file:",
+                project, "*.properties") {
+            protected void fileListUpdated() {
+                settingsUpdated();
+            }
+        };
         propFilesEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
     }
 
@@ -179,7 +188,7 @@ public class SettingsSetupEditor extends
         }
     }
 
-    void settingsPathUpdated() {
+    void settingsUpdated() {
         synchronized (listeners) {
             SettingsSetup setup = getIvySettingsSetup();
             Iterator it = listeners.iterator();



Mime
View raw message