ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1183641 - in /ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse: cpcontainer/IvydeContainerPage.java ui/AcceptedSuffixesTypesComposite.java ui/ClasspathTypeComposite.java
Date Sat, 15 Oct 2011 14:08:31 GMT
Author: hibou
Date: Sat Oct 15 14:08:30 2011
New Revision: 1183641

URL: http://svn.apache.org/viewvc?rev=1183641&view=rev
Log:
fix disable every field on select project specific settings

Modified:
    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/AcceptedSuffixesTypesComposite.java
    ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.java

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=1183641&r1=1183640&r2=1183641&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
Sat Oct 15 14:08:30 2011
@@ -109,6 +109,8 @@ public class IvydeContainerPage extends 
 
     private ClasspathTypeComposite classpathTypeComposite;
 
+    private Label alphaOrderLabel;
+
     /**
      * Constructor
      */
@@ -444,8 +446,8 @@ public class IvydeContainerPage extends 
         useExtendedResolveIdCheck
                 .setToolTipText("Will append status, branch and revision info to the default
resolve id");
 
-        Label label = new Label(configComposite, SWT.NONE);
-        label.setText("Order of the classpath entries:");
+        alphaOrderLabel = new Label(configComposite, SWT.NONE);
+        alphaOrderLabel.setText("Order of the classpath entries:");
 
         alphaOrderCheck = new Combo(configComposite, SWT.READ_ONLY);
         alphaOrderCheck
@@ -509,6 +511,7 @@ public class IvydeContainerPage extends 
         conf.setAdvancedProjectSpecific(projectSpecific);
         advancedGeneralSettingsLink.setEnabled(!projectSpecific);
         acceptedSuffixesTypesComposite.setEnabled(projectSpecific);
+        alphaOrderLabel.setEnabled(projectSpecific);
         alphaOrderCheck.setEnabled(projectSpecific);
         resolveInWorkspaceCheck.setEnabled(projectSpecific);
         useExtendedResolveIdCheck.setEnabled(projectSpecific);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java?rev=1183641&r1=1183640&r2=1183641&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/AcceptedSuffixesTypesComposite.java
Sat Oct 15 14:08:30 2011
@@ -43,14 +43,14 @@ public class AcceptedSuffixesTypesCompos
 
     public static final String TOOLTIP_JAVADOC_SUFFIXES = "Comma separated list of suffixes
to"
             + " match javadocs to artifacts.\nExample: -javadoc, -doc";
-    
+
     public static final String TOOLTIP_MAP_IF_ONLY_ONE_SOURCE = "Will map the source artifact"
             + " to all jar artifact in modules with multiple jar artifacts and only one"
-            + " source artifact";    
+            + " source artifact";
 
     public static final String TOOLTIP_MAP_IF_ONLY_ONE_JAVADOC = "Will map the javadoc artifact"
-        + " to all jar artifact in modules with multiple jar artifacts and only one"
-        + " javadoc artifact";    
+            + " to all jar artifact in modules with multiple jar artifacts and only one"
+            + " javadoc artifact";
 
     private Text acceptedTypesText;
 
@@ -66,6 +66,16 @@ public class AcceptedSuffixesTypesCompos
 
     private Button mapIfOnlyOneJavadocCheck;
 
+    private Label acceptedTypesLabel;
+
+    private Label sourceTypesLabel;
+
+    private Label sourceSuffixesLabel;
+
+    private Label javadocTypesLabel;
+
+    private Label javadocSuffixesLabel;
+
     public AcceptedSuffixesTypesComposite(Composite parent, int style) {
         super(parent, style);
         GridLayout layout = new GridLayout(2, false);
@@ -73,42 +83,41 @@ public class AcceptedSuffixesTypesCompos
         layout.marginWidth = 0;
         setLayout(layout);
 
-        Label label = new Label(this, SWT.NONE);
-        label.setText("Accepted types:");
+        acceptedTypesLabel = new Label(this, SWT.NONE);
+        acceptedTypesLabel.setText("Accepted types:");
 
         acceptedTypesText = new Text(this, SWT.SINGLE | SWT.BORDER);
         acceptedTypesText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
false));
         acceptedTypesText.setToolTipText(TOOLTIP_ACCEPTED_TYPES);
 
-        label = new Label(this, SWT.NONE);
-        label.setText("Sources types:");
+        sourceTypesLabel = new Label(this, SWT.NONE);
+        sourceTypesLabel.setText("Sources types:");
 
         sourceTypesText = new Text(this, SWT.SINGLE | SWT.BORDER);
-        sourceTypesText
-                .setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
+        sourceTypesText.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true,
false));
         sourceTypesText.setToolTipText(TOOLTIP_SOURCE_TYPES);
 
-        label = new Label(this, SWT.NONE);
-        label.setText("Sources suffixes:");
+        sourceSuffixesLabel = new Label(this, SWT.NONE);
+        sourceSuffixesLabel.setText("Sources suffixes:");
 
         sourceSuffixesText = new Text(this, SWT.SINGLE | SWT.BORDER);
         sourceSuffixesText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
false));
         sourceSuffixesText.setToolTipText(TOOLTIP_SOURCE_SUFFIXES);
 
-        label = new Label(this, SWT.NONE);
-        label.setText("Javadoc types:");
+        javadocTypesLabel = new Label(this, SWT.NONE);
+        javadocTypesLabel.setText("Javadoc types:");
 
         javadocTypesText = new Text(this, SWT.SINGLE | SWT.BORDER);
         javadocTypesText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
         javadocTypesText.setToolTipText(TOOLTIP_JAVADOC_TYPES);
 
-        label = new Label(this, SWT.NONE);
-        label.setText("Javadoc suffixes:");
+        javadocSuffixesLabel = new Label(this, SWT.NONE);
+        javadocSuffixesLabel.setText("Javadoc suffixes:");
 
         javadocSuffixesText = new Text(this, SWT.SINGLE | SWT.BORDER);
         javadocSuffixesText.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
false));
         javadocSuffixesText.setToolTipText(TOOLTIP_JAVADOC_SUFFIXES);
-        
+
         mapIfOnlyOneSourceCheck = new Button(this, SWT.CHECK);
         mapIfOnlyOneSourceCheck.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
true,
                 false, 2, 1));
@@ -120,7 +129,7 @@ public class AcceptedSuffixesTypesCompos
                 false, 2, 1));
         mapIfOnlyOneJavadocCheck.setText("Auto map jar artifacts with unique javadoc artifact");
         mapIfOnlyOneJavadocCheck.setToolTipText(TOOLTIP_MAP_IF_ONLY_ONE_JAVADOC);
-        
+
     }
 
     public void init(ContainerMappingSetup setup) {
@@ -135,10 +144,15 @@ public class AcceptedSuffixesTypesCompos
 
     public void setEnabled(boolean enabled) {
         super.setEnabled(enabled);
+        acceptedTypesLabel.setEnabled(enabled);
         acceptedTypesText.setEnabled(enabled);
+        sourceTypesLabel.setEnabled(enabled);
         sourceTypesText.setEnabled(enabled);
+        sourceSuffixesLabel.setEnabled(enabled);
         sourceSuffixesText.setEnabled(enabled);
+        javadocTypesLabel.setEnabled(enabled);
         javadocTypesText.setEnabled(enabled);
+        javadocSuffixesLabel.setEnabled(enabled);
         javadocSuffixesText.setEnabled(enabled);
         mapIfOnlyOneSourceCheck.setEnabled(enabled);
         mapIfOnlyOneJavadocCheck.setEnabled(enabled);

Modified: ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.java
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.java?rev=1183641&r1=1183640&r2=1183641&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.java
(original)
+++ ant/ivy/ivyde/trunk/org.apache.ivyde.eclipse/src/java/org/apache/ivyde/eclipse/ui/ClasspathTypeComposite.java
Sat Oct 15 14:08:30 2011
@@ -84,4 +84,11 @@ public class ClasspathTypeComposite exte
     public RetrieveSetup getRetrieveSetup() {
         return retrieveComposite.getRetrieveSetup();
     }
+    
+    public void setEnabled(boolean enabled) {
+        selectCache.setEnabled(enabled);
+        selectRetrieve.setEnabled(enabled);
+        retrieveComposite.setEnabled(enabled);
+        super.setEnabled(enabled);
+    }
 }



Mime
View raw message