JBoss Tools SVN: r10217 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-12 06:19:01 -0400 (Fri, 12 Sep 2008)
New Revision: 10217
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java
Log:
add some GUI for editing ResourceConfigType
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-12 10:18:41 UTC (rev 10216)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/AbstractSmooksModelDetailPage.java 2008-09-12 10:19:01 UTC (rev 10217)
@@ -10,7 +10,9 @@
******************************************************************************/
package org.jboss.tools.smooks.ui.editors;
+import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.IDetailsPage;
@@ -18,96 +20,186 @@
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
+import org.milyn.xsd.smooks.ResourceConfigType;
/**
* @author Dart Peng<br>
- * Date : Sep 11, 2008
+ * Date : Sep 11, 2008
*/
public abstract class AbstractSmooksModelDetailPage implements IDetailsPage {
- IFormPart formPart;
+ IFormPart formPart;
+
ISelection selection;
+
FormToolkit formToolKit = null;
-
- /* (non-Javadoc)
+
+ protected ResourceConfigType oldResourceConfigList;
+
+ protected ResourceConfigType resourceConfigList;
+
+ EditingDomain domain;
+ SmooksFormEditor parentEditor;
+
+ public AbstractSmooksModelDetailPage(SmooksFormEditor parentEditor,
+ EditingDomain domain) {
+ this.domain = domain;
+ this.parentEditor = parentEditor;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ui.forms.IDetailsPage#createContents(org.eclipse.swt.widgets.Composite)
*/
public void createContents(Composite parent) {
parent.setLayout(new FillLayout());
- Section section = formToolKit.createSection(parent, Section.DESCRIPTION|Section.TITLE_BAR);
+ Section section = formToolKit.createSection(parent, Section.DESCRIPTION
+ | Section.TITLE_BAR);
section.setText("Details Information");
-
+
Composite client = formToolKit.createComposite(section);
section.setLayout(new FillLayout());
-
+
section.setClient(client);
+
+ createSectionContents(client);
+
}
-
+
abstract protected void createSectionContents(Composite parent);
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ui.forms.IFormPart#commit(boolean)
*/
public void commit(boolean onSave) {
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ui.forms.IFormPart#dispose()
*/
public void dispose() {
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ui.forms.IFormPart#initialize(org.eclipse.ui.forms.IManagedForm)
*/
public void initialize(IManagedForm form) {
- if(form != null){
+ if (form != null) {
formToolKit = form.getToolkit();
}
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ui.forms.IFormPart#isDirty()
*/
public boolean isDirty() {
return false;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ui.forms.IFormPart#isStale()
*/
public boolean isStale() {
+ if (oldResourceConfigList != resourceConfigList) {
+ oldResourceConfigList = resourceConfigList;
+ return true;
+ }
return false;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ui.forms.IFormPart#refresh()
*/
public void refresh() {
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ui.forms.IFormPart#setFocus()
*/
public void setFocus() {
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.ui.forms.IFormPart#setFormInput(java.lang.Object)
*/
public boolean setFormInput(Object input) {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart, org.eclipse.jface.viewers.ISelection)
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.forms.IPartSelectionListener#selectionChanged(org.eclipse.ui.forms.IFormPart,
+ * org.eclipse.jface.viewers.ISelection)
*/
public void selectionChanged(IFormPart part, ISelection selection) {
this.selection = selection;
formPart = part;
+ if (selection != null && selection instanceof IStructuredSelection) {
+ resourceConfigList = (ResourceConfigType) ((IStructuredSelection) selection)
+ .getFirstElement();
+ refresh();
+ }
}
+ protected IFormPart getFormPart() {
+ return formPart;
+ }
+
+ protected void setFormPart(IFormPart formPart) {
+ this.formPart = formPart;
+ }
+
+ protected ISelection getSelection() {
+ return selection;
+ }
+
+ protected void setSelection(ISelection selection) {
+ this.selection = selection;
+ }
+
+ protected FormToolkit getFormToolKit() {
+ return formToolKit;
+ }
+
+ protected void setFormToolKit(FormToolkit formToolKit) {
+ this.formToolKit = formToolKit;
+ }
+
+ protected ResourceConfigType getResourceConfigList() {
+ return resourceConfigList;
+ }
+
+ protected void setResourceConfigList(ResourceConfigType resourceConfigList) {
+ this.resourceConfigList = resourceConfigList;
+ }
+
+ protected EditingDomain getDomain() {
+ return domain;
+ }
+
+ protected void setDomain(EditingDomain domain) {
+ this.domain = domain;
+ }
+
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-12 10:18:41 UTC (rev 10216)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/BeanPopulatorDetailPage.java 2008-09-12 10:19:01 UTC (rev 10217)
@@ -10,20 +10,184 @@
******************************************************************************/
package org.jboss.tools.smooks.ui.editors;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.milyn.xsd.smooks.util.SmooksModelUtils;
/**
* @author Dart Peng<br>
- * Date : Sep 11, 2008
+ * Date : Sep 11, 2008
*/
public class BeanPopulatorDetailPage extends AbstractSmooksModelDetailPage {
- /* (non-Javadoc)
+ private Text selectorText;
+ private Text beanClassText;
+ private Text beanIDText;
+ private Button clazzBrowseButton;
+ private Button idBrowseButton;
+
+ public BeanPopulatorDetailPage(SmooksFormEditor parentEditor,
+ EditingDomain domain) {
+ super(parentEditor, domain);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.jboss.tools.smooks.ui.editors.AbstractSmooksModelDetailPage#createSectionContents(org.eclipse.swt.widgets.Composite)
*/
@Override
protected void createSectionContents(Composite parent) {
+ GridLayout gridLayout = new GridLayout();
+ gridLayout.numColumns = 2;
+ parent.setLayout(gridLayout);
+
+ this.formToolKit.createLabel(parent, "Selector : ");
+ selectorText = formToolKit.createText(parent, "");
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.grabExcessHorizontalSpace = true;
+ selectorText.setLayoutData(gd);
+
+ this.formToolKit.createLabel(parent, "Bean Class : ");
+ Composite beanClassComposite = formToolKit.createComposite(parent);
+ GridLayout bcgl = new GridLayout();
+ bcgl.numColumns = 2;
+ bcgl.marginHeight = 0;
+ bcgl.marginWidth = 1;
+ beanClassComposite.setLayout(bcgl);
+ beanClassText = formToolKit.createText(beanClassComposite, "");
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.grabExcessHorizontalSpace = true;
+ beanClassText.setLayoutData(gd);
+
+ clazzBrowseButton = formToolKit.createButton(beanClassComposite,
+ "Browse", SWT.NONE);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.grabExcessHorizontalSpace = true;
+ beanClassComposite.setLayoutData(gd);
+ formToolKit.paintBordersFor(beanClassComposite);
+ this.formToolKit.createLabel(parent, "Bean ID : ");
+ Composite beanIDComposite = formToolKit.createComposite(parent);
+ GridLayout bilg = new GridLayout();
+ bilg.numColumns = 2;
+ bilg.marginHeight = 0;
+ bilg.marginWidth = 1;
+ beanIDComposite.setLayout(bilg);
+
+ beanIDText = formToolKit.createText(beanIDComposite, "");
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.grabExcessHorizontalSpace = true;
+ beanIDText.setLayoutData(gd);
+
+ idBrowseButton = formToolKit.createButton(beanIDComposite, "Browse",
+ SWT.NONE);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.grabExcessHorizontalSpace = true;
+ beanIDComposite.setLayoutData(gd);
+ formToolKit.paintBordersFor(beanIDComposite);
+ formToolKit.paintBordersFor(parent);
+ configControls();
+ hookContorls();
}
+ protected void idBrowseButtonSelected() {
+
+ }
+
+ protected void clazzBrowseButtonSelected() {
+
+ }
+
+
+
+ @Override
+ public boolean isStale() {
+ return true;
+ }
+
+ @Override
+ public void refresh() {
+ configControls();
+ }
+
+ private void hookContorls() {
+ selectorText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ selectorChanged();
+ }
+
+ });
+ beanClassText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ beanClassChanged();
+ }
+
+ });
+ clazzBrowseButton.addSelectionListener(new SelectionAdapter() {
+
+ public void widgetSelected(SelectionEvent e) {
+ clazzBrowseButtonSelected();
+ }
+
+ });
+ beanIDText.addModifyListener(new ModifyListener() {
+
+ public void modifyText(ModifyEvent e) {
+ beanIDChanged();
+ }
+
+ });
+ idBrowseButton.addSelectionListener(new SelectionAdapter() {
+
+ public void widgetSelected(SelectionEvent e) {
+ idBrowseButtonSelected();
+ }
+
+ });
+ }
+
+ private void configControls() {
+
+ if (resourceConfigList != null) {
+ String selector = "";
+ selector = resourceConfigList.getSelector();
+ if (selector == null)
+ selector = "";
+ selectorText.setText(selector);
+
+ String beanClass = SmooksModelUtils.getParmaText("beanClass", resourceConfigList);
+ if(beanClass == null) beanClass = "";
+ String beanId = SmooksModelUtils.getParmaText("beanId", resourceConfigList);
+ if(beanId == null) beanId = "";
+
+ beanClassText.setText(beanClass);
+ beanIDText.setText(beanId);
+ }
+
+ }
+
+ protected void beanIDChanged() {
+
+ }
+
+ protected void beanClassChanged() {
+
+ }
+
+ protected void selectorChanged() {
+
+ }
+
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-09-12 10:18:41 UTC (rev 10216)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksNormalContentEditFormPage.java 2008-09-12 10:19:01 UTC (rev 10217)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.smooks.ui.editors;
+import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -37,15 +38,25 @@
String title, NormalSmooksModelPackage modelPacakge) {
super(editor, id, title);
this.setModelPackage(modelPacakge);
- resourceBlock = new SmooksResourceConfigFormBlock();
+ this.createResourceConfigFormBlock();
}
public SmooksNormalContentEditFormPage(String id, String title,
NormalSmooksModelPackage modelPacakge) {
super(id, title);
this.setModelPackage(modelPackage);
+ this.createResourceConfigFormBlock();
+ }
+
+ protected void createResourceConfigFormBlock(){
resourceBlock = new SmooksResourceConfigFormBlock();
+ resourceBlock.setDomain(getEditingDomain());
+ resourceBlock.setParentEditor((SmooksFormEditor)this.getEditor());
}
+
+ protected EditingDomain getEditingDomain(){
+ return ((SmooksFormEditor)getEditor()).getEditingDomain();
+ }
@Override
protected void createFormContent(IManagedForm managedForm) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-12 10:18:41 UTC (rev 10216)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksResourceConfigFormBlock.java 2008-09-12 10:19:01 UTC (rev 10217)
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TreeViewer;
@@ -41,7 +42,19 @@
TreeViewer dateTypeViewer;
NormalSmooksModelPackage modelPackage = null;
+
+ SmooksFormEditor parentEditor;
+
+ protected EditingDomain domain;
+ public EditingDomain getDomain() {
+ return domain;
+ }
+
+ public void setDomain(EditingDomain domain) {
+ this.domain = domain;
+ }
+
public NormalSmooksModelPackage getModelPackage() {
return modelPackage;
}
@@ -81,7 +94,7 @@
@Override
protected void registerPages(DetailsPart detailsPart) {
detailsPart.registerPage(ResourceConfigTypeImpl.class,
- new BeanPopulatorDetailPage());
+ new BeanPopulatorDetailPage(getParentEditor(),getDomain()));
}
protected void configDateTypeViewer() {
@@ -162,4 +175,12 @@
downButton.setLayoutData(gd);
}
+ protected SmooksFormEditor getParentEditor() {
+ return parentEditor;
+ }
+
+ public void setParentEditor(SmooksFormEditor parentEditor) {
+ this.parentEditor = parentEditor;
+ }
+
}
17 years, 7 months
- 1
- 0
JBoss Tools SVN: r10216 - trunk/vpe/plugins.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-09-12 06:18:41 -0400 (Fri, 12 Sep 2008)
New Revision: 10216
Added:
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/
Log:
JBIDE-1096 - VPE loading is failed after eclipse HTML Wlcome Screen
17 years, 7 months
- 1
- 0
JBoss Tools SVN: r10215 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-09-12 06:14:30 -0400 (Fri, 12 Sep 2008)
New Revision: 10215
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
Log:
JBIDE-1222 - Mozilla Browser starts regedit ... under vista this will open 2 security-check-dialogs per eclipse-start
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2008-09-12 05:37:31 UTC (rev 10214)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2008-09-12 10:14:30 UTC (rev 10215)
@@ -186,7 +186,8 @@
GREVersionRange[] greRanges = {new GREVersionRange(XULRUNNER_LOWER_VERSION, true, XULRUNNER_HIGHER_VERSION, true)};
File xulRunnerFile = null;
- try {
+ // JBIDE-1222 begin
+ /*try {
if(!XULRUNNER_LOADING_INDICATOR) {
XULRUNNER_LOADING_INDICATOR=true;
@@ -198,7 +199,8 @@
}
} catch (FileNotFoundException fnfe) {
// Ignre this exception. Will try to get XULRunner from plugin
- }
+ }*/
+ // JBIDE-1222 end
if (xulRunnerFile == null
|| !xulRunnerFile.exists()) {
17 years, 7 months
- 1
- 0
JBoss Tools SVN: r10214 - in workspace/grid/org.jboss.tools.bpmnTo: META-INF and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-09-12 01:37:31 -0400 (Fri, 12 Sep 2008)
New Revision: 10214
Added:
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnPoolsChoicePage.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizardDialog.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/ErrorMessagesPage.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java
Modified:
workspace/grid/org.jboss.tools.bpmnTo/.classpath
workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF
workspace/grid/org.jboss.tools.bpmnTo/plugin.xml
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/action/BpmnToAction.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/translate/BPMNTranslator.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java
Log:
add a wizard for translate and remove those dialogs
Modified: workspace/grid/org.jboss.tools.bpmnTo/.classpath
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/.classpath 2008-09-12 03:36:51 UTC (rev 10213)
+++ workspace/grid/org.jboss.tools.bpmnTo/.classpath 2008-09-12 05:37:31 UTC (rev 10214)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="bin/"/>
+ <classpathentry exported="true" kind="lib" path="bin/" sourcepath="src/org/jboss/tools/b2j/messages"/>
<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Modified: workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF 2008-09-12 03:36:51 UTC (rev 10213)
+++ workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF 2008-09-12 05:37:31 UTC (rev 10214)
@@ -15,10 +15,7 @@
bin/
Bundle-Vendor: %PLUGIN_PROVIDER
Import-Package: org.eclipse.core.resources
-Export-Package: org.jboss.tools.b2j.action,
- org.jboss.tools.b2j.messages,
- org.jboss.tools.b2j.translate,
- org.jboss.tools.bpmnto,
+Export-Package: org.jboss.tools.bpmnto,
org.jboss.tools.bpmnto.action,
org.jboss.tools.bpmnto.translate,
org.jboss.tools.bpmnto.util
Modified: workspace/grid/org.jboss.tools.bpmnTo/plugin.xml
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/plugin.xml 2008-09-12 03:36:51 UTC (rev 10213)
+++ workspace/grid/org.jboss.tools.bpmnTo/plugin.xml 2008-09-12 05:37:31 UTC (rev 10214)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
-<plugin>
- <extension
+<plugin>
+<extension
point="org.eclipse.ui.popupMenus">
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties 2008-09-12 03:36:51 UTC (rev 10213)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties 2008-09-12 05:37:31 UTC (rev 10214)
@@ -9,6 +9,9 @@
Height_Attribute_Name=height
X_Attribute_Name=x
Y_Attribute_Name=y
+Label_Select_All=Select All
+Label_Deselect_All=Deselect All
+Label_Button_Browse=Browse...
Bpmn_Diagram_Name_Suffix=_diagram
Bpmn_Pool_Element_Name=pools
Bpmn_Vertice_Element_Name=vertices
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java 2008-09-12 03:36:51 UTC (rev 10213)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -33,6 +33,9 @@
public static String Height_Attribute_Name;
public static String X_Attribute_Name;
public static String Y_Attribute_Name;
+ public static String Label_Select_All;
+ public static String Label_Deselect_All;
+ public static String Label_Button_Browse;
public static String Bpmn_Diagram_Name_Suffix;
public static String Bpmn_Pool_Element_Name;
public static String Bpmn_Element_ID;
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java 2008-09-12 03:36:51 UTC (rev 10213)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -115,10 +115,8 @@
if (bpmnID != null) {
// when translate bpmn loop activity, we create a mock
// structure and when translate bpmn transaction, we create a
- // mock
- // structure too. For these reason, we need to give a (x,y)
- // increment to avoid
- // two element overlap
+ // mock structure too. For these reason, we need to give a (x,y)
+ // increment to avoid two element overlap
int xIncre = 0;
int yIncre = 0;
Element bpmnGpdEle = TranslateHelper.getDiagramLayoutElement(
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/action/BpmnToAction.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/action/BpmnToAction.java 2008-09-12 03:36:51 UTC (rev 10213)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/action/BpmnToAction.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
package org.jboss.tools.bpmnto.action;
import java.util.ArrayList;
@@ -2,5 +13,2 @@
import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
@@ -12,119 +20,69 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IObjectActionDelegate;
import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.dialogs.ListDialog;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
import org.jboss.tools.b2j.messages.B2JMessages;
import org.jboss.tools.bpmnto.util.BPMNToUtil;
+import org.jboss.tools.bpmnto.wizard.BpmnToWizard;
+import org.jboss.tools.bpmnto.wizard.BpmnToWizardDialog;
+/**
+ * @author Grid Qian
+ *
+ * a abstract action class of translate bpmn
+ * the subclass should realize the method: translateBpmn to do a translation
+ * from bpmn to anything
+ *
+ */
public abstract class BpmnToAction implements IObjectActionDelegate {
public IFile bpmnFile;
+ public List<String> errorList = new ArrayList<String>();
public void setActivePart(IAction arg0, IWorkbenchPart part) {
// myPart = part;
}
- public void run(IAction arg0) {
+ public void run(IAction action) {
String bpmnFileName = bpmnFile.getName();
String bpmnFileParentPath = bpmnFile.getParent().getLocation()
.toOSString();
-
- List<String> list = new ArrayList<String>();
- List<String> poolIdList = null;
+
+ BpmnToWizard wizard = null;
try {
- poolIdList = selectPoolElement(BPMNToUtil
- .getPoolIDsFromDocument(getDocument(bpmnFileParentPath,
- bpmnFileName)));
- } catch (Exception e) {
- list.add(NLS.bind(B2JMessages.Translate_Error_File_CanNotRead,
+ wizard = new BpmnToWizard(action.getText(),BPMNToUtil.getPoolIDsFromDocument(getDocument(bpmnFileParentPath,bpmnFileName)));
+ } catch (Exception e1) {
+ errorList.add(NLS.bind(B2JMessages.Translate_Error_File_CanNotRead,
bpmnFileName));
+ e1.printStackTrace();
}
+
+ BpmnToWizardDialog dialog = new BpmnToWizardDialog(Display.getCurrent().getActiveShell(), wizard, this);
+
+ dialog.open();
- if (poolIdList.size() == 0) {
- return;
- }
- String location = getGeneratedFileLocation();
- if (location == null) {
- location = bpmnFileParentPath;
- }
-
- list.addAll(translateBpmn(bpmnFileParentPath, bpmnFileName, poolIdList,
- location));
-
- showErrors(list);
refreshWorkspace();
}
+
+
+ /**
+ * a abstract method to be used to realize the translation
+ *
+ * @param bpmnFileParentPath the bpmn file parent folder
+ * @param bpmnFileName the bpmn file name
+ * @param poolIdList the bpmn id list that are needed to translate
+ * @param location the generated files location
+ * @return the warning and error message when translate
+ */
public abstract List<String> translateBpmn(String bpmnFileParentPath,
String bpmnFileName, List<String> poolIdList, String location);
- public void showErrors(List<String> list) {
- if (list.size() == 0) {
- return;
- }
-
- ListDialog dialog = new ListDialog(Display.getCurrent()
- .getActiveShell());
- dialog.setTitle(B2JMessages.Bpmn_Translate_Message_Dialog_Title);
- dialog.setMessage(B2JMessages.Bpmn_Translate_Message_Dialog_Message);
-
- dialog.setInput(list);
- ILabelProvider labelProvider = new LabelProvider();
- ArrayContentProvider contentProvider = new ArrayContentProvider();
- dialog.setContentProvider(contentProvider);
- dialog.setLabelProvider(labelProvider);
- dialog.open();
- }
-
- public String getGeneratedFileLocation() {
- DirectoryDialog dialog = new DirectoryDialog(Display.getCurrent()
- .getActiveShell());
- dialog.setText(B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Title);
- dialog
- .setMessage(B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Message);
- String path = dialog.open();
- return path;
- }
-
- /*
- * choose some bpmn pool ids from a ids array
- */
- @SuppressWarnings("unchecked")
- public List<String> selectPoolElement(Set<Map.Entry<String, String>> idSet) {
- Shell shell = Display.getCurrent().getActiveShell();
- ILabelProvider labelProvider = new LabelProvider();
- ArrayContentProvider contentProvider = new ArrayContentProvider();
- ListSelectionDialog dialog = new ListSelectionDialog(shell, idSet,
- contentProvider, labelProvider, null);
- dialog.setMessage(B2JMessages.Bpmn_Pool_Choose_Dialog_Message);
- dialog.setTitle(B2JMessages.Bpmn_Pool_Choose_Dialog_Title);
- Object[] selected = null;
- if (dialog.open() == Window.OK) {
- selected = dialog.getResult();
- }
- List<String> list = new ArrayList<String>();
- if (selected == null) {
- return list;
- }
- for (Object entry : selected) {
- list.add(((Entry<String, String>) entry).getKey());
- }
- return list;
- }
-
public Document getDocument(String bpmnFileParentPath, String bpmnFileName)
throws Exception {
Document bpmnDocument = null;
@@ -144,4 +102,6 @@
public void selectionChanged(IAction arg0, ISelection selection) {
bpmnFile = (IFile) ((IStructuredSelection) selection).getFirstElement();
}
+
+
}
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/translate/BPMNTranslator.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/translate/BPMNTranslator.java 2008-09-12 03:36:51 UTC (rev 10213)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/translate/BPMNTranslator.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -17,7 +17,8 @@
/**
* @author Grid Qian
*
- * this is a root translator
+ * this is a root translator. You should extend it and realize the
+ * method: translateDiagram.
*/
public abstract class BPMNTranslator {
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java 2008-09-12 03:36:51 UTC (rev 10213)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/BPMNToUtil.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -20,7 +20,6 @@
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -136,7 +135,7 @@
/*
* get bpmn pool id list from a dom document
*/
- public static Set<Map.Entry<String, String>> getPoolIDsFromDocument(
+ public static Map<String, String> getPoolIDsFromDocument(
Document document) {
Map<String, String> poolIDMap = new HashMap<String, String>();
Element diagram = document.getRootElement();
@@ -148,6 +147,6 @@
.attributeValue(B2JMessages.Dom_Element_Name));
}
}
- return poolIDMap.entrySet();
+ return poolIDMap;
}
}
Added: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnPoolsChoicePage.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnPoolsChoicePage.java (rev 0)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnPoolsChoicePage.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.bpmnto.wizard;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.b2j.messages.B2JMessages;
+
+/**
+ * @author Grid Qian
+ *
+ * the wizardpage used by user to choose the bpmn pool from a bpmn diagram
+ */
+public class BpmnPoolsChoicePage extends WizardPage {
+
+ CheckboxTableViewer listViewer;
+ String listTitle;
+ private Map<String, String> idMap;
+ private IWizard wizard;
+
+ public BpmnPoolsChoicePage(String pageName, String listTitle,
+ Map<String, String> idMap) {
+ super(pageName);
+ this.listTitle = listTitle;
+ this.idMap = idMap;
+ this.setTitle(pageName);
+ }
+
+ public void createControl(Composite parent) {
+ Composite composite = createDialogArea(parent);
+ createListTitleArea(composite);
+
+ createListViewer(composite);
+
+ addSelectionButtons(composite);
+
+ setControl(composite);
+ initializePage();
+ initializeViewerSelection();
+ }
+
+ private void initializeViewerSelection() {
+ wizard = this.getWizard();
+ List<String> poolIdList = ((BpmnToWizard) wizard).getPoolIdList();
+ if (poolIdList.size() == 0) {
+ listViewer.setAllChecked(false);
+ } else {
+ for (String id : poolIdList) {
+ Set<Entry<String, String>> set = idMap.entrySet();
+ Entry<String, String> selectedEntry = null;
+ for (Entry<String, String> entry : set) {
+ if (entry.getKey().equals(id)) {
+ selectedEntry = entry;
+ break;
+ }
+ }
+ listViewer.setChecked(selectedEntry, true);
+ }
+ }
+ }
+
+ private void initializePage() {
+ setPageComplete(false);
+ listViewer.setInput(idMap.entrySet());
+ }
+
+ private void addSelectionButtons(Composite composite) {
+ Composite buttonComposite = new Composite(composite, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 0;
+ layout.marginWidth = 0;
+ layout.horizontalSpacing = 4;
+ buttonComposite.setLayout(layout);
+ buttonComposite.setLayoutData(new GridData(SWT.END, SWT.TOP, true,
+ false));
+
+ Button selectButton = createButton(buttonComposite, B2JMessages.Label_Select_All,
+ false);
+
+ SelectionListener listener = new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ listViewer.setAllChecked(true);
+ (((BpmnToWizard) wizard)).getPoolIdList()
+ .addAll(idMap.keySet());
+ changeComplete();
+ }
+ };
+ selectButton.addSelectionListener(listener);
+
+ Button deselectButton = createButton(buttonComposite,
+ B2JMessages.Label_Deselect_All, false);
+
+ listener = new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ listViewer.setAllChecked(false);
+ (((BpmnToWizard) wizard)).getPoolIdList().clear();
+ changeComplete();
+ }
+ };
+ deselectButton.addSelectionListener(listener);
+ }
+
+ private Button createButton(Composite parent, String label,
+ boolean defaultButton) {
+ // increment the number of columns in the button bar
+ ((GridLayout) parent.getLayout()).numColumns++;
+ Button button = new Button(parent, SWT.PUSH);
+ button.setText(label);
+ if (defaultButton) {
+ Shell shell = parent.getShell();
+ if (shell != null) {
+ shell.setDefaultButton(button);
+ }
+ }
+ setButtonLayoutData(button);
+ return button;
+ }
+
+ private void createListViewer(Composite composite) {
+ listViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER);
+ GridData data = new GridData(GridData.FILL_BOTH);
+ data.heightHint = 250;
+ data.widthHint = 300;
+ listViewer.getTable().setLayoutData(data);
+
+ listViewer.setLabelProvider(new LabelProvider());
+ listViewer.setContentProvider(new ArrayContentProvider());
+ listViewer.addCheckStateListener(new ICheckStateListener() {
+ @SuppressWarnings("unchecked")
+ public void checkStateChanged(CheckStateChangedEvent event) {
+ if (event.getChecked()) {
+ (((BpmnToWizard) wizard)).getPoolIdList().add(
+ ((Entry<String, String>) event.getElement())
+ .getKey());
+ } else {
+ (((BpmnToWizard) wizard)).getPoolIdList().remove(
+ ((Entry<String, String>) event.getElement())
+ .getKey());
+ }
+ changeComplete();
+ }
+ });
+ }
+
+ private Label createListTitleArea(Composite composite) {
+ Label label = new Label(composite, SWT.NONE);
+ label.setText(listTitle);
+ label.setFont(composite.getFont());
+ return label;
+ }
+
+ private Composite createDialogArea(Composite parent) {
+ // create a composite with standard margins and spacing
+ Composite composite = new Composite(parent, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.marginHeight = 7;
+ layout.marginWidth = 7;
+ layout.verticalSpacing = 4;
+ layout.horizontalSpacing = 4;
+ composite.setLayout(layout);
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ return composite;
+ }
+
+ public void changeComplete() {
+ if (listViewer.getCheckedElements().length != 0) {
+ setPageComplete(true);
+ } else {
+ setPageComplete(false);
+ }
+ }
+
+}
Added: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java (rev 0)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizard.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.bpmnto.wizard;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.b2j.messages.B2JMessages;
+
+/**
+ * @author Grid Qian
+ *
+ * the wizard for bpmn translation
+ */
+public class BpmnToWizard extends Wizard{
+
+ BpmnPoolsChoicePage poolsPage;
+ GeneratedFileLocationPage locationPage;
+ ErrorMessagesPage errorPage;
+
+ // bpmn pool id:name map
+ Map<String, String> idMap;
+ List<String> poolIdList = new ArrayList<String>();
+ String location;
+ List<String> errorList = new ArrayList<String>();
+
+ public BpmnToWizard(String title,Map<String, String> idMap){
+ super();
+ super.setWindowTitle(title);
+ this.idMap = idMap;
+ }
+
+ public void addPages(){
+ super.addPages();
+ poolsPage = new BpmnPoolsChoicePage(B2JMessages.Bpmn_Pool_Choose_Dialog_Title, B2JMessages.Bpmn_Pool_Choose_Dialog_Message,idMap);
+ locationPage = new GeneratedFileLocationPage(B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Title,B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Message);
+ errorPage = new ErrorMessagesPage(B2JMessages.Bpmn_Translate_Message_Dialog_Title,B2JMessages.Bpmn_Translate_Message_Dialog_Message);
+ addPage(poolsPage);
+ addPage(locationPage);
+ addPage(errorPage);
+ }
+ public boolean performFinish() {
+
+ return true;
+ }
+
+
+ public List<String> getPoolIdList() {
+ return poolIdList;
+ }
+
+ public void setPoolIdList(List<String> poolIdList) {
+ this.poolIdList = poolIdList;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ public List<String> getErrorList() {
+ return errorList;
+ }
+
+ public void setErrorList(List<String> errorList) {
+ this.errorList = errorList;
+ }
+
+}
Added: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizardDialog.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizardDialog.java (rev 0)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/BpmnToWizardDialog.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.bpmnto.wizard;
+
+import java.util.List;
+
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IActionDelegate;
+import org.jboss.tools.bpmnto.action.BpmnToAction;
+
+/**
+ * @author Grid Qian
+ *
+ * wizard dialog for bpmn tranlation
+ */
+public class BpmnToWizardDialog extends WizardDialog {
+
+ IActionDelegate action;
+
+ public BpmnToWizardDialog(Shell parentShell, IWizard newWizard,
+ IActionDelegate action) {
+ super(parentShell, newWizard);
+ this.action = action;
+ }
+
+ public void nextPressed() {
+ IWizardPage page = this.getCurrentPage();
+ if (page instanceof GeneratedFileLocationPage) {
+ List<String> list = ((BpmnToAction) action).errorList;
+ String location = ((BpmnToWizard) this.getWizard()).getLocation();
+ if (location == null || "".equals(location)) {
+ location = ((BpmnToAction) action).bpmnFile.getParent()
+ .getLocation().toOSString();
+ }
+ list.addAll(((BpmnToAction) action).translateBpmn(
+ ((BpmnToAction) action).bpmnFile.getParent().getLocation()
+ .toOSString(), ((BpmnToAction) action).bpmnFile
+ .getName(), ((BpmnToWizard) this.getWizard())
+ .getPoolIdList(), location));
+ ((BpmnToWizard) this.getWizard()).setErrorList(list);
+ ((ErrorMessagesPage) page.getNextPage()).listViewer
+ .setInput(((BpmnToWizard) this.getWizard()).getErrorList());
+ }
+ showPage(page.getNextPage());
+ }
+
+}
Added: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/ErrorMessagesPage.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/ErrorMessagesPage.java (rev 0)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/ErrorMessagesPage.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.bpmnto.wizard;
+
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+/**
+ * @author Grid Qian
+ *
+ * the wizardpage for showing the error and warning messages from translating
+ */
+public class ErrorMessagesPage extends WizardPage{
+
+ TableViewer listViewer;
+ String listTitle;
+
+ protected ErrorMessagesPage(String pageName, String listTitle) {
+ super(pageName);
+ this.listTitle = listTitle;
+ this.setTitle(pageName);
+ }
+
+ public void createControl(Composite parent) {
+ Composite composite = createDialogArea(parent);
+
+ createListTitleArea(composite);
+ createListViewer(composite);
+ setControl(composite);
+
+ initializeViewer();
+
+ }
+
+ private void initializeViewer() {
+ listViewer.setInput(((BpmnToWizard)this.getWizard()).getErrorList());
+ }
+
+ private void createListViewer(Composite composite) {
+ listViewer = new TableViewer(composite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
+ GridData data = new GridData(GridData.FILL_BOTH);
+ data.heightHint = 250;
+ data.widthHint = 300;
+ listViewer.getTable().setLayoutData(data);
+
+ listViewer.setLabelProvider(new LabelProvider());
+ listViewer.setContentProvider(new ArrayContentProvider());
+ }
+
+ private Label createListTitleArea(Composite composite) {
+ Label label = new Label(composite, SWT.NONE);
+ label.setText(listTitle);
+ label.setFont(composite.getFont());
+ return label;
+ }
+
+ private Composite createDialogArea(Composite parent) {
+ // create a composite with standard margins and spacing
+ Composite composite = new Composite(parent, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.marginHeight = 7;
+ layout.marginWidth = 7;
+ layout.verticalSpacing = 4;
+ layout.horizontalSpacing = 4;
+ composite.setLayout(layout);
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ return composite;
+ }
+
+ public boolean isPageComplete() {
+ return true;
+ }
+
+}
Added: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java (rev 0)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/wizard/GeneratedFileLocationPage.java 2008-09-12 05:37:31 UTC (rev 10214)
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.bpmnto.wizard;
+
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.b2j.messages.B2JMessages;
+
+/**
+ * @author Grid Qian
+ *
+ * the wizardpage for the generated file location
+ */
+public class GeneratedFileLocationPage extends WizardPage{
+
+ String message;
+ Text pathText;
+ private IWizard wizard;
+
+ protected GeneratedFileLocationPage(String pageName, String message) {
+ super(pageName);
+ this.message = message;
+ this.setTitle(pageName);
+ }
+
+ public void createControl(Composite parent) {
+ Composite composite = createDialogArea(parent);
+ createMessageArea(composite);
+ createLocationArea(composite);
+
+ setControl(composite);
+
+ }
+
+ private void createLocationArea(Composite parent) {
+ Group composite = new Group(parent, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 3;
+ composite.setLayout(layout);
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+ Label label = new Label(composite, SWT.NONE);
+ label.setText("Location:");
+ label.setFont(parent.getFont());
+
+
+ pathText = new Text(composite, SWT.BORDER);
+ pathText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ pathText.setEditable(false);
+
+ Button browse = new Button(composite, SWT.PUSH);
+ browse.setText(B2JMessages.Label_Button_Browse);
+ browse.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.OPEN);
+ dialog.setText(B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Title);
+ dialog.setMessage(B2JMessages.Bpmn_GeneratedFile_Location_Dialog_Message);
+ String path = dialog.open();
+ if (path != null && path.length() > 0) {
+ pathText.setText(path);
+ ((BpmnToWizard)wizard).setLocation(path);
+ }
+ }
+ });
+
+ initializePage();
+
+
+ }
+
+ private void initializePage() {
+ wizard = this.getWizard();
+ pathText.setText(((BpmnToWizard)wizard).getLocation() == null ?"" : ((BpmnToWizard)wizard).getLocation());
+
+ }
+
+ private Label createMessageArea(Composite parent) {
+ Label label = new Label(parent, SWT.NONE);
+ label.setText(message);
+ label.setFont(parent.getFont());
+ return label;
+ }
+
+ private Composite createDialogArea(Composite parent) {
+ // create a composite with standard margins and spacing
+ Composite composite = new Composite(parent, SWT.NONE);
+ GridLayout layout = new GridLayout();
+ layout.marginHeight = 7;
+ layout.marginWidth = 7;
+ layout.verticalSpacing = 4;
+ layout.horizontalSpacing = 4;
+ composite.setLayout(layout);
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ return composite;
+ }
+
+ public boolean isPageComplete() {
+ return true;
+ }
+
+}
17 years, 7 months
- 1
- 0
JBoss Tools SVN: r10213 - in trunk/ws/plugins: org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-09-11 23:36:51 -0400 (Thu, 11 Sep 2008)
New Revision: 10213
Added:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/IMessageNotifier.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSPropertyPage.java
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JBossWSClassPathCommand.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java
Log:
JBIDE-2634: add a propertypage to change project jbossws runtime
JBIDE-2632: fix the inconsistent disabled/enabled server setup issue
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JBossWSClassPathCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JBossWSClassPathCommand.java 2008-09-12 03:02:28 UTC (rev 10212)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JBossWSClassPathCommand.java 2008-09-12 03:36:51 UTC (rev 10213)
@@ -62,6 +62,18 @@
.setPersistentProperty(
IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_SERVER_SUPPLIED_RUNTIME,
IJBossWSFacetDataModelProperties.DEFAULT_VALUE_IS_SERVER_SUPPLIED);
+ project
+ .setPersistentProperty(
+ IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME,
+ null);
+ project
+ .setPersistentProperty(
+ IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_RNTIME_LOCATION,
+ null);
+ project
+ .setPersistentProperty(
+ IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_ISDEPLOYED,
+ null);
} else {
// store runtime name and runtime location to the project
@@ -69,6 +81,7 @@
.getStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID);
String runtimeLocation = model
.getStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME);
+ boolean isDeployed = model.getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY);
project
.setPersistentProperty(
IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME,
@@ -77,8 +90,13 @@
.setPersistentProperty(
IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_RNTIME_LOCATION,
runtimeLocation);
- boolean isDeployed = model
- .getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY);
+ project.setPersistentProperty(IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_ISDEPLOYED,
+ String.valueOf(isDeployed));
+
+ project
+ .setPersistentProperty(
+ IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_SERVER_SUPPLIED_RUNTIME,
+ null);
status = addClassPath(project, runtimeName, isDeployed);
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java 2008-09-12 03:02:28 UTC (rev 10212)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/UninstallJBossWSClassPathCommand.java 2008-09-12 03:36:51 UTC (rev 10213)
@@ -69,6 +69,10 @@
public IStatus removeClassPath(IProject project, String segment) {
IStatus status = Status.OK_STATUS;
+ if(segment == null || "".equals(segment)){
+ return status;
+ }
+
try {
IJavaProject javaProject = JavaCore.create(project);
IClasspathEntry[] oldClasspathEntries = javaProject
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java 2008-09-12 03:02:28 UTC (rev 10212)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/facet/delegate/IJBossWSFacetDataModelProperties.java 2008-09-12 03:36:51 UTC (rev 10213)
@@ -27,13 +27,15 @@
String PERSISTENT_PROPERTY_IS_SERVER_SUPPLIED_RUNTIME = "is.server.supplied.runtime";
String JBOSS_WS_RUNTIME_HOME = "jboss.ws.runtime.home";
- String DEFAULT_VALUE_IS_SERVER_SUPPLIED = "1";
+ String DEFAULT_VALUE_IS_SERVER_SUPPLIED = "true";
static QualifiedName PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME = new QualifiedName(QUALIFIEDNAME_IDENTIFIER,
JBOSS_WS_RUNTIME_ID);
static QualifiedName PERSISTENCE_PROPERTY_RNTIME_LOCATION = new QualifiedName(QUALIFIEDNAME_IDENTIFIER,
JBOSS_WS_RUNTIME_HOME);
+ static QualifiedName PERSISTENCE_PROPERTY_ISDEPLOYED = new QualifiedName(QUALIFIEDNAME_IDENTIFIER,
+ JBOSS_WS_DEPLOY);
static QualifiedName PERSISTENCE_PROPERTY_SERVER_SUPPLIED_RUNTIME = new QualifiedName(
QUALIFIEDNAME_IDENTIFIER,
PERSISTENT_PROPERTY_IS_SERVER_SUPPLIED_RUNTIME);
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-09-12 03:02:28 UTC (rev 10212)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/messages/JBossWSCreationCore.properties 2008-09-12 03:36:51 UTC (rev 10213)
@@ -36,7 +36,7 @@
JBossWSFacetInstallPage_Title=JBossWS Facet
JBossWSFacetInstallPage_Description=Select JBossWS Web Service runtime
JBossWSFacetInstallPage_ServerSuppliedJBossWS=Server Supplied JBossWS Runtime
-JBossWSFacetInstallPage_Deploy=Deploy
+JBossWSFacetInstallPage_Deploy= Add all JBossWS runtime jars into the deploy archive
JBossWSFacetInstallPage_New=New...
Client_Sample_Run_Over= Call Over!
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-09-12 03:02:28 UTC (rev 10212)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2008-09-12 03:36:51 UTC (rev 10213)
@@ -62,5 +62,13 @@
</page>
</wizard-pages>
</extension>
+ <extension
+ point="org.eclipse.ui.propertyPages">
+ <page
+ class="org.jboss.tools.ws.creation.ui.project.facet.JBossWSPropertyPage"
+ id="org.jboss.tools.ws.creation.ui.page"
+ name="JBossWS Runtime">
+ </page>
+ </extension>
</plugin>
Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/IMessageNotifier.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/IMessageNotifier.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/IMessageNotifier.java 2008-09-12 03:36:51 UTC (rev 10213)
@@ -0,0 +1,7 @@
+package org.jboss.tools.ws.creation.ui.project.facet;
+
+public interface IMessageNotifier {
+
+ void notify(String msg);
+
+}
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-09-12 03:02:28 UTC (rev 10212)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSFacetInstallPage.java 2008-09-12 03:36:51 UTC (rev 10213)
@@ -10,59 +10,25 @@
******************************************************************************/
package org.jboss.tools.ws.creation.ui.project.facet;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EventObject;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
-import org.jboss.tools.ws.core.classpath.JBossWSRuntime;
-import org.jboss.tools.ws.core.classpath.JBossWSRuntimeManager;
-import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties;
-import org.jboss.tools.ws.core.utils.StatusUtils;
import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
-import org.jboss.tools.ws.creation.ui.CreationUIPlugin;
-import org.jboss.tools.ws.ui.preferences.JBossRuntimeListFieldEditor;
/**
* @author Dennyxu
*
*/
public class JBossWSFacetInstallPage extends AbstractFacetWizardPage implements
- IFacetWizardPage, IDataModelListener {
+ IFacetWizardPage, IDataModelListener, IMessageNotifier {
- private Button btnServerSupplied;
- private Button btnUserSupplied;
- private Combo cmbRuntimes;
- private Button btnDeploy;
- private Button btnNew;
+
private IDataModel model;
+ private JBossWSRuntimeConfigBlock block;
public JBossWSFacetInstallPage() {
super(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Title);
@@ -74,299 +40,23 @@
this.model = (IDataModel) config;
}
-
- private void setInitialValues(){
- boolean isServerSupplied = model.getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED);
- String runtimeName = model.getStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID);
- boolean isDeploy = model.getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY);
- if(isServerSupplied){
- btnServerSupplied.setSelection(true);
- }else if(runtimeName != null && !runtimeName.equals("")){
- btnUserSupplied.setSelection(true);
- if(isDeploy){
- btnDeploy.setSelection(true);
- }
- }
- initializeRuntimesCombo(cmbRuntimes, runtimeName);
-
- }
public void createControl(Composite parent) {
- initializeDialogUnits(parent);
-
- Composite composite = new Composite(parent, SWT.NONE);
-
- GridLayout gridLayout = new GridLayout(4, false);
- composite.setLayout(gridLayout);
-
- btnServerSupplied = new Button(composite, SWT.RADIO);
- btnServerSupplied.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- setServerSuppliedSelection(e);
- }
- });
- GridData gd = new GridData();
-
- gd.horizontalSpan = 1;
- btnServerSupplied.setLayoutData(gd);
-
- Label lblServerSupplied = new Label(composite, SWT.NONE);
- lblServerSupplied.addMouseListener(new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- btnServerSupplied.setSelection(true);
- setServerSuppliedSelection(e);
- }
- });
- lblServerSupplied.setText(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_ServerSuppliedJBossWS);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- lblServerSupplied.setLayoutData(gd);
-
- btnUserSupplied = new Button(composite, SWT.RADIO);
-
- btnUserSupplied.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- setUserSuppliedSelection(e);
- }
- });
-
- cmbRuntimes = new Combo(composite, SWT.READ_ONLY);
- cmbRuntimes.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- cmbRuntimes.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- String runtimeName = cmbRuntimes.getText();
- JBossWSRuntime jr = (JBossWSRuntime) cmbRuntimes
- .getData(runtimeName);
- saveJBosswsRuntimeToModel(jr);
- }
- });
-
- btnDeploy = new Button(composite, SWT.CHECK);
- btnDeploy.setText(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Deploy);
- btnDeploy.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- model.setBooleanProperty(
- IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY,
- btnDeploy.getSelection());
- }
- });
-
- btnNew = new Button(composite, SWT.NONE);
- btnNew.setText(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_New);
- btnNew.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- newJBossWSRuntime();
- changePageStatus();
- }
- });
-
- setInitialValues();
- setControl(composite);
- changePageStatus();
-
+ block = new JBossWSRuntimeConfigBlock(model);
+ block.setMessageNotifier(this);
+ setControl(block.createControl(parent));
+ setPageComplete(block.isPageComplete());
}
-
- protected void saveJBosswsRuntimeToModel(JBossWSRuntime jbws) {
- String duplicateMsg = "";
- try {
- duplicateMsg = getDuplicateJars(jbws.getName());
- } catch (JavaModelException e1) {
- CreationUIPlugin.getDefault().getLog().log(
- StatusUtils.errorStatus(e1));
- }
- if ("".equals(duplicateMsg)) {
- model.setStringProperty(
- IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME,
- jbws.getHomeDir());
- model.setStringProperty(
- IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, jbws
- .getName());
- }else{
- model.setStringProperty(
- IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, null);
- model.setStringProperty(
- IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, null);
- }
- }
- protected void setServerSuppliedSelection(EventObject e) {
- btnServerSupplied.setSelection(true);
- btnUserSupplied.setSelection(false);
- model
- .setBooleanProperty(
- IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED,
- true);
- //remove user supplied properties
- model.setStringProperty(
- IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, null);
- model.setStringProperty(
- IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, null);
- enableUserSupplied(false);
- changePageStatus();
-
- }
-
- protected void setUserSuppliedSelection(EventObject e) {
- btnServerSupplied.setSelection(false);
- btnUserSupplied.setSelection(true);
- model
- .setBooleanProperty(
- IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED,
- false);
- String runtimeId = cmbRuntimes.getText();
- JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance().findRuntimeByName(runtimeId);
+ public void propertyChanged(DataModelEvent event) {
-
- if (jbws != null) {
- saveJBosswsRuntimeToModel(jbws);
- }
- enableUserSupplied(true);
- changePageStatus();
-
}
- protected void enableUserSupplied(boolean enabled) {
- cmbRuntimes.setEnabled(enabled);
- btnDeploy.setEnabled(enabled);
- btnNew.setEnabled(enabled);
-
+ public void notify(String msg) {
+ setErrorMessage(msg);
+ setPageComplete(block.isPageComplete());
}
-
- protected void initializeRuntimesCombo(Combo cmRuntime, String runtimeName) {
- JBossWSRuntime selectedJbws = null;
- JBossWSRuntime defaultJbws = null;
- int selectIndex = 0;
- int defaultIndex = 0;
- cmRuntime.removeAll();
- JBossWSRuntime[] runtimes = JBossWSRuntimeManager.getInstance()
- .getRuntimes();
- for (int i = 0; i < runtimes.length; i++) {
- JBossWSRuntime jr = runtimes[i];
- cmRuntime.add(jr.getName());
- cmRuntime.setData(jr.getName(), jr);
-
- if(jr.getName().equals(runtimeName)){
- selectedJbws = jr;
- selectIndex = i;
- }
- // get default jbossws runtime
- if (jr.isDefault()) {
- defaultJbws = jr;
- defaultIndex = i;
- }
- }
-
- if(selectedJbws != null){
- cmRuntime.select(selectIndex);
- saveJBosswsRuntimeToModel(selectedJbws);
- }else if(defaultJbws != null){
- cmRuntime.select(defaultIndex);
- saveJBosswsRuntimeToModel(defaultJbws);
- }
- }
-
- /*
- * create a new jbossws runtime and set user supplied runtime to the new one
- */
- protected void newJBossWSRuntime() {
- List<JBossWSRuntime> exists = new ArrayList<JBossWSRuntime>(Arrays.asList(JBossWSRuntimeManager.getInstance().getRuntimes()));
- List<JBossWSRuntime> added = new ArrayList<JBossWSRuntime>();
-
- JBossRuntimeListFieldEditor.JBossWSRuntimeNewWizard newRtwizard = new JBossRuntimeListFieldEditor.JBossWSRuntimeNewWizard(
- exists, added) {
- public boolean performFinish() {
- JBossWSRuntime rt = getRuntime();
- rt.setDefault(true);
- JBossWSRuntimeManager.getInstance().addRuntime(rt);
- JBossWSRuntimeManager.getInstance().save();
-
- return true;
- }
- };
- WizardDialog dialog = new WizardDialog(Display.getCurrent()
- .getActiveShell(), newRtwizard);
- if (dialog.open() == WizardDialog.OK) {
- initializeRuntimesCombo(cmbRuntimes, null);
- //cmbRuntimes.select(0);
- }
- }
-
- protected void changePageStatus() {
-
- if (btnUserSupplied.getSelection()
- && cmbRuntimes.getSelectionIndex() == -1) {
- setErrorMessage(JBossWSCreationCoreMessages.Error_WS_No_Runtime_Specifed);
- } else if (!btnUserSupplied.getSelection()
- && !btnServerSupplied.getSelection()) {
- setErrorMessage(JBossWSCreationCoreMessages.Error_WS_Chose_runtime);
- }else if(btnUserSupplied.getSelection()){
- String duplicateMsg = "";
- try {
- duplicateMsg = getDuplicateJars(cmbRuntimes.getText());
- } catch (JavaModelException e1) {
- CreationUIPlugin.getDefault().getLog().log(StatusUtils.errorStatus(e1));
- }
- if(!duplicateMsg.equals("")){
- setErrorMessage("Duplicated jar on classpath:" + duplicateMsg);
- }else{
- setErrorMessage(null);
- }
- }else{
- setErrorMessage(null);
- }
-
- setPageComplete(isPageComplete());
- }
-
- @Override
- public boolean isPageComplete() {
- if (btnServerSupplied.getSelection()
- || (btnUserSupplied.getSelection() && cmbRuntimes
- .getSelectionIndex() != -1)) {
- return true;
- } else {
- return false;
- }
- }
-
- public void propertyChanged(DataModelEvent event) {
-
- }
- protected String getDuplicateJars(String jbwsName) throws JavaModelException{
- List<String> allExistingJars = new ArrayList<String>();
- List<String> runtimeJars = new ArrayList<String>();
+
- JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance().findRuntimeByName(jbwsName);
- if(jbws.isUserConfigClasspath()){
- runtimeJars.addAll(jbws.getLibraries());
- }else{
- runtimeJars.addAll(JBossWSRuntimeManager.getInstance().getAllRuntimeJars(jbws));
- }
-
- String prjName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName);
- IJavaProject javaProject = JavaCore.create(project);
- IClasspathEntry[] entries = javaProject.getRawClasspath();
- for(IClasspathEntry entry: entries){
- if(entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER){
- IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), javaProject);
- for(IClasspathEntry containedEntry: container.getClasspathEntries()){
- allExistingJars.add(containedEntry.getPath().toOSString());
- }
- }else if(entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY){
- allExistingJars.add(entry.getPath().toOSString());
- }
- }
-
- for(String jarName: runtimeJars){
- if(allExistingJars.contains(jarName)){
- return jarName;
- }
- }
-
- return "";
-
- }
-
}
\ No newline at end of file
Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSPropertyPage.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSPropertyPage.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSPropertyPage.java 2008-09-12 03:36:51 UTC (rev 10213)
@@ -0,0 +1,71 @@
+package org.jboss.tools.ws.creation.ui.project.facet;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.dialogs.PropertyPage;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.tools.ws.core.command.JBossWSClassPathCommand;
+import org.jboss.tools.ws.core.command.UninstallJBossWSClassPathCommand;
+import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties;
+import org.jboss.tools.ws.core.facet.delegate.JBossWSFacetInstallDataModelProvider;
+
+public class JBossWSPropertyPage extends PropertyPage implements
+ IMessageNotifier {
+
+ private IDataModel model;
+ private IProject project;
+
+ public JBossWSPropertyPage() {
+ super();
+ }
+
+ @Override
+ protected Control createContents(Composite parent) {
+ project = (IProject)this.getElement();
+ model = (IDataModel)new JBossWSFacetInstallDataModelProvider().create();
+ try {
+ String isDeploy = project.getPersistentProperty(IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_ISDEPLOYED);
+ String runtimeid = project.getPersistentProperty(IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME);
+ String runtimeLocation = project.getPersistentProperty(IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_RNTIME_LOCATION);
+ String serverSupplied = project.getPersistentProperty(
+ IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_SERVER_SUPPLIED_RUNTIME);
+ model.setProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY, Boolean.valueOf(isDeploy));
+ model.setProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, runtimeLocation);
+ model.setProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, runtimeid);
+ model.setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
+ model.setBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, Boolean.valueOf(serverSupplied));
+ //model.setProperty(IJBossWSFacetDataModelProperties.PERSISTENT_PROPERTY_IS_SERVER_SUPPLIED_RUNTIME, Boolean.valueOf(serverSupplied));
+ } catch (CoreException e) {
+ //ignore
+ }
+
+ JBossWSRuntimeConfigBlock block = new JBossWSRuntimeConfigBlock(model);
+ block.setMessageNotifier(this);
+ return block.createControl(parent);
+ }
+
+ public void notify(String msg) {
+ setErrorMessage(msg);
+ }
+
+ @Override
+ protected void performApply() {
+
+ UninstallJBossWSClassPathCommand uninstall = new UninstallJBossWSClassPathCommand(
+ project, model);
+ uninstall.executeOverride(null);
+
+ JBossWSClassPathCommand install = new JBossWSClassPathCommand(project, model);
+ install.executeOverride(null);
+
+ super.performApply();
+ }
+
+
+
+}
Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java (rev 0)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/project/facet/JBossWSRuntimeConfigBlock.java 2008-09-12 03:36:51 UTC (rev 10213)
@@ -0,0 +1,383 @@
+package org.jboss.tools.ws.creation.ui.project.facet;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EventObject;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.core.IClasspathContainer;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.jboss.tools.ws.core.classpath.JBossWSRuntime;
+import org.jboss.tools.ws.core.classpath.JBossWSRuntimeManager;
+import org.jboss.tools.ws.core.facet.delegate.IJBossWSFacetDataModelProperties;
+import org.jboss.tools.ws.core.utils.StatusUtils;
+import org.jboss.tools.ws.creation.core.messages.JBossWSCreationCoreMessages;
+import org.jboss.tools.ws.creation.ui.CreationUIPlugin;
+import org.jboss.tools.ws.ui.preferences.JBossRuntimeListFieldEditor;
+
+public class JBossWSRuntimeConfigBlock {
+
+ private Button btnServerSupplied;
+ private Button btnUserSupplied;
+ private Combo cmbRuntimes;
+ private Button btnDeploy;
+ private Button btnNew;
+
+ private String errMsg;
+ private IMessageNotifier notifier;
+
+ private IDataModel model;
+
+ public JBossWSRuntimeConfigBlock(Object config){
+ this.model = (IDataModel) config;
+
+ }
+
+
+ public void setMessageNotifier(IMessageNotifier notifier){
+ this.notifier = notifier;
+ }
+
+
+
+ public Composite createControl(Composite parent) {
+
+ Composite composite = new Composite(parent, SWT.NONE);
+
+ GridLayout gridLayout = new GridLayout(3, false);
+ composite.setLayout(gridLayout);
+
+ btnServerSupplied = new Button(composite, SWT.RADIO);
+ btnServerSupplied.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ setServerSuppliedSelection(e);
+ }
+ });
+ GridData gd = new GridData();
+
+ gd.horizontalSpan = 1;
+ btnServerSupplied.setLayoutData(gd);
+
+ Label lblServerSupplied = new Label(composite, SWT.NONE);
+ lblServerSupplied.addMouseListener(new MouseAdapter() {
+ public void mouseDown(MouseEvent e) {
+ btnServerSupplied.setSelection(true);
+ setServerSuppliedSelection(e);
+ }
+ });
+ lblServerSupplied.setText(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_ServerSuppliedJBossWS);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 2;
+ lblServerSupplied.setLayoutData(gd);
+
+ btnUserSupplied = new Button(composite, SWT.RADIO);
+
+ btnUserSupplied.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ setUserSuppliedSelection(e);
+ }
+ });
+
+ cmbRuntimes = new Combo(composite, SWT.READ_ONLY);
+ cmbRuntimes.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ cmbRuntimes.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ String runtimeName = cmbRuntimes.getText();
+ JBossWSRuntime jr = (JBossWSRuntime) cmbRuntimes
+ .getData(runtimeName);
+ saveJBosswsRuntimeToModel(jr);
+ changePageStatus();
+ }
+ });
+
+ btnNew = new Button(composite, SWT.NONE);
+ btnNew.setText(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_New);
+ btnNew.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ newJBossWSRuntime();
+ changePageStatus();
+ }
+ });
+
+ btnDeploy = new Button(composite, SWT.CHECK);
+ btnDeploy.setText(JBossWSCreationCoreMessages.JBossWSFacetInstallPage_Deploy);
+ btnDeploy.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ model.setBooleanProperty(
+ IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY,
+ btnDeploy.getSelection());
+ }
+ });
+ gd = new GridData();
+ gd.horizontalSpan = 3;
+ btnDeploy.setLayoutData(gd);
+
+ setInitialValues();
+ changePageStatus();
+
+ return composite;
+
+ }
+
+ private void setInitialValues(){
+ boolean isServerSupplied = model.getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED);
+ String runtimeName = model.getStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID);
+ boolean isDeploy = model.getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY);
+ if(isServerSupplied){
+ btnServerSupplied.setSelection(true);
+ enableUserSupplied(false);
+ }else if(runtimeName != null && !runtimeName.equals("")){
+ btnUserSupplied.setSelection(true);
+ if(isDeploy){
+ btnDeploy.setSelection(true);
+ }
+
+ }
+ initializeRuntimesCombo(cmbRuntimes, runtimeName);
+
+ }
+
+ protected void saveJBosswsRuntimeToModel(JBossWSRuntime jbws) {
+ String duplicateMsg = "";
+ try {
+ duplicateMsg = getDuplicateJars(jbws.getName());
+ } catch (JavaModelException e1) {
+ CreationUIPlugin.getDefault().getLog().log(
+ StatusUtils.errorStatus(e1));
+ }
+ if ("".equals(duplicateMsg)) {
+ model.setStringProperty(
+ IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME,
+ jbws.getHomeDir());
+ model.setStringProperty(
+ IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, jbws
+ .getName());
+ }else{
+ model.setStringProperty(
+ IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, null);
+ model.setStringProperty(
+ IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, null);
+ }
+ }
+
+ protected void setServerSuppliedSelection(EventObject e) {
+ btnServerSupplied.setSelection(true);
+ btnUserSupplied.setSelection(false);
+ model
+ .setBooleanProperty(
+ IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED,
+ true);
+ //remove user supplied properties
+ model.setStringProperty(
+ IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, null);
+ model.setStringProperty(
+ IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, null);
+ enableUserSupplied(false);
+ changePageStatus();
+
+ }
+
+ protected void setUserSuppliedSelection(EventObject e) {
+ btnServerSupplied.setSelection(false);
+ btnUserSupplied.setSelection(true);
+ model
+ .setBooleanProperty(
+ IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED,
+ false);
+ String runtimeId = cmbRuntimes.getText();
+ JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance().findRuntimeByName(runtimeId);
+
+
+ if (jbws != null) {
+ saveJBosswsRuntimeToModel(jbws);
+ }
+ enableUserSupplied(true);
+ changePageStatus();
+
+ }
+
+ protected void enableUserSupplied(boolean enabled) {
+ cmbRuntimes.setEnabled(enabled);
+ btnDeploy.setEnabled(enabled);
+ btnNew.setEnabled(enabled);
+
+ }
+
+ protected void initializeRuntimesCombo(Combo cmRuntime, String runtimeName) {
+ JBossWSRuntime selectedJbws = null;
+ JBossWSRuntime defaultJbws = null;
+ int selectIndex = 0;
+ int defaultIndex = 0;
+ cmRuntime.removeAll();
+ JBossWSRuntime[] runtimes = JBossWSRuntimeManager.getInstance()
+ .getRuntimes();
+ for (int i = 0; i < runtimes.length; i++) {
+ JBossWSRuntime jr = runtimes[i];
+ cmRuntime.add(jr.getName());
+ cmRuntime.setData(jr.getName(), jr);
+
+ if(jr.getName().equals(runtimeName)){
+ selectedJbws = jr;
+ selectIndex = i;
+ }
+ // get default jbossws runtime
+ if (jr.isDefault()) {
+ defaultJbws = jr;
+ defaultIndex = i;
+ }
+ }
+
+ if(selectedJbws != null){
+ cmRuntime.select(selectIndex);
+ saveJBosswsRuntimeToModel(selectedJbws);
+ }else if(defaultJbws != null){
+ cmRuntime.select(defaultIndex);
+ saveJBosswsRuntimeToModel(defaultJbws);
+ }
+ }
+
+ /*
+ * create a new jbossws runtime and set user supplied runtime to the new one
+ */
+ protected void newJBossWSRuntime() {
+ List<JBossWSRuntime> exists = new ArrayList<JBossWSRuntime>(Arrays.asList(JBossWSRuntimeManager.getInstance().getRuntimes()));
+ List<JBossWSRuntime> added = new ArrayList<JBossWSRuntime>();
+
+ JBossRuntimeListFieldEditor.JBossWSRuntimeNewWizard newRtwizard = new JBossRuntimeListFieldEditor.JBossWSRuntimeNewWizard(
+ exists, added) {
+ public boolean performFinish() {
+ JBossWSRuntime rt = getRuntime();
+ rt.setDefault(true);
+ JBossWSRuntimeManager.getInstance().addRuntime(rt);
+ JBossWSRuntimeManager.getInstance().save();
+
+ return true;
+ }
+ };
+ WizardDialog dialog = new WizardDialog(Display.getCurrent()
+ .getActiveShell(), newRtwizard);
+ if (dialog.open() == WizardDialog.OK) {
+ initializeRuntimesCombo(cmbRuntimes, null);
+ //cmbRuntimes.select(0);
+ }
+ }
+
+ protected void changePageStatus() {
+
+ if (btnUserSupplied.getSelection()
+ && cmbRuntimes.getSelectionIndex() == -1) {
+ setErrorMessage(JBossWSCreationCoreMessages.Error_WS_No_Runtime_Specifed);
+ } else if (!btnUserSupplied.getSelection()
+ && !btnServerSupplied.getSelection()) {
+ setErrorMessage(JBossWSCreationCoreMessages.Error_WS_Chose_runtime);
+ }else if(btnUserSupplied.getSelection()){
+ String duplicateMsg = "";
+ try {
+ duplicateMsg = getDuplicateJars(cmbRuntimes.getText());
+ } catch (JavaModelException e1) {
+ CreationUIPlugin.getDefault().getLog().log(StatusUtils.errorStatus(e1));
+ }
+ if(!duplicateMsg.equals("")){
+ setErrorMessage("Duplicated jar on classpath:" + duplicateMsg);
+ }else{
+ setErrorMessage(null);
+ }
+ }else{
+ setErrorMessage(null);
+ }
+
+ //notify the parent property page to set error message
+ if(notifier != null){
+ notifier.notify(errMsg);
+ }
+ }
+
+ private void setErrorMessage(String msg){
+ this.errMsg = msg;
+ }
+
+ public boolean isPageComplete() {
+ if(errMsg != null && !"".equals(errMsg)){
+ return false;
+ }
+ if (btnServerSupplied.getSelection()
+ || (btnUserSupplied.getSelection() && cmbRuntimes
+ .getSelectionIndex() != -1)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public void propertyChanged(DataModelEvent event) {
+
+ }
+
+ protected String getDuplicateJars(String jbwsName) throws JavaModelException{
+ String prjName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
+
+ if(prjName == null || "".equals(prjName)){
+ return "";
+ }
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName);
+ if(!project.exists()){
+ return "";
+ }
+
+ List<String> allExistingJars = new ArrayList<String>();
+ List<String> runtimeJars = new ArrayList<String>();
+
+ JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance().findRuntimeByName(jbwsName);
+ if(jbws.isUserConfigClasspath()){
+ runtimeJars.addAll(jbws.getLibraries());
+ }else{
+ runtimeJars.addAll(JBossWSRuntimeManager.getInstance().getAllRuntimeJars(jbws));
+ }
+
+ IJavaProject javaProject = JavaCore.create(project);
+ IClasspathEntry[] entries = javaProject.getRawClasspath();
+ for(IClasspathEntry entry: entries){
+ if(entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER){
+ if("JBossWS_Runtime".equals(entry.getPath().segment(0))){
+ continue;
+ }
+ IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), javaProject);
+ for(IClasspathEntry containedEntry: container.getClasspathEntries()){
+ allExistingJars.add(containedEntry.getPath().toOSString());
+ }
+ }else if(entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY){
+ allExistingJars.add(entry.getPath().toOSString());
+ }
+ }
+
+ for(String jarName: runtimeJars){
+ if(allExistingJars.contains(jarName)){
+ return jarName;
+ }
+ }
+
+ return "";
+
+ }
+}
17 years, 7 months
- 1
- 0
JBoss Tools SVN: r10212 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: ui/editors and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-11 23:02:28 -0400 (Thu, 11 Sep 2008)
New Revision: 10212
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
Log:
fix a file path error
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java 2008-09-12 02:26:53 UTC (rev 10211)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalInformationSaver.java 2008-09-12 03:02:28 UTC (rev 10212)
@@ -64,10 +64,9 @@
e.printStackTrace();
}
}
- IPath rootPath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
- String path = rootPath.append(gfile.getFullPath()).toString();
+ String osString = gfile.getLocation().toOSString();
graphicalFileResource = new XMLResourceFactoryImpl()
- .createResource(URI.createFileURI(path));
+ .createResource(URI.createFileURI(osString));
}
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-09-12 02:26:53 UTC (rev 10211)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFormEditor.java 2008-09-12 03:02:28 UTC (rev 10212)
@@ -94,8 +94,7 @@
throws PartInitException {
super.init(site, input);
IFile file = ((IFileEditorInput) input).getFile();
- String path = ResourcesPlugin.getWorkspace().getRoot().getLocation()
- .append(file.getFullPath()).toString();
+ String path =file.getLocation().toOSString();
if (this.getEditingDomain() != null && smooksResource == null) {
smooksResource = new SmooksResourceFactoryImpl().createResource(URI
.createFileURI(path));
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-12 02:26:53 UTC (rev 10211)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-12 03:02:28 UTC (rev 10212)
@@ -614,6 +614,7 @@
@Override
public void doSave(IProgressMonitor monitor) {
SmooksFileBuilder builder = this.getSmooksFileBuilder();
+ builder.setSmooksResource(this.smooksResource);
SmooksConfigurationFileGenerateContext context = this
.getSmooksConfigurationFileGenerateContext();
this.initSmooksConfigurationFileGenerateContext(context);
17 years, 7 months
- 1
- 0
JBoss Tools SVN: r10211 - trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-11 22:26:53 -0400 (Thu, 11 Sep 2008)
New Revision: 10211
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
Log:
fix a NullPointException bug
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-11 23:47:33 UTC (rev 10210)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-09-12 02:26:53 UTC (rev 10211)
@@ -591,6 +591,7 @@
if (ar instanceof ResourceConfigType) {
ResourceConfigType rc = (ResourceConfigType) ar;
ResourceType resourceType = rc.getResource();
+ if(resourceType == null) continue;
String resource = resourceType.getValue();
if (BEANPOPULATOR.equals(resource)) {
// create root beanmodel
17 years, 7 months
- 1
- 0
JBoss Tools SVN: r10210 - in trunk: common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el and 16 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-11 19:47:33 -0400 (Thu, 11 Sep 2008)
New Revision: 10210
Added:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java
Removed:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/global/
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/vpe/
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElVariablesComposite.java
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Messages.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/messages/
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2594Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2759
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/META-INF/MANIFEST.MF 2008-09-11 23:47:33 UTC (rev 10210)
@@ -5,10 +5,8 @@
Bundle-Name: El Plug-in
Bundle-SymbolicName: org.jboss.tools.common.el.core
Bundle-Version: 2.0.0
-Provide-Package: org.jboss.tools.common.el,
- org.jboss.tools.common.el.global,
- org.jboss.tools.common.el.vpe
-Bundle-Activator: org.jboss.tools.common.el.Activator
+Provide-Package: org.jboss.tools.common.el.core
+Bundle-Activator: org.jboss.tools.common.el.core.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -1,50 +0,0 @@
-package org.jboss.tools.common.el;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.common.el";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java (from rev 10074, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/Activator.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -0,0 +1,50 @@
+package org.jboss.tools.common.el.core;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.common.el";
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/Activator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java (from rev 10074, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/vpe/ELReferenceList.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -0,0 +1,36 @@
+package org.jboss.tools.common.el.core;
+
+
+import org.eclipse.core.runtime.QualifiedName;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
+
+
+/**
+ * The Class ELReferenceList.
+ */
+public class ELReferenceList extends ResourceReferenceList {
+
+ /** The PROPERT y_ NAME. */
+ private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.ELReference");
+
+ /** The instance. */
+ static ELReferenceList instance = new ELReferenceList();
+
+ /**
+ * Gets the instance.
+ *
+ * @return the instance
+ */
+ public static ELReferenceList getInstance() {
+ return instance;
+ }
+
+ /**
+ * Gets the property name.
+ *
+ * @return the property name
+ */
+ protected QualifiedName getPropertyName() {
+ return PROPERTY_NAME;
+ }
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELReferenceList.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java (from rev 10074, trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/global/GlobalELReferenceList.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.common.el.core;
+
+import org.eclipse.core.runtime.QualifiedName;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
+
+/**
+ * @author Evgenij Stherbin
+ *
+ */
+public class GlobalELReferenceList extends ResourceReferenceList {
+ /** The PROPERT y_ NAME. */
+ private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.GlobalELReference");
+
+ /** The instance. */
+ private static GlobalELReferenceList instance = new GlobalELReferenceList();
+
+ /**
+ * Gets the instance.
+ *
+ * @return the instance
+ */
+ public synchronized static GlobalELReferenceList getInstance() {
+ return instance;
+ }
+
+ private GlobalELReferenceList() {
+ super();
+ }
+
+ /**
+ * Gets the property name.
+ *
+ * @return the property name
+ */
+ protected QualifiedName getPropertyName() {
+ return PROPERTY_NAME;
+ }
+
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/GlobalELReferenceList.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElVariablesComposite.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElVariablesComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElVariablesComposite.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -1,72 +0,0 @@
-package org.jboss.tools.common.el.ui;
-
-import java.util.List;
-
-import org.jboss.tools.common.el.vpe.ELReferenceList;
-import org.jboss.tools.common.resref.core.ResourceReferenceList;
-import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite;
-import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider;
-
-/**
- * The Class ElVariablesComposite.
- */
-public class ElVariablesComposite extends AbstractResourceReferencesComposite {
-
- /**
- * Creates the table provider.
- *
- * @param dataList the data list
- * g
- * @return the resource references table provider
- */
- @Override
- protected ResourceReferencesTableProvider createTableProvider(List dataList) {
- return ResourceReferencesTableProvider.getELTableProvider(dataList);
- };
-
-
- /**
- * Gets the entity.
- *
- * @return the entity
- */
- @Override
- protected String getEntity() {
- return (file != null) ? "VPEElReference" : "VPEElReferenceExt";
- }
-
- /**c
- * Gets the reference list.
- *
- * @return the reference list
- */
- @Override
- protected ResourceReferenceList getReferenceList() {
- return ELReferenceList.getInstance();
- }
-
- /**
- * @see AbstractResourceReferencesComposite#createGroupLabel()
- */
- @Override
- protected String createGroupLabel() {
- return Messages.SUBSTITUTED_EL_EXPRESSIONS;
- }
-
-
- @Override
- protected void add(int index) {
- // TODO Auto-generated method stub
-
- }
-
-
- @Override
- protected void edit(int index) {
- // TODO Auto-generated method stub
-
- }
-
-
-
-}
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/GlobalElVariablesComposite.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -13,7 +13,7 @@
import java.util.List;
-import org.jboss.tools.common.el.global.GlobalELReferenceList;
+import org.jboss.tools.common.el.core.GlobalELReferenceList;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.common.resref.core.ResourceReferenceList;
import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite;
Deleted: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Messages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Messages.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/Messages.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.jboss.tools.common.el.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author eskimo
- *
- */
-public class Messages {
-
- /**
- * The resource bundle name.
- * */
- private static final String BUNDLE_NAME = "org.jboss.tools.common.el.ui.messages";//$NON-NLS-1$
-
- static {
- // load message values from bundle file
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- /**
- * The Constructor.
- */
- private Messages(){}
-
- public static String SUBSTITUTED_EL_EXPRESSIONS;
-
-}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -255,7 +255,7 @@
//ignore we cannot prevent this when project is removed externally
}
} catch (CoreException e) {
- ModelPlugin.getPluginLog().logError("Exception caught in FolderImpl.update()");
+ ModelPlugin.getPluginLog().logError("Exception caught in FolderImpl.update()", e);
} finally {
fsi.unlockUpdate();
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -455,10 +455,6 @@
protected Layout getDefaultLayout() {
GridLayout gridLayout = new GridLayout(2, false);
- gridLayout.marginHeight = 10;
- gridLayout.marginWidth = 10;
- gridLayout.horizontalSpacing = 10;
- gridLayout.verticalSpacing = 10;
return gridLayout;
}
Modified: trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/common/plugins/org.jboss.tools.common.resref.ui/src/org/jboss/tools/common/resref/ui/AbstractResourceReferencesComposite.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -81,13 +81,9 @@
}
public Control createControl(Composite parent) {
- Composite c1 = new Composite(parent, SWT.NONE);
- c1.setLayoutData(new GridData(GridData.FILL_BOTH));
- c1.setLayout(new GridLayout(2,false));
+ final Group group = new Group(parent,SWT.NONE);
- final Group group = new Group(c1,SWT.NONE);
-
group.setText(createGroupLabel());
group.setLayoutData(new GridData(GridData.FILL_BOTH));
GridLayout g = new GridLayout(2, false);
@@ -110,7 +106,7 @@
}
});
update();
- return c1;
+ return group;
}
protected ResourceReference[] getReferenceArray() {
@@ -133,7 +129,8 @@
getReferenceList().setAllResources(path, getReferenceArray());
}
}
- class BarListener implements CommandBarListener {
+
+ public class BarListener implements CommandBarListener {
public void action(String command) {
int index = table.getSelectionIndex();
if(ADD.equals(command)) {
@@ -169,10 +166,23 @@
updateBars();
}
- void updateBars() {
+ protected void updateBars() {
boolean canModify = table.getSelectionIndex() >= 0;
bar.setEnabled(EDIT, canModify);
bar.setEnabled(REMOVE, canModify);
}
+ protected void initFilterInFileChooser() {
+ String entityName = getEntity();
+ XModelEntity entity = XModelMetaDataImpl.getInstance().getEntity(entityName);
+ if(entity != null && file != null && file.getProject() != null) {
+ XAttribute[] as = entity.getAttributes();
+ for (int i = 0; i < as.length; i++) {
+ if(as[i].getConstraint() instanceof XAttributeConstraintFileFilter) {
+ XAttributeConstraintFileFilter f = (XAttributeConstraintFileFilter)as[i].getConstraint();
+ f.getProperties().setProperty("filterFolder", file.getProject().getLocation().toFile().getAbsolutePath());
+ }
+ }
+ }
+ }
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/CommonJBIDE2010Test.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -17,7 +17,7 @@
import java.util.Map.Entry;
import org.eclipse.core.resources.IFile;
-import org.jboss.tools.common.el.vpe.ELReferenceList;
+import org.jboss.tools.common.el.core.ELReferenceList;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2594Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2594Test.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2594Test.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -18,7 +18,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.common.el.global.GlobalELReferenceList;
+import org.jboss.tools.common.el.core.GlobalELReferenceList;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.jsf.vpe.jsf.test.CommonJBIDE2010Test;
import org.jboss.tools.vpe.editor.util.ElService;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2624.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -21,12 +21,12 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.common.resref.core.RelativeFolderReferenceList;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceList;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
import org.mozilla.interfaces.nsIDOMDocument;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE924Test.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -16,12 +16,12 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
-import org.jboss.tools.common.resref.core.AbsoluteFolderReferenceList;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
import org.mozilla.interfaces.nsIDOMDocument;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2008-09-11 23:47:33 UTC (rev 10210)
@@ -74,7 +74,6 @@
org.jboss.tools.jst.web,
org.jboss.tools.vpe.resref,
org.jboss.tools.common.el.core,
- org.jboss.tools.common.el.ui,
- org.jboss.tools.common.resref.ui
+ org.jboss.tools.common.el.ui
Bundle-Version: 2.1.0
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-09-11 23:47:33 UTC (rev 10210)
@@ -28,8 +28,8 @@
/>
</extension>
<extension point="org.jboss.tools.common.model.classes">
- <xclass id="org.jboss.tools.common.resref.core.VpeAddReferenceSupport"
- class="org.jboss.tools.common.resref.core.VpeAddReferenceSupport"/>
+ <xclass id="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"
+ class="org.jboss.tools.vpe.resref.core.VpeAddReferenceSupport"/>
</extension>
<extension point="org.eclipse.ui.preferencePages">
<page category="org.jboss.tools.common.xstudio.editors" class="org.jboss.tools.vpe.editor.preferences.VpeEditorPreferencesPage" id="org.jboss.tools.vpe.editor" name="Visual Page Editor"></page>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -86,7 +86,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.jboss.tools.common.el.vpe.ELReferenceList;
+import org.jboss.tools.common.el.core.ELReferenceList;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.event.XModelTreeListener;
@@ -107,11 +107,7 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.ModelFeatureFactory;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync;
-import org.jboss.tools.common.resref.core.AbsoluteFolderReferenceList;
-import org.jboss.tools.common.resref.core.CSSReferenceList;
-import org.jboss.tools.common.resref.core.RelativeFolderReferenceList;
import org.jboss.tools.common.resref.core.ResourceReferenceListListener;
-import org.jboss.tools.common.resref.core.TaglibReferenceList;
import org.jboss.tools.jst.jsp.editor.IJSPTextEditor;
import org.jboss.tools.jst.jsp.editor.IVisualController;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
@@ -149,6 +145,10 @@
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.jboss.tools.vpe.editor.util.VpeDndUtil;
import org.jboss.tools.vpe.messages.VpeUIMessages;
+import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList;
+import org.jboss.tools.vpe.resref.core.CSSReferenceList;
+import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceList;
+import org.jboss.tools.vpe.resref.core.TaglibReferenceList;
import org.jboss.tools.vpe.selbar.SelectionBar;
import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -43,7 +43,6 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.resref.core.CSSReferenceList;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
@@ -76,6 +75,7 @@
import org.jboss.tools.vpe.editor.util.TextUtil;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
+import org.jboss.tools.vpe.resref.core.CSSReferenceList;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerVpeUtils;
import org.mozilla.interfaces.nsIDOMAttr;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -29,11 +29,7 @@
import org.jboss.tools.common.kb.KbConnectorType;
import org.jboss.tools.common.kb.KbException;
import org.jboss.tools.common.kb.wtp.WtpKbConnector;
-import org.jboss.tools.common.resref.core.AbsoluteFolderReferenceList;
-import org.jboss.tools.common.resref.core.CSSReferenceList;
-import org.jboss.tools.common.resref.core.RelativeFolderReferenceList;
import org.jboss.tools.common.resref.core.ResourceReference;
-import org.jboss.tools.common.resref.core.TaglibReferenceList;
import org.jboss.tools.jst.jsp.editor.IVisualContext;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.jst.web.tld.TaglibData;
@@ -47,6 +43,10 @@
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.util.FileUtil;
import org.jboss.tools.vpe.editor.util.XmlUtil;
+import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList;
+import org.jboss.tools.vpe.resref.core.CSSReferenceList;
+import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceList;
+import org.jboss.tools.vpe.resref.core.TaglibReferenceList;
import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -16,8 +16,8 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.common.el.global.GlobalELReferenceList;
-import org.jboss.tools.common.el.vpe.ELReferenceList;
+import org.jboss.tools.common.el.core.ELReferenceList;
+import org.jboss.tools.common.el.core.GlobalELReferenceList;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.vpe.editor.bundle.BundleMap;
import org.jboss.tools.vpe.editor.context.VpePageContext;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -33,10 +33,10 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.resref.core.AbsoluteFolderReferenceList;
-import org.jboss.tools.common.resref.core.RelativeFolderReferenceList;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.vpe.VpePlugin;
+import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList;
+import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceList;
public class FileUtil {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/resref/VpeResourcesDialogView.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -15,17 +15,18 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.jboss.tools.common.el.ui.ElVariablesComposite;
import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizardView;
-import org.jboss.tools.common.resref.core.AbsoluteFolderReferenceComposite;
-import org.jboss.tools.common.resref.core.CssReferencesComposite;
-import org.jboss.tools.common.resref.core.RelativeFolderReferenceComposite;
-import org.jboss.tools.common.resref.core.TaglibReferencesComposite;
+import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceComposite;
+import org.jboss.tools.vpe.resref.core.CssReferencesComposite;
+import org.jboss.tools.vpe.resref.core.ElVariablesComposite;
+import org.jboss.tools.vpe.resref.core.RelativeFolderReferenceComposite;
+import org.jboss.tools.vpe.resref.core.TaglibReferencesComposite;
public class VpeResourcesDialogView extends AbstractQueryWizardView {
IFile file;
@@ -57,30 +58,15 @@
GridData data;
Composite c = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(1, false);
- layout.marginWidth = 0;
+ layout.marginWidth = 5;
layout.marginHeight = 0;
c.setLayout(layout);
-
+ c.setBackground(new Color(c.getDisplay(),0,0,0));
Control absControl = absFolder.createControl(c);
- data = new GridData(GridData.FILL_HORIZONTAL);
- absControl.setLayoutData(data);
-
Control relControl = relFolder.createControl(c);
- data = new GridData(GridData.FILL_HORIZONTAL);
- relControl.setLayoutData(data);
-
Control cssControl = css.createControl(c);
- data = new GridData(GridData.FILL_BOTH);
- cssControl.setLayoutData(data);
Control tldControl = tld.createControl(c);
- data = new GridData(GridData.FILL_BOTH);
- tldControl.setLayoutData(data);
-
- //changed by estherbin
- //http://jira.jboss.com/jira/browse/JBIDE-2010
Control elControl = el.createControl(c);
- data = new GridData(GridData.FILL_BOTH);
- elControl.setLayoutData(data);
return c;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/META-INF/MANIFEST.MF 2008-09-11 23:47:33 UTC (rev 10210)
@@ -5,16 +5,16 @@
Bundle-SymbolicName: org.jboss.tools.vpe.resref;singleton:=true
Bundle-Version: 2.0.0
Bundle-ManifestVersion: 2
-Bundle-Activator: org.jboss.tools.common.resref.Activator
+Bundle-Activator: org.jboss.tools.vpe.resref.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jboss.tools.common.model.ui,
org.eclipse.core.resources,
org.jboss.tools.jst.web,
org.jboss.tools.common.resref.core;bundle-version="1.0.0",
- org.jboss.tools.common.resref.ui;bundle-version="1.0.0"
+ org.jboss.tools.common.resref.ui;bundle-version="1.0.0";visibility:=reexport,
+ org.jboss.tools.common.el.core;bundle-version="2.0.0"
Eclipse-LazyStart: true
-Export-Package: org.jboss.tools.common.resref,
- org.jboss.tools.common.resref.core,
- org.jboss.tools.common.resref.messages
+Export-Package: org.jboss.tools.vpe.resref,
+ org.jboss.tools.vpe.resref.core
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java 2008-09-11 23:46:32 UTC (rev 10209)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -1,50 +0,0 @@
-package org.jboss.tools.common.resref;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.common.resref";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java (from rev 10080, trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/Activator.java)
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java 2008-09-11 23:47:33 UTC (rev 10210)
@@ -0,0 +1,50 @@
+package org.jboss.tools.vpe.resref;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.common.resref";
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/Activator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 7 months
- 1
- 0
JBoss Tools SVN: r10209 - in trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools: vpe and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-11 19:46:32 -0400 (Thu, 11 Sep 2008)
New Revision: 10209
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceList.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceList.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceList.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ResourceReferencesDialogView.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceList.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferencesComposite.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCssReferencesDialog.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourceReferencesComposite.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2759
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core (from rev 10080, trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core)
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/AbsoluteFolderReferenceComposite.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,9 +8,9 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
-import org.jboss.tools.common.resref.messages.Messages;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
public class AbsoluteFolderReferenceComposite extends FolderReferenceComposite {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceList.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/AbsoluteFolderReferenceList.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/AbsoluteFolderReferenceList.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,9 +8,10 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import org.eclipse.core.runtime.QualifiedName;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
public class AbsoluteFolderReferenceList extends ResourceReferenceList {
private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.AbsoluteFolder");
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceList.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/CSSReferenceList.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceList.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,9 +8,10 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import org.eclipse.core.runtime.QualifiedName;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
public class CSSReferenceList extends ResourceReferenceList {
private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.CSSList");
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/CssReferencesComposite.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CssReferencesComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,11 +8,11 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import java.util.List;
-import org.jboss.tools.common.resref.messages.Messages;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite;
import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider;
Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ElVariablesComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -0,0 +1,92 @@
+package org.jboss.tools.vpe.resref.core;
+
+import java.util.List;
+
+import org.jboss.tools.common.el.core.ELReferenceList;
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.meta.XModelEntity;
+import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintFileFilter;
+import org.jboss.tools.common.meta.impl.XModelMetaDataImpl;
+import org.jboss.tools.common.resref.core.ResourceReference;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
+import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite;
+import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider;
+
+/**
+ * The Class ElVariablesComposite.
+ */
+public class ElVariablesComposite extends AbstractResourceReferencesComposite {
+
+ /**
+ * Creates the table provider.
+ *
+ * @param dataList the data list
+ * g
+ * @return the resource references table provider
+ */
+ @Override
+ protected ResourceReferencesTableProvider createTableProvider(List dataList) {
+ return ResourceReferencesTableProvider.getELTableProvider(dataList);
+ };
+
+
+ /**
+ * Gets the entity.
+ *
+ * @return the entity
+ */
+ @Override
+ protected String getEntity() {
+ return (file != null) ? "VPEElReference" : "VPEElReferenceExt";
+ }
+
+ /**c
+ * Gets the reference list.
+ *
+ * @return the reference list
+ */
+ @Override
+ protected ResourceReferenceList getReferenceList() {
+ return ELReferenceList.getInstance();
+ }
+
+ /**
+ * @see AbstractResourceReferencesComposite#createGroupLabel()
+ */
+ @Override
+ protected String createGroupLabel() {
+ return Messages.SUBSTITUTED_EL_EXPRESSIONS;
+ }
+
+
+ @Override
+ protected void add(int index) {
+ ResourceReference css = getDefaultResourceReference();
+
+ initFilterInFileChooser();
+ boolean ok = VpeAddReferenceSupport.add(file, css, getReferenceArray(),
+ getEntity());
+ if (!ok)
+ return;
+ dataList.add(css);
+ update();
+ table.setSelection(dataList.size() - 1);
+
+ }
+
+
+ @Override
+ protected void edit(int index) {
+ if (index < 0) {
+ return;
+ }
+ ResourceReference css = getReferenceArray()[index];
+ initFilterInFileChooser();
+ boolean ok = VpeAddReferenceSupport.edit(file, css,
+ getReferenceArray(), getEntity());
+ if (ok) {
+ update();
+ }
+ }
+
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/FolderReferenceComposite.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/FolderReferenceComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,7 +8,7 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import java.util.ArrayList;
import java.util.List;
@@ -28,6 +28,8 @@
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.ui.attribute.XAttributeSupport;
import org.jboss.tools.common.model.ui.attribute.editor.DirectoryFieldEditorEx;
+import org.jboss.tools.common.resref.core.ResourceReference;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
public abstract class FolderReferenceComposite {
XAttributeSupport support = new XAttributeSupport();
@@ -81,15 +83,17 @@
public Control createControl(Composite parent) {
Group g = new Group(parent, SWT.SHADOW_ETCHED_IN);
+ GridData data = new GridData(GridData.FILL_BOTH);
GridLayout layout = new GridLayout(1, false);
g.setLayout(layout);
+ g.setLayoutData(data);
g.setText(getTitle());
Control c = support.createControl(g);
if(file != null) {
DirectoryFieldEditorEx f = (DirectoryFieldEditorEx)support.getFieldEditorByName("location");
f.setLastPath(file.getProject().getLocation().toString());
}
- GridData data = new GridData(GridData.FILL_BOTH);
+ data = new GridData(GridData.FILL_BOTH);
c.setLayoutData(data);
return g;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/GlobalResourceReference.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/GlobalResourceReference.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -9,9 +9,11 @@
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
+import org.jboss.tools.common.resref.core.ResourceReference;
+
/**
* Global resource reference
* @author Evgenij Stherbin
Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.vpe.resref.core;
+
+import java.util.ResourceBundle;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * The Class Messages.
+ *
+ * @author Eugene Stherbin
+ */
+public final class Messages {
+
+ /** The Constant BUNDLE_NAME. */
+ private static final String BUNDLE_NAME = "org.jboss.tools.vpe.resref.messages";//$NON-NLS-1$
+
+ /** The f resource bundle. */
+ private static ResourceBundle fResourceBundle;
+ static {
+ // load message values from bundle file
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ /**
+ * The Constructor.
+ */
+ private Messages(){}
+
+
+ public static String INCLUDED_CSS_FILES;
+ public static String INCLUDED_TAG_LIBS;
+ public static String SUBSTITUTED_EL_EXPRESSIONS;
+ public static String ACTUAL_RUN_TIME_ABSOLUTE_FOLDER;
+}
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/RelativeFolderReferenceComposite.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,9 +8,11 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
+
public class RelativeFolderReferenceComposite extends FolderReferenceComposite {
protected ResourceReferenceList getReferenceList() {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceList.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/RelativeFolderReferenceList.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/RelativeFolderReferenceList.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,9 +8,10 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import org.eclipse.core.runtime.QualifiedName;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
public class RelativeFolderReferenceList extends ResourceReferenceList {
private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.RelativeFolder");
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ResourceReferencesDialogView.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/ResourceReferencesDialogView.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ResourceReferencesDialogView.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,7 +8,7 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import java.util.ArrayList;
import java.util.List;
@@ -27,6 +27,8 @@
import org.jboss.tools.common.model.ui.action.CommandBarListener;
import org.jboss.tools.common.model.ui.objecteditor.XTable;
import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizardView;
+import org.jboss.tools.common.resref.core.ResourceReference;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider;
public abstract class ResourceReferencesDialogView extends AbstractQueryWizardView {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceList.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/TaglibReferenceList.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceList.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,9 +8,10 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import org.eclipse.core.runtime.QualifiedName;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
public class TaglibReferenceList extends ResourceReferenceList {
private static QualifiedName PROPERTY_NAME = new QualifiedName("", "org.jboss.tools.vpe.editor.css.TLDList");
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferencesComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/TaglibReferencesComposite.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferencesComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,11 +8,11 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import java.util.List;
-import org.jboss.tools.common.resref.messages.Messages;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite;
import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/VpeAddReferenceSupport.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeAddReferenceSupport.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,7 +8,7 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import java.util.Iterator;
import java.util.Map;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCssReferencesDialog.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/VpeCssReferencesDialog.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeCssReferencesDialog.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,7 +8,7 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
import java.util.List;
import java.util.Properties;
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.IPath;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizard;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider;
public class VpeCssReferencesDialog extends AbstractQueryWizard {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourceReferencesComposite.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/common/resref/core/VpeResourceReferencesComposite.java 2008-09-04 23:22:46 UTC (rev 10080)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourceReferencesComposite.java 2008-09-11 23:46:32 UTC (rev 10209)
@@ -8,54 +8,22 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.resref.core;
+package org.jboss.tools.vpe.resref.core;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.jboss.tools.common.meta.XAttribute;
-import org.jboss.tools.common.meta.XModelEntity;
-import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintFileFilter;
-import org.jboss.tools.common.meta.impl.XModelMetaDataImpl;
-import org.jboss.tools.common.model.ui.action.CommandBar;
-import org.jboss.tools.common.model.ui.action.CommandBarListener;
-import org.jboss.tools.common.model.ui.objecteditor.XTable;
+import org.jboss.tools.common.resref.core.ResourceReference;
+import org.jboss.tools.common.resref.core.ResourceReferenceList;
+import org.jboss.tools.common.resref.ui.AbstractResourceReferencesComposite;
import org.jboss.tools.common.resref.ui.ResourceReferencesTableProvider;
-public abstract class VpeResourceReferencesComposite {
- protected static String ADD = "Add";
- protected static String EDIT = "Edit";
- protected static String REMOVE = "Remove";
- protected XTable table = new XTable();
- protected CommandBar bar = new CommandBar();
- protected ResourceReferencesTableProvider tableProvider;// = new TemplatesTableProvider();
- protected IFile file;
- protected IPath path;
- protected List dataList = new ArrayList();
+public abstract class VpeResourceReferencesComposite extends AbstractResourceReferencesComposite {
public VpeResourceReferencesComposite() {
- init();
+ super();
}
- private void init() {
- tableProvider = createTableProvider(dataList);
- bar.getLayout().buttonWidth = 80;
- bar.getLayout().direction = SWT.VERTICAL;
- bar.setCommands(new String[]{ADD, EDIT, REMOVE});
- bar.addCommandBarListener(new BarListener());
- table.setTableProvider(tableProvider);
- }
protected abstract ResourceReferencesTableProvider createTableProvider(List dataList);
protected abstract ResourceReferenceList getReferenceList();
@@ -69,83 +37,6 @@
protected abstract String createGroupLabel();
- public void setObject(Object object) {
- Properties p = (Properties)object;
- file = (IFile)p.get("file");
- path = (IPath)p.get("path");
- ResourceReference[] rs = (file != null) ? getReferenceList().getAllResources(file) :
- (path != null) ? getReferenceList().getAllResources(path)
- : new ResourceReference[0];
- for (int i = 0; i < rs.length; i++) dataList.add(rs[i]);
- }
-
- public Control createControl(Composite parent) {
- Composite c1 = new Composite(parent, SWT.NONE);
-
- c1.setLayoutData(new GridData(GridData.FILL_BOTH));
- c1.setLayout(new GridLayout(2,false));
-
- final Group group = new Group(c1,SWT.NONE);
-
- group.setText(createGroupLabel());
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
- GridLayout g = new GridLayout(2, false);
- group.setLayout(g);
-
-
- Control slc = table.createControl(group);
- slc.setLayoutData(new GridData(GridData.FILL_BOTH));
- Control bc = bar.createControl(group);
-
-
- GridData gd = new GridData(GridData.FILL_VERTICAL);
- bc.setLayoutData(gd);
- table.getTable().addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- updateBars();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
- }
- });
- update();
- return c1;
- }
-
- ResourceReference[] getReferenceArray() {
- return (ResourceReference[])dataList.toArray(new ResourceReference[0]);
- }
-
- /**
- * Clear all entries from table.
- */
- public void clearAll(){
- if(this.dataList!=null){
- this.dataList.clear();
- }
- }
-
- public void commit() {
- if(file != null) {
- getReferenceList().setAllResources(file, getReferenceArray());
- } else {
- getReferenceList().setAllResources(path, getReferenceArray());
- }
- }
- class BarListener implements CommandBarListener {
- public void action(String command) {
- int index = table.getSelectionIndex();
- if(ADD.equals(command)) {
- add(index);
- } else if(EDIT.equals(command)) {
- edit(index);
- } else if(REMOVE.equals(command)) {
- remove(index);
- }
- update();
- }
- }
-
protected void add(int index) {
ResourceReference css = getDefaultResourceReference();
@@ -156,13 +47,6 @@
update();
table.setSelection(dataList.size() - 1);
}
-
- /**
- * @return
- */
- protected ResourceReference getDefaultResourceReference() {
- return new ResourceReference("", ResourceReference.FOLDER_SCOPE);
- }
protected void edit(int index) {
if(index < 0) return;
@@ -173,39 +57,4 @@
update();
}
- protected abstract String getEntity();
-
- void remove(int index) {
- if(index >= 0) dataList.remove(index);
- }
-
- public void update() {
- if(table != null) table.update();
- updateBars();
- }
-
- void updateBars() {
- bar.setEnabled(EDIT, canModify());
- bar.setEnabled(REMOVE, canModify());
- }
-
- private boolean canModify() {
- return table.getSelectionIndex() >= 0;
- }
-
- private void initFilterInFileChooser() {
- String entityName = getEntity();
- XModelEntity entity = XModelMetaDataImpl.getInstance().getEntity(entityName);
- if(entity != null && file != null && file.getProject() != null) {
- XAttribute[] as = entity.getAttributes();
- for (int i = 0; i < as.length; i++) {
- if(as[i].getConstraint() instanceof XAttributeConstraintFileFilter) {
- XAttributeConstraintFileFilter f = (XAttributeConstraintFileFilter)as[i].getConstraint();
- f.getProperties().setProperty("filterFolder", file.getProject().getLocation().toFile().getAbsolutePath());
- }
- }
- }
- }
-
-
}
Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2008-09-11 23:46:32 UTC (rev 10209)
@@ -0,0 +1,4 @@
+INCLUDED_CSS_FILES=Included css files
+INCLUDED_TAG_LIBS=Included tag libs
+SUBSTITUTED_EL_EXPRESSIONS=Substituted El expressions
+ACTUAL_RUN_TIME_ABSOLUTE_FOLDER=Actual Run-Time Absolute Folder
\ No newline at end of file
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 7 months
- 1
- 0
JBoss Tools SVN: r10208 - trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-09-11 19:46:04 -0400 (Thu, 11 Sep 2008)
New Revision: 10208
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesBuildListener.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
Log:
JBIDE-2743 - fixed the module id for archives in a fashion that automatically converts the old into the new with no conflicts. This was only possible thanks to a well-designed wtp api.
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesBuildListener.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesBuildListener.java 2008-09-11 19:45:22 UTC (rev 10207)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesBuildListener.java 2008-09-11 23:46:04 UTC (rev 10208)
@@ -115,7 +115,7 @@
}
protected static IModule[] getModule(IArchive node) {
ModuleFactory factory = ServerPlugin.findModuleFactory("org.jboss.ide.eclipse.as.core.PackageModuleFactory");
- IModule mod = factory.findModule(PackageModuleFactory.getID(node), new NullProgressMonitor());
+ IModule mod = factory.findModule(PackageModuleFactory.getId(node), new NullProgressMonitor());
return new IModule[] { mod };
}
protected static PackagedModuleDelegate getModuleDelegate(IArchive node) {
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java 2008-09-11 19:45:22 UTC (rev 10207)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java 2008-09-11 23:46:04 UTC (rev 10208)
@@ -170,16 +170,18 @@
/**
* Set a property so that each module that's here in the factory
* has a unique ID other than it's name (which is not unique)
+ *
+ * This must set ONLY the timestamp as the property in the file.
* @param archives
* @return returns whether a save has occurred
*/
protected boolean ensureArchivesHaveIDs(IProject project, IArchive[] archives) {
boolean requiresSave = false;
for( int i = 0; i < archives.length; i++ ) {
- if( PackageModuleFactory.getID(archives[i]) == null ) {
+ if( PackageModuleFactory.getStamp(archives[i]) == null ) {
requiresSave = true;
archives[i].setProperty(PackageModuleFactory.MODULE_ID_PROPERTY_KEY,
- PackageModuleFactory.getID(archives[i], true));
+ PackageModuleFactory.getStamp(archives[i], true));
}
}
return requiresSave;
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2008-09-11 19:45:22 UTC (rev 10207)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2008-09-11 23:46:04 UTC (rev 10208)
@@ -96,8 +96,8 @@
* @param pack
* @return
*/
- public static String getID(IArchive pack) {
- return getID(pack, false);
+ protected static String getStamp(IArchive pack) {
+ return getStamp(pack, false);
}
/**
@@ -107,14 +107,30 @@
* @param create
* @return
*/
- protected static String getID(IArchive pack, boolean create) {
+ protected static String getStamp(IArchive pack, boolean create) {
String propVal = pack.getProperty(MODULE_ID_PROPERTY_KEY);
if( propVal == null && create ) {
- return "" + new Date().getTime();
+ propVal = "" + new Date().getTime();
}
return propVal;
}
+ protected static String getId(IArchive pack) {
+ IPath p = pack.getModelRootNode().getDescriptor().append(getStamp(pack));
+ return p.toString();
+ }
+
+ public IModule findModule(String id) {
+ IModule m = super.findModule(id);
+ IModule[] allModules = getModules();
+ for( int i = 0; i < allModules.length; i++ ) {
+ Path p = new Path( allModules[i].getId() );
+ if( p.lastSegment().equals(id))
+ return allModules[i];
+ }
+ return m;
+ }
+
/**
* Return the name of the project in the workspace
* @param node
@@ -151,7 +167,7 @@
}
protected IModule createModule2(IArchive pack, IProject project) {
- return createModule(getID(pack), getName(pack), MODULE_TYPE, VERSION, project);
+ return createModule(getId(pack), getName(pack), MODULE_TYPE, VERSION, project);
}
public IModule[] getModules(IProject project) {
17 years, 7 months
- 1
- 0