You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by bj...@apache.org on 2008/11/25 22:49:56 UTC
svn commit: r720616 [1/2] - in /geronimo/devtools/eclipse-plugin:
branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/
branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/s...
Author: bjreed
Date: Tue Nov 25 13:49:55 2008
New Revision: 720616
URL: http://svn.apache.org/viewvc?rev=720616&view=rev
Log:
Change for moving getWizardPageTitle and getWizardPageDescription from the AbstractWizard to the AbstractWizardPage. Also moving createTable to the Abstract level for reuse.
Modified:
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRunAsSubjectWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServerCustomAssemblyWizard.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRunAsSubjectWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServerCustomAssemblyWizard.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java Tue Nov 25 13:49:55 2008
@@ -41,10 +41,12 @@
public abstract String[] getTableColumnEAttributes();
- public class DynamicWizardPage extends AbstractWizardPage {
+ public abstract void addPages();
+
+ public abstract class AbstractTableWizardPage extends AbstractWizardPage {
protected Text[] textEntries = new Text[getTableColumnEAttributes().length];
- public DynamicWizardPage(String pageName) {
+ public AbstractTableWizardPage(String pageName) {
super(pageName);
}
@@ -73,11 +75,12 @@
public Text getTextEntry(int object) {
return textEntries[object];
}
- }
- @Override
- public void addPages() {
- addPage(new DynamicWizardPage("Page0"));
+ @Override
+ protected abstract String getWizardPageTitle();
+
+ @Override
+ protected abstract String getWizardPageDescription();
}
@Override
@@ -95,26 +98,12 @@
}
public void processEAttributes(IWizardPage page) {
- if (page instanceof DynamicWizardPage) {
+ if (page instanceof AbstractTableWizardPage) {
for (int i = 0; i < getTableColumnEAttributes().length; i++) {
- String value = ((DynamicWizardPage) page).textEntries[i].getText();
+ String value = ((AbstractTableWizardPage) page).textEntries[i].getText();
String attribute = getTableColumnEAttributes()[i];
JAXBUtils.setValue(eObject, attribute, value);
}
}
}
-
- @Override
- protected String getWizardPageTitle() {
- return getWizardFirstPageTitle();
- }
-
- @Override
- protected String getWizardPageDescription() {
- return getWizardFirstPageDescription();
- }
-
- public abstract String getWizardFirstPageTitle();
-
- public abstract String getWizardFirstPageDescription();
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java Tue Nov 25 13:49:55 2008
@@ -94,10 +94,6 @@
protected abstract void toggleFields(boolean clearFields);
}
- protected abstract String getWizardPageTitle();
-
- protected abstract String getWizardPageDescription();
-
protected abstract String getAddWizardWindowTitle();
protected abstract String getEditWizardWindowTitle();
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java Tue Nov 25 13:49:55 2008
@@ -17,6 +17,7 @@
package org.apache.geronimo.st.ui.wizards;
import org.apache.geronimo.st.ui.Activator;
+import org.apache.geronimo.st.ui.SortListener;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
@@ -27,6 +28,9 @@
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
/**
@@ -68,9 +72,24 @@
return composite;
}
+ public GridData createGridData() {
+ return createGridData (400, 300);
+ }
+
+ public GridData createGridData(int heightHint, int widthHint) {
+ GridData data = new GridData();
+ data.verticalAlignment = GridData.FILL;
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessVerticalSpace = true;
+ data.grabExcessHorizontalSpace = true;
+ data.heightHint = heightHint;
+ data.widthHint = widthHint;
+ return data;
+ }
+
protected Label createLabel(Composite composite, String labelString) {
Label label = new Label(composite, SWT.LEFT);
- if (!labelString.endsWith(":")) {
+ if (!labelString.endsWith(":") && labelString.length() > 0) {
labelString = labelString.concat(":");
}
label.setText(labelString);
@@ -92,6 +111,23 @@
return text;
}
+ protected Text createMultiTextField(Composite composite, String[] initialValue) {
+ Text text = new Text(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
+ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
+ data.grabExcessHorizontalSpace = true;
+ data.grabExcessVerticalSpace = true;
+ data.widthHint = 100;
+ text.setLayoutData(data);
+ if (initialValue != null) {
+ String temp = "";
+ for (int i = 0; i < initialValue.length; i++) {
+ temp += initialValue[i] + "\n";
+ }
+ text.setText(temp);
+ }
+ return text;
+ }
+
protected Combo createCombo(Composite composite, String[] items, boolean editable) {
int style = SWT.NONE;
if (!editable) {
@@ -114,11 +150,46 @@
button.setLayoutData(data);
return button;
}
- }
- protected abstract String getWizardPageTitle();
+ protected Button createPushButton(Composite composite, String buttonString) {
+ Button button = new Button(composite, SWT.PUSH);
+ button.setText(buttonString);
+ GridData data = new GridData();
+ data.horizontalSpan = 1;
+ button.setLayoutData(data);
+ return button;
+ }
+
+ protected Table createTable(Composite composite, String[] columnNames, int[] columnWidths) {
+ int style = SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
+
+ Table table = new Table(composite, style);
+ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
+ data.grabExcessHorizontalSpace = true;
+ data.grabExcessVerticalSpace = true;
+ data.horizontalSpan = 2;
+ data.horizontalAlignment = GridData.FILL;
+ data.heightHint = 250;
+ data.widthHint = 350;
+ table.setLayoutData(data);
+ table.setLinesVisible(false);
+ table.setHeaderVisible(true);
+
+ final TableColumn[] column = new TableColumn[columnNames.length];
+ Listener sortListener = new SortListener(table, columnNames);
+ for (int i = 0; i < columnNames.length; ++i) {
+ column[i] = new TableColumn(table, SWT.LEFT, i);
+ column[i].setText(columnNames[i]);
+ column[i].setWidth(columnWidths[i]);
+ column[i].addListener(SWT.Selection, sortListener);
+ }
+ return table;
+ }
- protected abstract String getWizardPageDescription();
+ protected abstract String getWizardPageTitle();
+
+ protected abstract String getWizardPageDescription();
+ }
protected abstract String getAddWizardWindowTitle();
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java Tue Nov 25 13:49:55 2008
@@ -117,6 +117,14 @@
labelList.get(1).setText(CommonMessages.value);
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_AdminObject;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_AdminObject;
+ }
}
@Override
@@ -179,12 +187,4 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_AdminObject;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_AdminObject;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_AdminObject;
- }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java Tue Nov 25 13:49:55 2008
@@ -48,6 +48,10 @@
return new String[] { "Value" };
}
+ public void addPages() {
+ addPage(new ClassFilterWizardPage("Page0"));
+ }
+
public String getAddWizardWindowTitle() {
return CommonMessages.wizardNewTitle_Dependency;
}
@@ -56,19 +60,25 @@
return CommonMessages.wizardEditTitle_Dependency;
}
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_Dependency;
- }
+ public class ClassFilterWizardPage extends AbstractTableWizardPage {
+ public ClassFilterWizardPage(String pageName) {
+ super(pageName);
+ }
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_Dependency;
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_Dependency;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_Dependency;
+ }
}
/* (non-Javadoc)
* @see org.apache.geronimo.st.ui.wizards.AbstractTableWizard#performFinish()
*/
public boolean performFinish() {
- DynamicWizardPage page = (DynamicWizardPage) getPages()[0];
+ AbstractTableWizardPage page = (AbstractTableWizardPage) getPages()[0];
if (eObject == null) {
eObject = new String();
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java Tue Nov 25 13:49:55 2008
@@ -21,7 +21,6 @@
import org.apache.geronimo.jee.deployment.Dependency;
import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.ui.SortListener;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
@@ -29,11 +28,9 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
/**
@@ -69,7 +66,7 @@
addPage(new DependencyWizardPage("AddDependencyPage"));
}
- public class DependencyWizardPage extends DynamicWizardPage {
+ public class DependencyWizardPage extends AbstractTableWizardPage {
public DependencyWizardPage(String pageName) {
super(pageName);
@@ -91,7 +88,8 @@
if (eObject == null) {
TabItem item2 = new TabItem(tabFolder, SWT.NONE);
item2.setText(CommonMessages.wizardTabServer_Dependency);
- createTable(tabFolder);
+ int columnWidths[] = { 80, 220, 50, 65 };
+ dependencyTable = createTable(tabFolder, section.getTableColumnNames(), columnWidths);
populateTable();
item2.setControl(dependencyTable);
}
@@ -111,33 +109,6 @@
return data;
}
- private void createTable(Composite composite) {
- int style = SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
-
- dependencyTable = new Table(composite, style);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- data.grabExcessHorizontalSpace = true;
- data.grabExcessVerticalSpace = true;
- data.horizontalSpan = 2;
- data.horizontalAlignment = GridData.FILL;
- data.heightHint = 60;
- data.widthHint = 400;
- dependencyTable.setLayoutData(data);
- dependencyTable.setLinesVisible(false);
- dependencyTable.setHeaderVisible(true);
-
- String[] columnNames = section.getTableColumnNames();
- final TableColumn[] column = new TableColumn[columnNames.length];
- int columnWidth[] = { 80, 220, 50, 65 };
- Listener sortListener = new SortListener(dependencyTable, columnNames);
- for (int i = 0; i < columnNames.length; ++i) {
- column[i] = new TableColumn(dependencyTable, SWT.LEFT, i);
- column[i].setText(columnNames[i]);
- column[i].setWidth(columnWidth[i]);
- column[i].addListener(SWT.Selection, sortListener);
- }
- }
-
public void populateTable() {
List<Dependency> serverList = GeronimoServerInfo.getInstance().getCommonLibs();
List<Dependency> alreadyAddedDependencies = (List<Dependency>) section.getObjectContainer();
@@ -149,6 +120,14 @@
tabItem.setText(dependencyToStringArray(dependency));
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_Dependency;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_Dependency;
+ }
}
public boolean performFinish() {
@@ -184,12 +163,4 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_Dependency;
}
-
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_Dependency;
- }
-
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_Dependency;
- }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java Tue Nov 25 13:49:55 2008
@@ -46,12 +46,22 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_EjbLocalRef;
}
-
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_EjbLocalRef;
+
+ public void addPages() {
+ addPage(new EjbLocalRefWizardPage("Page0"));
}
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_EjbLocalRef;
+ public class EjbLocalRefWizardPage extends AbstractTableWizardPage {
+ public EjbLocalRefWizardPage(String pageName) {
+ super(pageName);
+ }
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_EjbLocalRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_EjbLocalRef;
+ }
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java Tue Nov 25 13:49:55 2008
@@ -46,12 +46,22 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_EjbRef;
}
-
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_EjbRef;
+
+ public void addPages() {
+ addPage(new EjbRefWizardPage("Page0"));
}
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_EjbRef;
+ public class EjbRefWizardPage extends AbstractTableWizardPage {
+ public EjbRefWizardPage(String pageName) {
+ super(pageName);
+ }
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_EjbRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_EjbRef;
+ }
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java Tue Nov 25 13:49:55 2008
@@ -128,6 +128,14 @@
labelList.get(1).setText(CommonMessages.foreignKeyColumn);
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_EjbRelation;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_EjbRelation;
+ }
}
@Override
@@ -212,12 +220,4 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_EjbRelation;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_EjbRelation;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_EjbRelation;
- }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java Tue Nov 25 13:49:55 2008
@@ -67,14 +67,6 @@
return CommonMessages.wizardEditTitle_ExtModule;
}
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_ExtModule;
- }
-
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_ExtModule;
- }
-
/*
* (non-Javadoc)
*
@@ -86,7 +78,7 @@
// need to extend the DynamicWizardPage only so that when the Edit dialog is shown
// the values are brought in properly.
- public class ModuleWizardPage extends DynamicWizardPage {
+ public class ModuleWizardPage extends AbstractTableWizardPage {
protected Button[] buttonList = new Button[6];
public ModuleWizardPage(String pageName) {
@@ -260,6 +252,14 @@
textEntries[4].setEnabled(buttonList[5].getSelection());
textEntries[5].setEnabled(buttonList[5].getSelection());
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_ExtModule;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_ExtModule;
+ }
}
public boolean performFinish() {
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java Tue Nov 25 13:49:55 2008
@@ -56,14 +56,6 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_GBeanRef;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_GBeanRef;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_GBeanRef;
- }
/*
* (non-Javadoc)
@@ -139,6 +131,14 @@
}
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_GBeanRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_GBeanRef;
+ }
}
@Override
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java Tue Nov 25 13:49:55 2008
@@ -164,6 +164,14 @@
break;
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardEditTitle_GBean;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageTitle_GBean;
+ }
}
@Override
@@ -268,12 +276,4 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_GBean;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardEditTitle_GBean;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageTitle_GBean;
- }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java Tue Nov 25 13:49:55 2008
@@ -61,14 +61,6 @@
return CommonMessages.wizardEditTitle_MessageDest;
}
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_MessageDest;
- }
-
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_MessageDest;
- }
-
/*
* (non-Javadoc)
*
@@ -80,7 +72,7 @@
// need to extend the DynamicWizardPage only so that when the Edit dialog is shown
// the values are brought in properly.
- public class MessageDestWizardPage extends DynamicWizardPage {
+ public class MessageDestWizardPage extends AbstractTableWizardPage {
public MessageDestWizardPage(String pageName) {
super(pageName);
}
@@ -127,10 +119,18 @@
setControl(composite);
textEntries[0].setFocus();
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_MessageDest;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_MessageDest;
+ }
}
public boolean performFinish() {
- DynamicWizardPage page = (DynamicWizardPage) getPages()[0];
+ AbstractTableWizardPage page = (AbstractTableWizardPage) getPages()[0];
Pattern msgPattern;
MessageDestination messageDest;
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java Tue Nov 25 13:49:55 2008
@@ -62,14 +62,6 @@
return CommonMessages.wizardEditTitle_Module;
}
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_Module;
- }
-
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_Module;
- }
-
/*
* (non-Javadoc)
*
@@ -81,7 +73,7 @@
// need to extend the DynamicWizardPage only so that when the Edit dialog is shown
// the values are brought in properly.
- public class ModuleWizardPage extends DynamicWizardPage {
+ public class ModuleWizardPage extends AbstractTableWizardPage {
protected Button[] buttonList = new Button[4];
public ModuleWizardPage(String pageName) {
@@ -162,10 +154,18 @@
setControl(composite);
textEntries[0].setFocus();
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_Module;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_Module;
+ }
}
public boolean performFinish() {
- DynamicWizardPage page = (DynamicWizardPage) getPages()[0];
+ AbstractTableWizardPage page = (AbstractTableWizardPage) getPages()[0];
Path path;
Module module;
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java Tue Nov 25 13:49:55 2008
@@ -68,14 +68,6 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_PersContextRef;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_PersContextRef;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_PersContextRef;
- }
/*
* (non-Javadoc)
@@ -210,6 +202,14 @@
}
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_PersContextRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_PersContextRef;
+ }
}
@Override
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersUnitRefWizard.java Tue Nov 25 13:49:55 2008
@@ -57,14 +57,6 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_PersUnitRef;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_PersUnitRef;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_PersUnitRef;
- }
/*
* (non-Javadoc)
@@ -153,6 +145,14 @@
textList.get(i).setEnabled(specifyPattern.getSelection());
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_PersUnitRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_PersUnitRef;
+ }
}
@Override
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java Tue Nov 25 13:49:55 2008
@@ -47,12 +47,22 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_ResEnvRef;
}
-
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_ResEnvRef;
+
+ public void addPages() {
+ addPage(new ResourceEnvRefWizardPage("Page0"));
}
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_ResEnvRef;
+ public class ResourceEnvRefWizardPage extends AbstractTableWizardPage {
+ public ResourceEnvRefWizardPage(String pageName) {
+ super(pageName);
+ }
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_ResEnvRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_ResEnvRef;
+ }
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java Tue Nov 25 13:49:55 2008
@@ -46,12 +46,22 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_ResRef;
}
-
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_ResRef;
+
+ public void addPages() {
+ addPage(new ResourceRefWizardPage("Page0"));
}
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_ResRef;
+ public class ResourceRefWizardPage extends AbstractTableWizardPage {
+ public ResourceRefWizardPage(String pageName) {
+ super(pageName);
+ }
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_ResRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_ResRef;
+ }
}
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleMappingWizard.java Tue Nov 25 13:49:55 2008
@@ -136,6 +136,16 @@
realmNameLabel.setVisible (selection == REALM_PRINCIPAL ? true : false);
realmName.setVisible (selection == REALM_PRINCIPAL ? true : false);
}
+
+ @Override
+ protected String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_RoleMapping;
+ }
+
+ @Override
+ protected String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_RoleMapping;
+ }
}
@Override
@@ -221,14 +231,4 @@
protected String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_RoleMapping;
}
-
- @Override
- protected String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_RoleMapping;
- }
-
- @Override
- protected String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_RoleMapping;
- }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRunAsSubjectWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRunAsSubjectWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRunAsSubjectWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/SecurityRunAsSubjectWizard.java Tue Nov 25 13:49:55 2008
@@ -61,6 +61,16 @@
}
setControl(composite);
}
+
+ @Override
+ protected String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_RunAsSubject;
+ }
+
+ @Override
+ protected String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_RunAsSubject;
+ }
}
@Override
@@ -97,14 +107,4 @@
protected String getEditWizardWindowTitle() {
return CommonMessages.wizardNewTitle_RunAsSubject;
}
-
- @Override
- protected String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_RunAsSubject;
- }
-
- @Override
- protected String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_RunAsSubject;
- }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServerCustomAssemblyWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServerCustomAssemblyWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServerCustomAssemblyWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServerCustomAssemblyWizard.java Tue Nov 25 13:49:55 2008
@@ -35,7 +35,7 @@
public class ServerCustomAssemblyWizard extends AbstractWizard {
private Table pluginTable;
-
+
protected Text group;
protected Text artifact;
protected Text version;
@@ -113,7 +113,7 @@
public void populateTable() {
List<String> pluginList = customAssembly.getPluginList();
-
+
for (int i = 0; i < pluginList.size(); ++i) {
TableItem tableItem = new TableItem(pluginTable, SWT.NONE);
String tableEntry = pluginList.get(i);
@@ -121,6 +121,16 @@
tableItem.setText(new String[] {tableEntry});
}
}
+
+ @Override
+ protected String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_ServerCustomAssembly;
+ }
+
+ @Override
+ protected String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_ServerCustomAssembly;
+ }
}
public boolean performFinish() {
@@ -129,7 +139,7 @@
isEmpty(serverPath.getText()) || pluginTable.getSelectionCount() == 0) {
return false;
}
- customAssembly.assembleServer(group.getText(), artifact.getText(), version.getText(), type.getText(),
+ customAssembly.assembleServer(group.getText(), artifact.getText(), version.getText(), type.getText(),
serverPath.getText(), pluginTable.getSelectionIndices());
return true;
}
@@ -143,14 +153,4 @@
protected String getEditWizardWindowTitle() {
return CommonMessages.wizardNewTitle_ServerCustomAssembly;
}
-
- @Override
- protected String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_ServerCustomAssembly;
- }
-
- @Override
- protected String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_ServerCustomAssembly;
- }
}
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java Tue Nov 25 13:49:55 2008
@@ -146,6 +146,14 @@
labelList.get(6).setText(CommonMessages.bindingName);
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_ServiceRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_ServiceRef;
+ }
}
@Override
@@ -231,12 +239,4 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_ServiceRef;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_ServiceRef;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_ServiceRef;
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTableWizard.java Tue Nov 25 13:49:55 2008
@@ -41,10 +41,12 @@
public abstract String[] getTableColumnEAttributes();
- public class DynamicWizardPage extends AbstractWizardPage {
+ public abstract void addPages();
+
+ public abstract class AbstractTableWizardPage extends AbstractWizardPage {
protected Text[] textEntries = new Text[getTableColumnEAttributes().length];
- public DynamicWizardPage(String pageName) {
+ public AbstractTableWizardPage(String pageName) {
super(pageName);
}
@@ -73,11 +75,12 @@
public Text getTextEntry(int object) {
return textEntries[object];
}
- }
- @Override
- public void addPages() {
- addPage(new DynamicWizardPage("Page0"));
+ @Override
+ protected abstract String getWizardPageTitle();
+
+ @Override
+ protected abstract String getWizardPageDescription();
}
@Override
@@ -95,26 +98,12 @@
}
public void processEAttributes(IWizardPage page) {
- if (page instanceof DynamicWizardPage) {
+ if (page instanceof AbstractTableWizardPage) {
for (int i = 0; i < getTableColumnEAttributes().length; i++) {
- String value = ((DynamicWizardPage) page).textEntries[i].getText();
+ String value = ((AbstractTableWizardPage) page).textEntries[i].getText();
String attribute = getTableColumnEAttributes()[i];
JAXBUtils.setValue(eObject, attribute, value);
}
}
}
-
- @Override
- protected String getWizardPageTitle() {
- return getWizardFirstPageTitle();
- }
-
- @Override
- protected String getWizardPageDescription() {
- return getWizardFirstPageDescription();
- }
-
- public abstract String getWizardFirstPageTitle();
-
- public abstract String getWizardFirstPageDescription();
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractTreeWizard.java Tue Nov 25 13:49:55 2008
@@ -94,10 +94,6 @@
protected abstract void toggleFields(boolean clearFields);
}
- protected abstract String getWizardPageTitle();
-
- protected abstract String getWizardPageDescription();
-
protected abstract String getAddWizardWindowTitle();
protected abstract String getEditWizardWindowTitle();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/wizards/AbstractWizard.java Tue Nov 25 13:49:55 2008
@@ -17,6 +17,7 @@
package org.apache.geronimo.st.ui.wizards;
import org.apache.geronimo.st.ui.Activator;
+import org.apache.geronimo.st.ui.SortListener;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardPage;
@@ -27,6 +28,9 @@
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
/**
@@ -68,9 +72,24 @@
return composite;
}
+ public GridData createGridData() {
+ return createGridData (400, 300);
+ }
+
+ public GridData createGridData(int heightHint, int widthHint) {
+ GridData data = new GridData();
+ data.verticalAlignment = GridData.FILL;
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessVerticalSpace = true;
+ data.grabExcessHorizontalSpace = true;
+ data.heightHint = heightHint;
+ data.widthHint = widthHint;
+ return data;
+ }
+
protected Label createLabel(Composite composite, String labelString) {
Label label = new Label(composite, SWT.LEFT);
- if (!labelString.endsWith(":")) {
+ if (!labelString.endsWith(":") && labelString.length() > 0) {
labelString = labelString.concat(":");
}
label.setText(labelString);
@@ -92,6 +111,23 @@
return text;
}
+ protected Text createMultiTextField(Composite composite, String[] initialValue) {
+ Text text = new Text(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
+ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
+ data.grabExcessHorizontalSpace = true;
+ data.grabExcessVerticalSpace = true;
+ data.widthHint = 100;
+ text.setLayoutData(data);
+ if (initialValue != null) {
+ String temp = "";
+ for (int i = 0; i < initialValue.length; i++) {
+ temp += initialValue[i] + "\n";
+ }
+ text.setText(temp);
+ }
+ return text;
+ }
+
protected Combo createCombo(Composite composite, String[] items, boolean editable) {
int style = SWT.NONE;
if (!editable) {
@@ -114,11 +150,46 @@
button.setLayoutData(data);
return button;
}
- }
- protected abstract String getWizardPageTitle();
+ protected Button createPushButton(Composite composite, String buttonString) {
+ Button button = new Button(composite, SWT.PUSH);
+ button.setText(buttonString);
+ GridData data = new GridData();
+ data.horizontalSpan = 1;
+ button.setLayoutData(data);
+ return button;
+ }
+
+ protected Table createTable(Composite composite, String[] columnNames, int[] columnWidths) {
+ int style = SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
+
+ Table table = new Table(composite, style);
+ GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
+ data.grabExcessHorizontalSpace = true;
+ data.grabExcessVerticalSpace = true;
+ data.horizontalSpan = 2;
+ data.horizontalAlignment = GridData.FILL;
+ data.heightHint = 250;
+ data.widthHint = 350;
+ table.setLayoutData(data);
+ table.setLinesVisible(false);
+ table.setHeaderVisible(true);
+
+ final TableColumn[] column = new TableColumn[columnNames.length];
+ Listener sortListener = new SortListener(table, columnNames);
+ for (int i = 0; i < columnNames.length; ++i) {
+ column[i] = new TableColumn(table, SWT.LEFT, i);
+ column[i].setText(columnNames[i]);
+ column[i].setWidth(columnWidths[i]);
+ column[i].addListener(SWT.Selection, sortListener);
+ }
+ return table;
+ }
- protected abstract String getWizardPageDescription();
+ protected abstract String getWizardPageTitle();
+
+ protected abstract String getWizardPageDescription();
+ }
protected abstract String getAddWizardWindowTitle();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/AdminObjectWizard.java Tue Nov 25 13:49:55 2008
@@ -117,6 +117,14 @@
labelList.get(1).setText(CommonMessages.value);
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_AdminObject;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_AdminObject;
+ }
}
@Override
@@ -179,12 +187,4 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_AdminObject;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_AdminObject;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_AdminObject;
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ClassFilterWizard.java Tue Nov 25 13:49:55 2008
@@ -48,6 +48,10 @@
return new String[] { "Value" };
}
+ public void addPages() {
+ addPage(new ClassFilterWizardPage("Page0"));
+ }
+
public String getAddWizardWindowTitle() {
return CommonMessages.wizardNewTitle_Dependency;
}
@@ -56,19 +60,25 @@
return CommonMessages.wizardEditTitle_Dependency;
}
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_Dependency;
- }
+ public class ClassFilterWizardPage extends AbstractTableWizardPage {
+ public ClassFilterWizardPage(String pageName) {
+ super(pageName);
+ }
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_Dependency;
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_Dependency;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_Dependency;
+ }
}
/* (non-Javadoc)
* @see org.apache.geronimo.st.ui.wizards.AbstractTableWizard#performFinish()
*/
public boolean performFinish() {
- DynamicWizardPage page = (DynamicWizardPage) getPages()[0];
+ AbstractTableWizardPage page = (AbstractTableWizardPage) getPages()[0];
if (eObject == null) {
eObject = new String();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java Tue Nov 25 13:49:55 2008
@@ -21,7 +21,6 @@
import org.apache.geronimo.jee.deployment.Dependency;
import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.ui.SortListener;
import org.apache.geronimo.st.ui.sections.AbstractTableSection;
import org.apache.geronimo.st.ui.wizards.AbstractTableWizard;
import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
@@ -29,11 +28,9 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
/**
@@ -69,7 +66,7 @@
addPage(new DependencyWizardPage("AddDependencyPage"));
}
- public class DependencyWizardPage extends DynamicWizardPage {
+ public class DependencyWizardPage extends AbstractTableWizardPage {
public DependencyWizardPage(String pageName) {
super(pageName);
@@ -91,7 +88,8 @@
if (eObject == null) {
TabItem item2 = new TabItem(tabFolder, SWT.NONE);
item2.setText(CommonMessages.wizardTabServer_Dependency);
- createTable(tabFolder);
+ int columnWidths[] = { 80, 220, 50, 65 };
+ dependencyTable = createTable(tabFolder, section.getTableColumnNames(), columnWidths);
populateTable();
item2.setControl(dependencyTable);
}
@@ -111,33 +109,6 @@
return data;
}
- private void createTable(Composite composite) {
- int style = SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
-
- dependencyTable = new Table(composite, style);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- data.grabExcessHorizontalSpace = true;
- data.grabExcessVerticalSpace = true;
- data.horizontalSpan = 2;
- data.horizontalAlignment = GridData.FILL;
- data.heightHint = 60;
- data.widthHint = 400;
- dependencyTable.setLayoutData(data);
- dependencyTable.setLinesVisible(false);
- dependencyTable.setHeaderVisible(true);
-
- String[] columnNames = section.getTableColumnNames();
- final TableColumn[] column = new TableColumn[columnNames.length];
- int columnWidth[] = { 80, 220, 50, 65 };
- Listener sortListener = new SortListener(dependencyTable, columnNames);
- for (int i = 0; i < columnNames.length; ++i) {
- column[i] = new TableColumn(dependencyTable, SWT.LEFT, i);
- column[i].setText(columnNames[i]);
- column[i].setWidth(columnWidth[i]);
- column[i].addListener(SWT.Selection, sortListener);
- }
- }
-
public void populateTable() {
List<Dependency> serverList = GeronimoServerInfo.getInstance().getCommonLibs();
List<Dependency> alreadyAddedDependencies = (List<Dependency>) section.getObjectContainer();
@@ -149,6 +120,14 @@
tabItem.setText(dependencyToStringArray(dependency));
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_Dependency;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_Dependency;
+ }
}
public boolean performFinish() {
@@ -184,12 +163,4 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_Dependency;
}
-
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_Dependency;
- }
-
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_Dependency;
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java Tue Nov 25 13:49:55 2008
@@ -46,12 +46,22 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_EjbLocalRef;
}
-
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_EjbLocalRef;
+
+ public void addPages() {
+ addPage(new EjbLocalRefWizardPage("Page0"));
}
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_EjbLocalRef;
+ public class EjbLocalRefWizardPage extends AbstractTableWizardPage {
+ public EjbLocalRefWizardPage(String pageName) {
+ super(pageName);
+ }
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_EjbLocalRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_EjbLocalRef;
+ }
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java Tue Nov 25 13:49:55 2008
@@ -46,12 +46,22 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_EjbRef;
}
-
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_EjbRef;
+
+ public void addPages() {
+ addPage(new EjbRefWizardPage("Page0"));
}
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_EjbRef;
+ public class EjbRefWizardPage extends AbstractTableWizardPage {
+ public EjbRefWizardPage(String pageName) {
+ super(pageName);
+ }
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_EjbRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_EjbRef;
+ }
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/EjbRelationWizard.java Tue Nov 25 13:49:55 2008
@@ -128,6 +128,14 @@
labelList.get(1).setText(CommonMessages.foreignKeyColumn);
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_EjbRelation;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_EjbRelation;
+ }
}
@Override
@@ -212,12 +220,4 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_EjbRelation;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_EjbRelation;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_EjbRelation;
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ExtModuleWizard.java Tue Nov 25 13:49:55 2008
@@ -67,14 +67,6 @@
return CommonMessages.wizardEditTitle_ExtModule;
}
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_ExtModule;
- }
-
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_ExtModule;
- }
-
/*
* (non-Javadoc)
*
@@ -86,7 +78,7 @@
// need to extend the DynamicWizardPage only so that when the Edit dialog is shown
// the values are brought in properly.
- public class ModuleWizardPage extends DynamicWizardPage {
+ public class ModuleWizardPage extends AbstractTableWizardPage {
protected Button[] buttonList = new Button[6];
public ModuleWizardPage(String pageName) {
@@ -260,6 +252,14 @@
textEntries[4].setEnabled(buttonList[5].getSelection());
textEntries[5].setEnabled(buttonList[5].getSelection());
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_ExtModule;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_ExtModule;
+ }
}
public boolean performFinish() {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java Tue Nov 25 13:49:55 2008
@@ -56,14 +56,6 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_GBeanRef;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_GBeanRef;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_GBeanRef;
- }
/*
* (non-Javadoc)
@@ -139,6 +131,14 @@
}
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_GBeanRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_GBeanRef;
+ }
}
@Override
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java Tue Nov 25 13:49:55 2008
@@ -164,6 +164,14 @@
break;
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardEditTitle_GBean;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageTitle_GBean;
+ }
}
@Override
@@ -268,12 +276,4 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_GBean;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardEditTitle_GBean;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageTitle_GBean;
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/MessageDestWizard.java Tue Nov 25 13:49:55 2008
@@ -61,14 +61,6 @@
return CommonMessages.wizardEditTitle_MessageDest;
}
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_MessageDest;
- }
-
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_MessageDest;
- }
-
/*
* (non-Javadoc)
*
@@ -80,7 +72,7 @@
// need to extend the DynamicWizardPage only so that when the Edit dialog is shown
// the values are brought in properly.
- public class MessageDestWizardPage extends DynamicWizardPage {
+ public class MessageDestWizardPage extends AbstractTableWizardPage {
public MessageDestWizardPage(String pageName) {
super(pageName);
}
@@ -127,10 +119,18 @@
setControl(composite);
textEntries[0].setFocus();
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_MessageDest;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_MessageDest;
+ }
}
public boolean performFinish() {
- DynamicWizardPage page = (DynamicWizardPage) getPages()[0];
+ AbstractTableWizardPage page = (AbstractTableWizardPage) getPages()[0];
Pattern msgPattern;
MessageDestination messageDest;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/ModuleWizard.java Tue Nov 25 13:49:55 2008
@@ -62,14 +62,6 @@
return CommonMessages.wizardEditTitle_Module;
}
- public String getWizardFirstPageTitle() {
- return CommonMessages.wizardPageTitle_Module;
- }
-
- public String getWizardFirstPageDescription() {
- return CommonMessages.wizardPageDescription_Module;
- }
-
/*
* (non-Javadoc)
*
@@ -81,7 +73,7 @@
// need to extend the DynamicWizardPage only so that when the Edit dialog is shown
// the values are brought in properly.
- public class ModuleWizardPage extends DynamicWizardPage {
+ public class ModuleWizardPage extends AbstractTableWizardPage {
protected Button[] buttonList = new Button[4];
public ModuleWizardPage(String pageName) {
@@ -162,10 +154,18 @@
setControl(composite);
textEntries[0].setFocus();
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_Module;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_Module;
+ }
}
public boolean performFinish() {
- DynamicWizardPage page = (DynamicWizardPage) getPages()[0];
+ AbstractTableWizardPage page = (AbstractTableWizardPage) getPages()[0];
Path path;
Module module;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java?rev=720616&r1=720615&r2=720616&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/PersContextRefWizard.java Tue Nov 25 13:49:55 2008
@@ -68,14 +68,6 @@
public String getEditWizardWindowTitle() {
return CommonMessages.wizardEditTitle_PersContextRef;
}
-
- public String getWizardPageTitle() {
- return CommonMessages.wizardPageTitle_PersContextRef;
- }
-
- public String getWizardPageDescription() {
- return CommonMessages.wizardPageDescription_PersContextRef;
- }
/*
* (non-Javadoc)
@@ -210,6 +202,14 @@
}
}
}
+
+ public String getWizardPageTitle() {
+ return CommonMessages.wizardPageTitle_PersContextRef;
+ }
+
+ public String getWizardPageDescription() {
+ return CommonMessages.wizardPageDescription_PersContextRef;
+ }
}
@Override