ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r898480 - in /ant/ivy/ivyde/trunk: ./ org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/ org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ test/variable-ivy/ test/variable-ivy/src/
Date Tue, 12 Jan 2010 19:32:20 GMT
Author: hibou
Date: Tue Jan 12 19:32:20 2010
New Revision: 898480

URL: http://svn.apache.org/viewvc?rev=898480&view=rev
Log:
IVYDE-228:
 - add a test project to reproduce the bug
 - fix the propagation of the update event

Added:
    ant/ivy/ivyde/trunk/test/variable-ivy/   (with props)
    ant/ivy/ivyde/trunk/test/variable-ivy/.classpath
    ant/ivy/ivyde/trunk/test/variable-ivy/.project
    ant/ivy/ivyde/trunk/test/variable-ivy/confs.xml   (with props)
    ant/ivy/ivyde/trunk/test/variable-ivy/ivy.properties   (with props)
    ant/ivy/ivyde/trunk/test/variable-ivy/ivy.xml   (with props)
    ant/ivy/ivyde/trunk/test/variable-ivy/ivysettings.xml   (with props)
    ant/ivy/ivyde/trunk/test/variable-ivy/src/
Modified:
    ant/ivy/ivyde/trunk/CHANGES.txt
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java

Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=898480&r1=898479&r2=898480&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Tue Jan 12 19:32:20 2010
@@ -27,6 +27,7 @@
 - FIX: Ivy settings file cannot be loaded via http url (IVYDE-218)
 - FIX: The workspace resolver doesn't resolve conflicts correctly (IVYDE-212)
 - FIX: dependency order not preserved causing failed builds (IVYDE-170)
+- FIX: Can not add a project specific property file when adding a library (IVYDE-228)
 
   version 2.0.0 final
 ==========================

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java?rev=898480&r1=898479&r2=898480&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/cpcontainer/IvydeContainerPage.java
Tue Jan 12 19:32:20 2010
@@ -591,18 +591,21 @@
 
     void updateFieldsStatusSettings() {
         boolean projectSpecific = settingsProjectSpecificButton.getSelection();
+        conf.setSettingsProjectSpecific(projectSpecific);
         mainGeneralSettingsLink.setEnabled(!projectSpecific);
         settingsEditor.setEnabled(projectSpecific);
     }
 
     void updateFieldsStatusRetrieve() {
         boolean projectSpecific = retrieveProjectSpecificButton.getSelection();
+        conf.setRetrieveProjectSpecific(projectSpecific);
         retrieveGeneralSettingsLink.setEnabled(!projectSpecific);
         retrieveComposite.setEnabled(projectSpecific);
     }
 
     void updateFieldsStatusAdvanced() {
         boolean projectSpecific = advancedProjectSpecificButton.getSelection();
+        conf.setAdvancedProjectSpecific(projectSpecific);
         advancedGeneralSettingsLink.setEnabled(!projectSpecific);
         acceptedSuffixesTypesComposite.setEnabled(projectSpecific);
         alphaOrderCheck.setEnabled(projectSpecific);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java?rev=898480&r1=898479&r2=898480&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/PathEditor.java
Tue Jan 12 19:32:20 2010
@@ -23,6 +23,8 @@
 import org.eclipse.debug.ui.StringVariableSelectionDialog;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -59,6 +61,11 @@
         l.setText(label);
 
         text = createText(this);
+        text.addModifyListener(new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                textUpdated();
+            }
+        });
 
         Composite buttons = new Composite(this, SWT.NONE);
         buttons.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, true, 2,
1));

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java?rev=898480&r1=898479&r2=898480&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/SettingsEditor.java
Tue Jan 12 19:32:20 2010
@@ -113,11 +113,6 @@
                 settingsText.setToolTipText(TOOLTIP_SETTINGS_PATH);
                 settingsTextDeco.getLayoutControl().setLayoutData(
                     new GridData(GridData.FILL, GridData.CENTER, true, false));
-                settingsText.addModifyListener(new ModifyListener() {
-                    public void modifyText(ModifyEvent e) {
-                        settingsPathUpdated();
-                    }
-                });
 
                 return settingsText;
             }
@@ -138,6 +133,7 @@
             protected void setFile(String f) {
                 try {
                     getText().setText(new File(f).toURI().toURL().toExternalForm());
+                    textUpdated();
                 } catch (MalformedURLException ex) {
                     // this cannot happen
                     IvyPlugin.log(IStatus.ERROR,
@@ -152,6 +148,7 @@
         settingsEditor.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 
         propFilesEditor = new PathEditor(this, SWT.NONE, "Property files:", null) {
+
             protected void textUpdated() {
                 settingsPathUpdated();
             }

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 12 19:32:20 2010
@@ -0,0 +1 @@
+bin

Added: ant/ivy/ivyde/trunk/test/variable-ivy/.classpath
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/variable-ivy/.classpath?rev=898480&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/variable-ivy/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/variable-ivy/.classpath Tue Jan 12 19:32:20 2010
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=%24%7Bworkspace_loc%3Aivydetest-variables-ivy%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles=%24%7Bworkspace_loc%3Aivydetest-variables-ivy%2Fivy.properties%7D"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: ant/ivy/ivyde/trunk/test/variable-ivy/.project
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/variable-ivy/.project?rev=898480&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/variable-ivy/.project (added)
+++ ant/ivy/ivyde/trunk/test/variable-ivy/.project Tue Jan 12 19:32:20 2010
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<projectDescription>
+	<name>ivydetest-variables-ivy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Added: ant/ivy/ivyde/trunk/test/variable-ivy/confs.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/variable-ivy/confs.xml?rev=898480&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/variable-ivy/confs.xml (added)
+++ ant/ivy/ivyde/trunk/test/variable-ivy/confs.xml Tue Jan 12 19:32:20 2010
@@ -0,0 +1,5 @@
+<configurations>
+<conf name="default" />
+<conf name="test" />
+<conf name="ivyde-sources" />
+</configurations>
\ No newline at end of file

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/confs.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/confs.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/confs.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/ivyde/trunk/test/variable-ivy/ivy.properties
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/variable-ivy/ivy.properties?rev=898480&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/variable-ivy/ivy.properties (added)
+++ ant/ivy/ivyde/trunk/test/variable-ivy/ivy.properties Tue Jan 12 19:32:20 2010
@@ -0,0 +1 @@
+my.conf.file=confs.xml
\ No newline at end of file

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/ivy.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/ivy.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Added: ant/ivy/ivyde/trunk/test/variable-ivy/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/variable-ivy/ivy.xml?rev=898480&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/variable-ivy/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/variable-ivy/ivy.xml Tue Jan 12 19:32:20 2010
@@ -0,0 +1,30 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="1.0">
+    <info organisation="org.apache.ivyde" module="ivytest-variables-ivy">
+        <description>
+            Project with an ivy.xml with some variables
+        </description>
+    </info>
+    <configurations>
+        <include file="${ivy.settings.dir}/${my.conf.file}" />
+    </configurations>
+    <dependencies>
+    </dependencies>
+</ivy-module>

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/ivy.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/ivy.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ant/ivy/ivyde/trunk/test/variable-ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/variable-ivy/ivysettings.xml?rev=898480&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/variable-ivy/ivysettings.xml (added)
+++ ant/ivy/ivyde/trunk/test/variable-ivy/ivysettings.xml Tue Jan 12 19:32:20 2010
@@ -0,0 +1,6 @@
+<ivysettings>
+    <settings defaultResolver="ibiblio" />
+    <resolvers>
+        <ibiblio name="ibiblio" m2compatible="true" />
+    </resolvers>
+</ivysettings>

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/ivysettings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/ivysettings.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: ant/ivy/ivyde/trunk/test/variable-ivy/ivysettings.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message