[jboss-cvs] JBossAS SVN: r112661 - projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Feb 19 21:54:00 EST 2012
Author: jeff.zhang
Date: 2012-02-19 21:53:58 -0500 (Sun, 19 Feb 2012)
New Revision: 112661
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/AoWizardPage.java
projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/BuildWizardPage.java
projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/InboundWizardPage.java
projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/McfWizardPage.java
projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/PropsContentProvider.java
projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/RaWizardPage.java
Log:
[JBJCA-731] gui text correction
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-16 22:15:19 UTC (rev 112660)
+++ projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/AddPropertyDialog.java 2012-02-20 02:53:58 UTC (rev 112661)
@@ -171,16 +171,13 @@
{
if (buttonId == IDialogConstants.OK_ID)
{
- //https://bugs.eclipse.org/bugs/show_bug.cgi?id=248316
name = nameText.getText().trim();
value = valueText.getText().trim();
- //fType = fTypeText.getText().trim();
}
else
{
name = null;
value = null;
- //fType = null;
}
super.buttonPressed(buttonId);
}
Modified: projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/AoWizardPage.java
===================================================================
--- projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/AoWizardPage.java 2012-02-16 22:15:19 UTC (rev 112660)
+++ projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/AoWizardPage.java 2012-02-20 02:53:58 UTC (rev 112661)
@@ -89,7 +89,7 @@
{
super("wizardPage");
setTitle("Create Admin Object");
- setDescription("Input Admin Object Information.");
+ setDescription("Input admin object information.");
this.selection = selection;
}
@@ -213,7 +213,7 @@
});
label = new Label(inContainer, SWT.NULL);
- label.setText("Admin object config properties:");
+ label.setText("Admin object properties:");
container = new Composite(wholeContainer, SWT.NULL);
layout = new GridLayout();
Modified: projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/BuildWizardPage.java
===================================================================
--- projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/BuildWizardPage.java 2012-02-16 22:15:19 UTC (rev 112660)
+++ projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/BuildWizardPage.java 2012-02-20 02:53:58 UTC (rev 112661)
@@ -53,7 +53,7 @@
public BuildWizardPage(ISelection selection)
{
super("wizardPage");
- setTitle("MBean and build information");
+ setTitle("MBean and Build");
setDescription("Input mbean and build information.");
this.selection = selection;
}
@@ -99,17 +99,26 @@
label.setText("&Build environment:");
final String[] items =
- {"ant", "ant+ivy", "maven"};
+ {"Apache Ant", "Apache Ant / Apache Ivy", "Apache Maven"};
final Combo combo = new Combo(container, SWT.DROP_DOWN | SWT.READ_ONLY);
combo.setItems(items);
- combo.setText("ant");
+ combo.setText("Apache Ant");
((CodeGenWizard) getWizard()).getDef().setVersion("ant");
combo.addSelectionListener(new SelectionAdapter()
{
public void widgetSelected(SelectionEvent e)
{
- ((CodeGenWizard) getWizard()).getDef().setVersion(combo.getText());
+ if (combo.getText().equals("Apache Maven"))
+ {
+ ((CodeGenWizard) getWizard()).getDef().setVersion("maven");
+ } else if (combo.getText().equals("Apache Ant"))
+ {
+ ((CodeGenWizard) getWizard()).getDef().setVersion("ant");
+ } else if (combo.getText().equals("Apache Ant / Apache Ivy"))
+ {
+ ((CodeGenWizard) getWizard()).getDef().setVersion("ant+ivy");
+ }
}
});
}
Modified: projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/InboundWizardPage.java
===================================================================
--- projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/InboundWizardPage.java 2012-02-16 22:15:19 UTC (rev 112660)
+++ projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/InboundWizardPage.java 2012-02-20 02:53:58 UTC (rev 112661)
@@ -90,7 +90,7 @@
{
super("wizardPage");
setTitle("Create Inbound");
- setDescription("Input Inbound Information.");
+ setDescription("Input inbound information.");
this.selection = selection;
}
@@ -120,7 +120,7 @@
}
Label label = new Label(inContainer, SWT.NULL);
- label.setText("MessageListener:");
+ label.setText("Message Listener:");
mlText = new Text(inContainer, SWT.BORDER | SWT.SINGLE);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -144,7 +144,7 @@
});
label = new Label(inContainer, SWT.NULL);
- label.setText("ActivationSpec:");
+ label.setText("Activation Spec:");
asText = new Text(inContainer, SWT.BORDER | SWT.SINGLE);
gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -167,7 +167,7 @@
});
label = new Label(inContainer, SWT.NULL);
- label.setText("ActivationSpec config properties:");
+ label.setText("Activation Spec properties:");
container = new Composite(wholeContainer, SWT.NULL);
layout = new GridLayout();
Modified: projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/McfWizardPage.java
===================================================================
--- projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/McfWizardPage.java 2012-02-16 22:15:19 UTC (rev 112660)
+++ projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/McfWizardPage.java 2012-02-20 02:53:58 UTC (rev 112661)
@@ -98,8 +98,8 @@
public McfWizardPage(ISelection selection)
{
super("wizardPage");
- setTitle("Create Mcf");
- setDescription("Input Mcf Information.");
+ setTitle("Create Management Connection Factory");
+ setDescription("Input management connection factory information.");
this.selection = selection;
}
@@ -156,7 +156,7 @@
});
label = new Label(mcfContainer, SWT.NULL);
- label.setText("Management Connection Factory Properties:");
+ label.setText("Management Connection Factory properties:");
container = new Composite(wholeContainer, SWT.NULL);
layout = new GridLayout();
@@ -219,7 +219,7 @@
});
label = new Label(mcfContainer, SWT.NULL);
- label.setText("Use CCi:");
+ label.setText("Use CCI:");
final Button cciButton = new Button(mcfContainer, SWT.CHECK);
cciButton.setSelection(false);
@@ -248,7 +248,7 @@
});
label = new Label(mcfContainer, SWT.NULL);
- label.setText("Connection factory interface:");
+ label.setText("Connection Factory interface:");
cfText = new Text(mcfContainer, SWT.BORDER | SWT.SINGLE);
gd = new GridData(GridData.FILL_HORIZONTAL);
Modified: projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/PropsContentProvider.java
===================================================================
--- projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/PropsContentProvider.java 2012-02-16 22:15:19 UTC (rev 112660)
+++ projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/PropsContentProvider.java 2012-02-20 02:53:58 UTC (rev 112661)
@@ -41,7 +41,7 @@
*/
public class PropsContentProvider implements IStructuredContentProvider
{
- private List elements = new ArrayList();
+ private List<Object> elements = new ArrayList<Object>();
private TableViewer tableViewer;
Modified: projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/RaWizardPage.java
===================================================================
--- projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/RaWizardPage.java 2012-02-16 22:15:19 UTC (rev 112660)
+++ projects/jboss-jca/trunk/eclipse/src/main/java/org/jboss/jca/eclipse/wizards/RaWizardPage.java 2012-02-20 02:53:58 UTC (rev 112661)
@@ -84,7 +84,7 @@
public RaWizardPage(ISelection selection)
{
super("wizardPage");
- setTitle("Resource adapter information");
+ setTitle("Resource Adapter Information");
setDescription("Input information about resource adapter.");
this.selection = selection;
}
@@ -113,7 +113,7 @@
layout.verticalSpacing = 9;
Label label = new Label(raContainer, SWT.NULL);
- label.setText("Include a ResourceAdapter:");
+ label.setText("Include a Resource Adapter:");
final Button raButton = new Button(raContainer, SWT.CHECK);
raButton.setSelection(true);
((CodeGenWizard) getWizard()).getDef().setUseRa(true);
@@ -128,7 +128,7 @@
});
label = new Label(raContainer, SWT.NULL);
- label.setText("Resource adapter class name:");
+ label.setText("Resource Adapter class name:");
raText = new Text(raContainer, SWT.BORDER | SWT.SINGLE);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.widthHint = 600;
@@ -150,7 +150,7 @@
});
label = new Label(raContainer, SWT.NULL);
- label.setText("ResourceAdapter Properties:");
+ label.setText("Resource Adapter properties:");
container = new Composite(wholeContainer, SWT.NULL);
layout = new GridLayout();
More information about the jboss-cvs-commits
mailing list