[jboss-cvs] JBossAS SVN: r112638 - projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2012-02-13 05:53:00 -0500 (Mon, 13 Feb 2012)
New Revision: 112638

Modified:
   projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/AddPropertyDialog.java
   projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/DefinitionWizardPage.java
Log:
[JBJCA-731] 1.0 profile disable annotation, more properties type

Modified: projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/AddPropertyDialog.java
===================================================================
--- projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/AddPropertyDialog.java	2012-02-13 10:37:28 UTC (rev 112637)
+++ projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/AddPropertyDialog.java	2012-02-13 10:53:00 UTC (rev 112638)
@@ -110,7 +110,8 @@
       nameLabel.setFont(comp.getFont());
 
       final String[] items =
-      {"String", "Integer", "Float"};
+         {"String", "Boolean", "Integer", "Double", "Byte", "Short", "Long", "Float", "Character"};
+
       final Combo combo = new Combo(comp, SWT.DROP_DOWN | SWT.READ_ONLY);
       combo.setItems(items);
       combo.setText("String");

Modified: projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/DefinitionWizardPage.java
===================================================================
--- projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/DefinitionWizardPage.java	2012-02-13 10:37:28 UTC (rev 112637)
+++ projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/DefinitionWizardPage.java	2012-02-13 10:53:00 UTC (rev 112638)
@@ -54,6 +54,8 @@
    private ISelection selection;
 
    private Combo boundCombo;
+   
+   private Button annotationshButton;
 
    /**
     * Constructor for SampleNewWizardPage.
@@ -141,7 +143,7 @@
 
       label = new Label(container, SWT.NULL);
       label.setText("&Annotations:");
-      final Button annotationshButton = new Button(container, SWT.CHECK);
+      annotationshButton = new Button(container, SWT.CHECK);
       annotationshButton.setSelection(true);
       ((CodeGenWizard) getWizard()).getDef().setUseAnnotation(true);
       annotationshButton.addSelectionListener(new SelectionAdapter()
@@ -182,6 +184,8 @@
                {"Outbound"};
                boundCombo.setItems(newdirect);
                boundCombo.setText("Outbound");
+               annotationshButton.setSelection(false);
+               annotationshButton.setEnabled(false);
             }
             else
             {
@@ -189,6 +193,7 @@
                {"Outbound", "Inbound", "Bidirectional"};
                boundCombo.setItems(newdirect);
                boundCombo.setText("Outbound");
+               annotationshButton.setEnabled(true);
             }
          }
       });