June 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r8573 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2008-06-05 07:33:25 -0400 (Thu, 05 Jun 2008) New Revision: 8573 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java Log: http://jira.jboss.com/jira/browse/JBIDE-2274 There is no any code assist in our XML Editors. The fix will restore the CA in XML editors Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java 2008-06-05 11:14:29 UTC (rev 8572) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/action/JSFMultiPageContributor.java 2008-06-05 11:33:25 UTC (rev 8573) @@ -23,6 +23,8 @@ import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.ide.IDEActionFactory; import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; +import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstants; import org.jboss.tools.common.gef.action.ActionRegistrySupport; import org.jboss.tools.jsf.ui.editor.FacesConfigGuiEditor; import org.jboss.tools.jsf.ui.editor.actions.JSFCutRetargetAction; @@ -96,7 +98,7 @@ actionBars.setGlobalActionHandler(ActionFactory.PRINT.getId(), (registry != null) ? registry.getAction("Print_Diagram") : (editor != null) ? getAction(editor, ActionFactory.PRINT.getId()) : null); actionBars.setGlobalActionHandler(ActionFactory.REVERT.getId(), getAction(editor, ActionFactory.REVERT.getId())); actionBars.setGlobalActionHandler(ActionFactory.SAVE.getId(), getAction(editor, ActionFactory.SAVE.getId())); - + actionBars.setGlobalActionHandler(StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_PROPOSALS, getAction(editor, StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_PROPOSALS)); } else { actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), null); actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), null);

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r8572 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-06-05 07:14:29 -0400 (Thu, 05 Jun 2008) New Revision: 8572 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderFieldEditor.java Log: Made this class compilable fot Java 5.0 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderFieldEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderFieldEditor.java 2008-06-05 11:06:14 UTC (rev 8571) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/SliderFieldEditor.java 2008-06-05 11:14:29 UTC (rev 8572) @@ -109,12 +109,10 @@ } } - @Override public int getNumberOfControls() { return 2; } - @Override public Control[] getControls(Composite parent) { return new Control[] { getLabelComposite(parent), @@ -122,7 +120,6 @@ }; } - @Override public void setPropertyEditor(IPropertyEditor propertyEditor) { this.propertyEditor = propertyEditor; if (null != propertyEditor) { @@ -133,7 +130,6 @@ init(); } - @Override public void propertyChange(PropertyChangeEvent event) { if(ExtendedFieldEditor.VALUE.equals(event.getProperty())) { setPropertyChangeListener(null); @@ -143,7 +139,6 @@ } } - @Override public void propertyChange(java.beans.PropertyChangeEvent evt) { valueProvider.removeValueChangeListener(this); if (IPropertyEditor.VALUE.equals(evt.getPropertyName())) { @@ -195,12 +190,10 @@ * Add listener to handle value change */ selectionListener = new SelectionListener() { - @Override public void widgetSelected(SelectionEvent e) { valueChanged(); } - - @Override + public void widgetDefaultSelected(SelectionEvent e) { // Do nothing }

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r8571 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/help.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-05 07:06:14 -0400 (Thu, 05 Jun 2008) New Revision: 8571 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties Log: Dialog title 'Properties' is made common so that not to keep a lot of ..._Properties.WindowTitle constants in *.properties files. Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2008-06-05 10:43:07 UTC (rev 8570) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2008-06-05 11:06:14 UTC (rev 8571) @@ -9,7 +9,6 @@ FileFolder_CreateFileESB.WindowTitle=New ESB File FileFolder_CreateFileESB.Title=ESB File -FileESB101_Properties.WindowTitle=Properties FileESB101_Properties.Title=ESB File 1.0.1 #Providers List @@ -59,7 +58,6 @@ ESBProviders101_AddHibernateProvider_1.WindowTitle=Add Hibernate Provider ESBProviders101_AddHibernateProvider_1.Title=ESB Hibernate Bus -ESBProviders101_Properties.WindowTitle=Properties ESBProviders101_Properties.Title=Providers List #Services List @@ -69,7 +67,6 @@ ESBServices101_AddService_0.WindowTitle=Add Service ESBServices101_AddService_0.Title=ESB Service -ESBServices101_Properties.WindowTitle=Properties ESBServices101_Properties.Title=Services List #Bus Provider @@ -80,7 +77,6 @@ ESBBusProvider101_AddBus.WindowTitle=Add Bus ESBBusProvider101_AddBus.Title=ESB Bus -ESBBusProvider101_Properties.WindowTitle=Properties ESBBusProvider101_Properties.Title=ESB Bus Provider #JBR Provider @@ -91,7 +87,6 @@ ESBJBRProvider101_AddBus.WindowTitle=Add JBR Bus ESBJBRProvider101_AddBus.Title=ESB JBR Bus -ESBJBRProvider101_Properties.WindowTitle=Properties ESBJBRProvider101_Properties.Title=ESB JBR Provider #Schedule Provider @@ -105,7 +100,6 @@ ESBScheduleProvider101_AddCronSchedule.WindowTitle=Add Cron Schedule ESBScheduleProvider101_AddCronSchedule.Title=ESB Cron Schedule -ESBScheduleProvider101_Properties.WindowTitle=Properties ESBScheduleProvider101_Properties.Title=ESB Schedule Provider #JMS Provider @@ -116,7 +110,6 @@ ESBJMSProvider101_AddBus.WindowTitle=Add JMS Bus ESBJMSProvider101_AddBus.Title=ESB JMS Bus -ESBJMSProvider101_Properties.WindowTitle=Properties ESBJMSProvider101_Properties.Title=ESB JMS Provider #Hibernate Provider @@ -127,7 +120,6 @@ ESBHibernateProvider101_AddBus.WindowTitle=Add Hibernate Bus ESBHibernateProvider101_AddBus.Title=ESB Hibernate Bus -ESBHibernateProvider101_Properties.WindowTitle=Properties ESBHibernateProvider101_Properties.Title=ESB Hibernate Provider #JCA Provider @@ -138,7 +130,6 @@ ESBJCAProvider101_AddBus.WindowTitle=Add JMS Bus ESBJCAProvider101_AddBus.Title=ESB JMS Bus -ESBJCAProvider101_Properties.WindowTitle=Properties ESBJCAProvider101_Properties.Title=ESB JCA Provider #SQL Provider @@ -149,7 +140,6 @@ ESBSQLProvider101_AddBus.WindowTitle=Add SQL Bus ESBSQLProvider101_AddBus.Title=ESB SQL Bus -ESBSQLProvider101_Properties.WindowTitle=Properties ESBSQLProvider101_Properties.Title=ESB SQL Provider #FTP Provider @@ -160,7 +150,6 @@ ESBFTPProvider101_AddBus.WindowTitle=Add FTP Bus ESBFTPProvider101_AddBus.Title=ESB FTP Bus -ESBFTPProvider101_Properties.WindowTitle=Properties ESBFTPProvider101_Properties.Title=ESB FTP Provider #FS Provider @@ -171,7 +160,6 @@ ESBFSProvider101_AddBus.WindowTitle=Add FS Bus ESBFSProvider101_AddBus.Title=ESB FS Bus -ESBFSProvider101_Properties.WindowTitle=Properties ESBFSProvider101_Properties.Title=ESB FS Provider #Bus @@ -179,7 +167,6 @@ ESBBus_AddProperty.WindowTitle=Add Property ESBBus_AddProperty.Title=ESB Property -ESBBus_Properties.WindowTitle=Properties ESBBus_Properties.Title=ESB Bus #JBR Bus @@ -187,7 +174,6 @@ ESBJBRBus101_AddProperty.WindowTitle=Add Property ESBJBRBus101_AddProperty.Title=ESB Property -ESBJBRBus101_Properties.WindowTitle=Properties ESBJBRBus101_Properties.Title=ESB JBR Bus #Cron Schedule @@ -195,7 +181,6 @@ ESBCronSchedule101_AddProperty.WindowTitle=Add Property ESBCronSchedule101_AddProperty.Title=ESB Property -ESBCronSchedule101_Properties.WindowTitle=Properties ESBCronSchedule101_Properties.Title=ESB Cron Schedule #Simple Schedule @@ -203,7 +188,6 @@ ESBSimpleSchedule101_AddProperty.WindowTitle=Add Property ESBSimpleSchedule101_AddProperty.Title=ESB Property -ESBSimpleSchedule101_Properties.WindowTitle=Properties ESBSimpleSchedule101_Properties.Title=ESB Simple Schedule #JMS Bus @@ -211,12 +195,10 @@ ESBJMSBus101_AddProperty.WindowTitle=Add Property ESBJMSBus101_AddProperty.Title=ESB Property -ESBJMSBus101_Properties.WindowTitle=Properties ESBJMSBus101_Properties.Title=ESB JMS Bus #JMS Message Filter -ESBJMSMessageFilter101_Properties.WindowTitle=Properties ESBJMSMessageFilter101_Properties.Title=ESB JMS Message Filter #Hibernate Bus @@ -227,12 +209,10 @@ ESBHibernateBus101_AddFilter.WindowTitle=Add Hibernate Message Filter ESBHibernateBus101_AddFilter.Title=ESB Hibernate Message Filter -ESBHibernateBus101_Properties.WindowTitle=Properties ESBHibernateBus101_Properties.Title=ESB Hibernate Bus #Hibernate Message Filter -ESBHibernateMessageFilter101_Properties.WindowTitle=Properties ESBHibernateMessageFilter101_Properties.Title=ESB Hibernate Message Filter #SQL Bus @@ -240,12 +220,10 @@ ESBSQLBus101_AddProperty.WindowTitle=Add Property ESBSQLBus101_AddProperty.Title=ESB Property -ESBSQLBus101_Properties.WindowTitle=Properties ESBSQLBus101_Properties.Title=ESB SQL Bus #SQL Message Filter -ESBSQLMessageFilter101_Properties.WindowTitle=Properties ESBSQLMessageFilter101_Properties.Title=ESB SQL Message Filter #FTP Bus @@ -253,12 +231,10 @@ ESBFTPBus101_AddProperty.WindowTitle=Add Property ESBFTPBus101_AddProperty.Title=ESB Property -ESBFTPBus101_Properties.WindowTitle=Properties ESBFTPBus101_Properties.Title=ESB FTP Bus #FTP Message Filter -ESBFTPMessageFilter101_Properties.WindowTitle=Properties ESBFTPMessageFilter101_Properties.Title=ESB FTP Message Filter #FS Bus @@ -266,12 +242,10 @@ ESBFSBus101_AddProperty.WindowTitle=Add Property ESBFSBus101_AddProperty.Title=ESB Property -ESBFSBus101_Properties.WindowTitle=Properties ESBFSBus101_Properties.Title=ESB FS Bus #FS Message Filter -ESBFSMessageFilter101_Properties.WindowTitle=Properties ESBFSMessageFilter101_Properties.Title=ESB FS Message Filter #Property @@ -279,12 +253,10 @@ ESBProperty_CreateTag.WindowTitle=Add Tag ESBProperty_CreateTag.Title=Any Tag -ESBProperty_Properties.WindowTitle=Properties ESBProperty_Properties.Title=ESB Property #Service -ESBService101_Properties.WindowTitle=Properties ESBService101_Properties.Title=ESB Service #Listeners List @@ -319,7 +291,6 @@ ESBListeners101_AddGroovyListener.WindowTitle=Add Groovy Listener ESBListeners101_AddGroovyListener.Title=ESB Groovy Listener -ESBListeners101_Properties.WindowTitle=Properties ESBListeners101_Properties.Title=ESB Listeners List # ESB Listener @@ -327,7 +298,6 @@ ESBListener101_AddProperty.WindowTitle=Add Property ESBListener101_AddProperty.Title=ESB Property -ESBListener101_Properties.WindowTitle=Properties ESBListener101_Properties.Title=ESB Listener # Scheduled Listener @@ -335,7 +305,6 @@ ESBScheduledListener101_AddProperty.WindowTitle=Add Property ESBScheduledListener101_AddProperty.Title=ESB Property -ESBScheduledListener101_Properties.WindowTitle=Properties ESBScheduledListener101_Properties.Title=ESB Scheduled Listener # JCA Gateway @@ -343,7 +312,6 @@ ESBJCAGateway101_AddProperty.WindowTitle=Add Property ESBJCAGateway101_AddProperty.Title=ESB Property -ESBJCAGateway101_Properties.WindowTitle=Properties ESBJCAGateway101_Properties.Title=ESB JCA Gateway # JMS Listener @@ -351,7 +319,6 @@ ESBJMSListener101_AddProperty.WindowTitle=Add Property ESBJMSListener101_AddProperty.Title=ESB Property -ESBJMSListener101_Properties.WindowTitle=Properties ESBJMSListener101_Properties.Title=ESB JMS Listener # FS Listener @@ -359,7 +326,6 @@ ESBFSListener101_AddProperty.WindowTitle=Add Property ESBFSListener101_AddProperty.Title=ESB Property -ESBFSListener101_Properties.WindowTitle=Properties ESBFSListener101_Properties.Title=ESB FS Listener # FTP Listener @@ -367,7 +333,6 @@ ESBFTPListener101_AddProperty.WindowTitle=Add Property ESBFTPListener101_AddProperty.Title=ESB Property -ESBFTPListener101_Properties.WindowTitle=Properties ESBFTPListener101_Properties.Title=ESB FTP Listener # SQL Listener @@ -375,7 +340,6 @@ ESBSQLListener101_AddProperty.WindowTitle=Add Property ESBSQLListener101_AddProperty.Title=ESB Property -ESBSQLListener101_Properties.WindowTitle=Properties ESBSQLListener101_Properties.Title=ESB SQL Listener # Groovy Listener @@ -383,7 +347,6 @@ ESBGroovyListener101_AddProperty.WindowTitle=Add Property ESBGroovyListener101_AddProperty.Title=ESB Property -ESBGroovyListener101_Properties.WindowTitle=Properties ESBGroovyListener101_Properties.Title=ESB Groovy Listener # JBR Listener @@ -391,7 +354,6 @@ ESBJBRListener101_AddProperty.WindowTitle=Add Property ESBJBRListener101_AddProperty.Title=ESB Property -ESBJBRListener101_Properties.WindowTitle=Properties ESBJBRListener101_Properties.Title=ESB JBR Listener # Hibernate Listener @@ -402,7 +364,6 @@ ESBHibernateListener101_AddFilter.WindowTitle=Add Hibernate Message Filter ESBHibernateListener101_AddFilter.Title=ESB Hibernate Message Filter -ESBHibernateListener101_Properties.WindowTitle=Properties ESBHibernateListener101_Properties.Title=ESB Hibernate Listener # Actions List @@ -410,7 +371,6 @@ ESBActions101_AddAction.WindowTitle=Add Action ESBActions101_AddAction.Title=ESB Action -ESBActions101_Properties.WindowTitle=Properties ESBActions101_Properties.Title=ESB Actions List # Action @@ -418,7 +378,6 @@ ESBAction101_AddProperty.WindowTitle=Add Property ESBAction101_AddProperty.Title=ESB Property -ESBAction101_Properties.WindowTitle=Properties ESBAction101_Properties.Title=ESB Action # Activation Config @@ -426,5 +385,4 @@ ESBActivationConfig101_AddProperty.WindowTitle=Add Property ESBActivationConfig101_AddProperty.Title=ESB Property -ESBActivationConfig101_Properties.WindowTitle=Properties ESBActivationConfig101_Properties.Title=ESB Activation Config

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r8570 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: dnd and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-05 06:43:07 -0400 (Thu, 05 Jun 2008) New Revision: 8570 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/DndHelper.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesElementImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/wizard/SelectItemWizardView.java Log: JBIDE-1189 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -73,8 +73,8 @@ if(lastDownEvent != null) { Point point = new Point(lastDownEvent.x, lastDownEvent.y); ((PagesDiagramEditPart)getViewer().getRootEditPart().getChildren().get(0)).getFigure().translateToRelative(point); - p.setProperty("process.mouse.x", "" + point.x); - p.setProperty("process.mouse.y", "" + point.y); + p.setProperty("mouse.x", "" + point.x); + p.setProperty("mouse.y", "" + point.y); lastDownEvent = null; } XModelObjectActionList list = new XModelObjectActionList(object.getModelEntity().getActionList(), object, getTargets(ss), new Object[]{object, p}); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -106,7 +106,7 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.XModelTransferBuffer; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.SeamUIPagesMessages; import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin; import org.jboss.tools.seam.ui.pages.editor.dnd.FileTransferDropTargetListener; @@ -557,7 +557,7 @@ if (viewer == null) return null; XModelObject o = getTarget(viewer.getSelection()); - XModelObject ref = SeamPagesProcessStructureHelper.instance.getReference(o); + XModelObject ref = SeamPagesDiagramStructureHelper.instance.getReference(o); return ref; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -26,8 +26,8 @@ import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.jst.web.model.WebProcess; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; -import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesProcessImpl; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; +import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl; import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; @@ -40,7 +40,7 @@ private PagesEditor gui = null; private IModelObjectEditorInput input; private boolean isInitialized = false; - private XModelObject installedProcess = null; + private XModelObject diagramXML = null; private PagesModel model; public void dispose() { @@ -51,7 +51,7 @@ disposeGui(); gui = null; input = null; - installedProcess = null; + diagramXML = null; super.dispose(); } @@ -72,11 +72,11 @@ return (gui == null) ? null : gui.getModelSelectionProvider(); } - protected XModelObject getInstalledObject() { - return installedProcess; + protected XModelObject getDiagramXML() { + return diagramXML; } - private WebProcess findInstalledObject() { + private WebProcess findDiagramXML() { XModelObject o1 = input.getXModelObject(); if(o1 == null) return null; XModelObject c = o1.getChildByPath("process"); @@ -86,11 +86,11 @@ } protected void updateGui() { - WebProcess f = findInstalledObject(); - if(f != installedProcess) disposeGui(); + WebProcess f = findDiagramXML(); + if(f != diagramXML) disposeGui(); else if(isInitialized) return; isInitialized = true; - installedProcess = f; + diagramXML = f; guiControl.setVisible(f != null); if(f == null) return; try { @@ -116,7 +116,7 @@ private PagesModel createModel() { PagesModel model = PagesFactory.eINSTANCE.createPagesModel(); - model.setData(installedProcess); + model.setData(diagramXML); model.load(); return model; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/DndHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/DndHelper.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/DndHelper.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -59,8 +59,8 @@ properties.setProperty("isDrop", "true"); properties.setProperty("actionSourceGUIComponentID", "editor"); if (point != null) { - properties.put("process.mouse.x", "" + point.x); - properties.put("process.mouse.y", "" + point.y); + properties.put("mouse.x", "" + point.x); + properties.put("mouse.y", "" + point.y); } try { DnDUtil.paste((XModelObject) target, properties); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -96,8 +96,8 @@ event.currentDataType)) { Properties properties = new Properties(); if (point != null) { - properties.put("process.mouse.x", "" + point.x); - properties.put("process.mouse.y", "" + point.y); + properties.put("mouse.x", "" + point.x); + properties.put("mouse.y", "" + point.y); } XActionInvoker Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel; @@ -494,7 +494,7 @@ } else { return; } - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper.getInstance(); + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance(); setName(h.getItemOutputPresentation(object)); setShortcut(h.isShortcut(object)); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesFactory; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage; @@ -191,7 +191,7 @@ updatelock++; try { XModelObject item = getModelObject(); - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper .getInstance(); setName(h.getPageTitle(item)); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesElementImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesElementImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesElementImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -30,7 +30,7 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement; @@ -651,9 +651,9 @@ if(pagesModel == null) return; if(childData instanceof XModelObject) { - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper.getInstance(); + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance(); XModelObject object = (XModelObject)childData; - if(object.getModelEntity().getName().equals(SeamPagesConstants.ENT_PROCESS_ITEM_OUTPUT)) { + if(object.getModelEntity().getName().equals(SeamPagesConstants.ENT_DIAGRAM_ITEM_OUTPUT)) { PagesElement from = this; //pagesModel.findElement(object); XModelObject t = h.getItemOutputTarget(object); if(t == null) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -19,7 +19,7 @@ import org.jboss.tools.common.model.event.XModelTreeEvent; import org.jboss.tools.common.model.event.XModelTreeListener; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement; @@ -44,7 +44,7 @@ *  * @generated NOT */ - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper.getInstance(); + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance(); /** *  @@ -187,15 +187,15 @@ * @generated NOT */ public void load() { - XModelObject installedProcess = (XModelObject)getData(); - if(installedProcess == null) return; + XModelObject diagramXML = (XModelObject)getData(); + if(diagramXML == null) return; elementsByPath = new HashMap<String, PagesElement>(); linksByPath = new HashMap<String, Link>(); - addElement(installedProcess, this); + addElement(diagramXML, this); - XModelObject[] is = h.getItems(installedProcess); + XModelObject[] is = h.getItems(diagramXML); for (int i = 0; i < is.length; i++) { addItem(is[i]); } @@ -203,8 +203,8 @@ for (int i = 0; i < is.length; i++) { addItemLinks(is[i]); } - installedProcess.getModel().removeModelTreeListener(modelListener); - installedProcess.getModel().addModelTreeListener(modelListener); + diagramXML.getModel().removeModelTreeListener(modelListener); + diagramXML.getModel().addModelTreeListener(modelListener); } /** @@ -269,9 +269,9 @@ * @generated NOT */ public void dispose() { - XModelObject installedProcess = (XModelObject)getData(); - if(installedProcess == null) return; - installedProcess.getModel().removeModelTreeListener(modelListener); + XModelObject diagramXML = (XModelObject)getData(); + if(diagramXML == null) return; + diagramXML.getModel().removeModelTreeListener(modelListener); } /** @@ -288,8 +288,8 @@ */ public void nodeChanged(XModelTreeEvent event) { if(getData() == null) return; - XModelObject installedProcess = (XModelObject)getData(); - if(!event.getModelObject().getPath().startsWith(installedProcess.getPath())) { + XModelObject diagramXML = (XModelObject)getData(); + if(!event.getModelObject().getPath().startsWith(diagramXML.getPath())) { return; } PagesElement item = findElement(event.getInfo().toString()); @@ -309,21 +309,21 @@ */ public void structureChanged(XModelTreeEvent event) { if(getData() == null) return; - XModelObject installedProcess = (XModelObject)getData(); + XModelObject diagramXML = (XModelObject)getData(); XModelObject target = event.getModelObject(); - if(!target.getPath().startsWith(installedProcess.getPath())) { + if(!target.getPath().startsWith(diagramXML.getPath())) { return; } if(event.kind() == XModelTreeEvent.CHILD_ADDED) { XModelObject added = (XModelObject)event.getInfo(); - if(target == installedProcess) { + if(target == diagramXML) { childAdded(added); } else { PagesElement item = findElement(target); item.childAdded(added); } } else if(event.kind() == XModelTreeEvent.CHILD_REMOVED) { - if(target == installedProcess) { + if(target == diagramXML) { PagesElement removed = findElement(event.getInfo()); if(removed != null) { Link[] ls = removed.getOutputLinks().toArray(new Link[0]); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -11,7 +11,7 @@ import org.eclipse.emf.ecore.EClass; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException; @@ -51,7 +51,7 @@ */ public void dataChanged() { XModelObject item = getModelObject(); - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper.getInstance(); + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance(); setName(item.getPresentationString()); int[] shape = h.asIntArray(item, "shape"); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -78,8 +78,8 @@ public void execute(){ Properties properties = new Properties(); if(location != null){ - properties.put("process.mouse.x","" + location.x); - properties.put("process.mouse.y","" + location.y); + properties.put("mouse.x","" + location.x); + properties.put("mouse.y","" + location.y); } XActionInvoker.invoke("CreateActions.AddException", (XModelObject)((PagesModel)getDiagramEditPart().getModel()).getData(),properties); @@ -110,8 +110,8 @@ public void execute(){ Properties properties = new Properties(); if(location != null) { - properties.put("process.mouse.x","" + location.x); - properties.put("process.mouse.y","" + location.y); + properties.put("mouse.x","" + location.x); + properties.put("mouse.y","" + location.y); } XActionInvoker.invoke("CreateActions.AddPage", (XModelObject)((PagesModel)getDiagramEditPart().getModel()).getData(),properties); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/wizard/SelectItemWizardView.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/wizard/SelectItemWizardView.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/wizard/SelectItemWizardView.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -17,12 +17,12 @@ public class SelectItemWizardView extends SelectWebProcessItemWizardView { protected String getItemEntity() { - return SeamPagesConstants.ENT_PROCESS_ITEM; + return SeamPagesConstants.ENT_DIAGRAM_ITEM; } protected String getKey(XModelObject o) { String entity = o.getModelEntity().getName(); - if(entity.equals(SeamPagesConstants.ENT_PROCESS_ITEM)) + if(entity.equals(SeamPagesConstants.ENT_DIAGRAM_ITEM)) return o.getAttributeValue(SeamPagesConstants.ATTR_PATH); String key = o.getParent().getAttributeValue(SeamPagesConstants.ATTR_PATH) + ":" + o.getPresentationString(); return key;

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r8569 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-06-05 06:42:38 -0400 (Thu, 05 Jun 2008) New Revision: 8569 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java Log: http://jira.jboss.com/jira/browse/JBIDE-2295, fixed Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java 2008-06-05 10:42:32 UTC (rev 8568) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java 2008-06-05 10:42:38 UTC (rev 8569) @@ -101,7 +101,7 @@ String value = null; if (page2.getValue().length() > 0) { - value = page2.getValue().substring(2,page2.getValue().length()-1); + value = page2.getValue(); } String var = null; if (page2.getVar().length() > 0) {

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r8568 - in trunk/seam/plugins/org.jboss.tools.seam.pages.xml: resources/meta and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-05 06:42:32 -0400 (Thu, 05 Jun 2008) New Revision: 8568 Added: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPagesDiagramImpl.java Removed: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessHelper.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessStructureHelper.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPagesProcessImpl.java Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesFileLoader.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddExceptionHandler.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DeleteOutputHandler.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/OpenPageHandler.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/ProcessAdopt.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/SelectOnDiagramHandler.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesUpdateHelper.java Log: JBIDE-1189 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2008-06-05 10:42:32 UTC (rev 8568) @@ -49,8 +49,8 @@ <xclass id="org.jboss.tools.seam.pages.xml.model.impl.SeamPageTaskImpl" class="org.jboss.tools.seam.pages.xml.model.impl.SeamPageTaskImpl"/> - <xclass id="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesProcessImpl" - class="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesProcessImpl"/> + <xclass id="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl" + class="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl"/> <xclass id="org.jboss.tools.seam.pages.xml.model.impl.ReferenceObjectImpl" class="org.jboss.tools.seam.pages.xml.model.impl.ReferenceObjectImpl"/> @@ -71,6 +71,10 @@ <xclass id="org.jboss.tools.seam.pages.xml.model.handlers.AddViewSupport" class="org.jboss.tools.seam.pages.xml.model.handlers.AddViewSupport"/> + + <xclass id="org.jboss.tools.seam.pages.xml.model.helpers.autolayout.SeamPagesItems" + class="org.jboss.tools.seam.pages.xml.model.helpers.autolayout.SeamPagesItems"/> + </extension> <extension point="org.eclipse.wst.xml.core.catalogContributions"> Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-06-05 10:42:32 UTC (rev 8568) @@ -332,7 +332,7 @@ <XChildEntity maxCount="1" name="SeamPageFolderConversation" required="yes"/> <XChildEntity maxCount="1" name="SeamPageFolderPage12" required="yes"/> <XChildEntity maxCount="1" name="SeamPageFolderException12" required="yes"/> - <XChildEntity maxCount="1" name="SeamPagesProcess" required="yes"/> + <XChildEntity maxCount="1" name="SeamPagesDiagram" required="yes"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -490,7 +490,7 @@ <XChildEntity maxCount="1" name="SeamPageFolderConversation" required="yes"/> <XChildEntity maxCount="1" name="SeamPageFolderPage20" required="yes"/> <XChildEntity maxCount="1" name="SeamPageFolderException20" required="yes"/> - <XChildEntity maxCount="1" name="SeamPagesProcess" required="yes"/> + <XChildEntity maxCount="1" name="SeamPagesDiagram" required="yes"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -2781,9 +2781,9 @@ </XModelEntity> <XModelEntity AdoptManagerClass="org.jboss.tools.seam.pages.xml.model.handlers.ProcessAdopt" - ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesProcessImpl" name="SeamPagesProcess"> + ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl" name="SeamPagesDiagram"> <XChildrenEntities> - <XChildEntity name="SeamPagesProcessItem"/> + <XChildEntity name="SeamPagesDiagramItem"/> <XChildEntity name="JSFProcessComment"/> </XChildrenEntities> <XEntityRenderer> @@ -2837,7 +2837,7 @@ <XActionItem HandlerClassName="org.jboss.tools.jst.web.model.handlers.AutolayoutWebProcessHandler" ICON="action.empty" - PROPERTIES="items-class=org.jboss.tools.jsf.model.helpers.autolayout.JSFItems" + PROPERTIES="items-class=org.jboss.tools.seam.pages.xml.model.helpers.autolayout.SeamPagesItems" displayName="Auto Layout" kind="action" name="AutoLayout"/> <XActionItem HIDE="disabled" HandlerClassName="org.jboss.tools.jst.web.model.handlers.FindItemOnDiagramHandler" @@ -2876,9 +2876,9 @@ <XModelEntity AdoptManagerClass="org.jboss.tools.seam.pages.xml.model.handlers.PageAdopt" ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.ReferenceObjectImpl" - XMLSUBPATH="PROCESS-ITEM" name="SeamPagesProcessItem"> + XMLSUBPATH="item" name="SeamPagesDiagramItem"> <XChildrenEntities> - <XChildEntity name="SeamPagesProcessItemOutput"/> + <XChildEntity name="SeamPagesDiagramItemOutput"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -3005,7 +3005,7 @@ </XModelEntity> <XModelEntity ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.ReferenceObjectImpl" - XMLSUBPATH="PROCESS-ITEM-OUTPUT" name="SeamPagesProcessItemOutput"> + XMLSUBPATH="output" name="SeamPagesDiagramItemOutput"> <XChildrenEntities/> <XEntityRenderer> <ICONS> Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -18,7 +18,7 @@ import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.jst.web.model.AbstractWebFileImpl; import org.jboss.tools.jst.web.model.WebProcessLoader; -import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesProcessImpl; +import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl; public class FileSeamPagesImpl extends AbstractWebFileImpl implements SeamPagesConstants { private static final long serialVersionUID = 1L; @@ -38,13 +38,13 @@ } protected void mergeAll(XModelObject f, boolean update) throws XModelException { - SeamPagesProcessImpl process = (SeamPagesProcessImpl)provideWebProcess(); + SeamPagesDiagramImpl process = (SeamPagesDiagramImpl)provideWebProcess(); boolean b = (process != null && process.isPrepared()); if(b) process.getHelper().addUpdateLock(this); merge(f, !update); if(b) { process.getHelper().removeUpdateLock(this); - process.getHelper().updateProcess(); + process.getHelper().updateDiagram(); } if(process != null) { Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesConstants.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -52,10 +52,10 @@ public String FOLDER_PAGES = "Pages"; //$NON-NLS-1$ public String FOLDER_EXCEPTIONS = "Exceptions"; //$NON-NLS-1$ - public String ELM_PROCESS = "process"; //$NON-NLS-1$ - public String ENT_PROCESS = "SeamPagesProcess"; //$NON-NLS-1$ - public String ENT_PROCESS_ITEM = "SeamPagesProcessItem"; //$NON-NLS-1$ - public String ENT_PROCESS_ITEM_OUTPUT = "SeamPagesProcessItemOutput"; //$NON-NLS-1$ + public String ELM_DIAGRAM = "process"; //$NON-NLS-1$ + public String ENT_DIAGRAM = "SeamPagesDiagram"; //$NON-NLS-1$ + public String ENT_DIAGRAM_ITEM = "SeamPagesDiagramItem"; //$NON-NLS-1$ + public String ENT_DIAGRAM_ITEM_OUTPUT = "SeamPagesDiagramItemOutput"; //$NON-NLS-1$ public String TYPE_PAGE = "page"; //$NON-NLS-1$ public String TYPE_EXCEPTION = "exception"; //$NON-NLS-1$ Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesFileLoader.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesFileLoader.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesFileLoader.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -28,7 +28,7 @@ import org.jboss.tools.common.model.util.XMLUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.jst.web.model.WebProcessLoader; -import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesProcessImpl; +import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.Element; @@ -105,9 +105,9 @@ } public void reloadProcess(XModelObject object) { - SeamPagesProcessImpl process = (SeamPagesProcessImpl)object.getChildByPath(ELM_PROCESS); - if(process == null) return; - process.setReference(object); + SeamPagesDiagramImpl diagram = (SeamPagesDiagramImpl)object.getChildByPath(ELM_DIAGRAM); + if(diagram == null) return; + diagram.setReference(object); if(!object.isActive()) return; String bodyAux = (object.getParent() == null ? null : aux.read(object.getParent(), object)); if (bodyAux != null) { @@ -115,11 +115,11 @@ if (doc2 == null) { //JSFModelPlugin.log("Unable to parse aux body of "+object.getPath()); } else { - util.load(doc2.getDocumentElement(), process); + util.load(doc2.getDocumentElement(), diagram); } } - process.setReference(null); - process.firePrepared(); + diagram.setReference(null); + diagram.firePrepared(); } public boolean update(XModelObject object) throws XModelException { @@ -154,16 +154,16 @@ if(object == null || !object.isActive()) return false; XModelObjectLoaderUtil util = new XModelObjectLoaderUtil(); try { - XModelObject process = object.getChildByPath(ELM_PROCESS); - if(process == null) return true; - process.setModified(true); - Element element = XMLUtil.createDocumentElement("PROCESS"); - util.saveAttributes(element, process); - util.saveChildren(element, process); + XModelObject diagram = object.getChildByPath(ELM_DIAGRAM); + if(diagram == null) return true; + diagram.setModified(true); + Element element = XMLUtil.createDocumentElement("diagram"); + util.saveAttributes(element, diagram); + util.saveChildren(element, diagram); StringWriter sw = new StringWriter(); XModelObjectLoaderUtil.serialize(element, sw); - XModelObjectLoaderUtil.setTempBody(process, sw.toString()); - aux.write(object.getParent(), object, process); + XModelObjectLoaderUtil.setTempBody(diagram, sw.toString()); + aux.write(object.getParent(), object, diagram); return true; } catch (IOException exc) { ModelPlugin.getPluginLog().logError(exc); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddExceptionHandler.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddExceptionHandler.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddExceptionHandler.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -6,7 +6,7 @@ import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; public class AddExceptionHandler extends DefaultCreateHandler { @@ -18,7 +18,7 @@ XModelObject created = (XModelObject)prop.get("created"); if(created == null) return; String path = created.getPathPart(); - XModelObject item = SeamPagesProcessStructureHelper.getInstance().getProcess(object).getChildByPath(path); + XModelObject item = SeamPagesDiagramStructureHelper.getInstance().getProcess(object).getChildByPath(path); String shape = getShape(prop); if(item != null && shape != null) { item.setAttributeValue("shape", shape); @@ -35,8 +35,8 @@ } public static String getShape(Properties p) { - String x = p.getProperty("process.mouse.x"); - String y = p.getProperty("process.mouse.y"); + String x = p.getProperty("mouse.x"); + String y = p.getProperty("mouse.y"); return (x == null || y == null) ? null : x + "," + y + ",0,0"; } Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddViewSupport.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -33,7 +33,7 @@ import org.jboss.tools.seam.pages.xml.SeamPagesXMLMessages; import org.jboss.tools.seam.pages.xml.SeamPagesXMLPlugin; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramHelper; public class AddViewSupport extends SpecialWizardSupport implements SeamPagesConstants { public static String JSF_ADD_VIEW_PATH = ""; //preference name @@ -115,8 +115,8 @@ createFile(path); XModelObject m = getTarget().getParent().getChildByPath(FOLDER_PAGES); - String pp = SeamPagesProcessHelper.toNavigationRulePathPart(path); - boolean isPattern = SeamPagesProcessHelper.isPattern(path); + String pp = SeamPagesDiagramHelper.toNavigationRulePathPart(path); + boolean isPattern = SeamPagesDiagramHelper.isPattern(path); boolean existsR = m.getChildByPath(path) != null; // m.getRuleCount(path) != 0; boolean existsV = findView(path) != null; @@ -146,9 +146,9 @@ m.setModified(true); created = getTarget().getChildByPath(pp); } else { - created = getTarget().getModel().createModelObject(SeamPagesConstants.ENT_PROCESS_ITEM, null); + created = getTarget().getModel().createModelObject(SeamPagesConstants.ENT_DIAGRAM_ITEM, null); String ppi = pp; -// if(exists && SeamPagesProcessHelper.isPattern(path)) { +// if(exists && SeamPagesDiagramHelper.isPattern(path)) { // int index = -1; // while(getTarget().getChildByPath(ppi + ":" + index) != null) index--; // ppi = ppi + ":" + index; @@ -177,10 +177,10 @@ } private XModelObject findView(String path) { - String pp = SeamPagesProcessHelper.toNavigationRulePathPart(path); + String pp = SeamPagesDiagramHelper.toNavigationRulePathPart(path); XModelObject o = getTarget().getChildByPath(pp); if(o != null) return o; - if(!SeamPagesProcessHelper.isPattern(path)) return null; + if(!SeamPagesDiagramHelper.isPattern(path)) return null; XModelObject[] cs = getTarget().getChildren(); for (int i = 0; i < cs.length; i++) { String p = cs[i].getPathPart(); @@ -312,9 +312,9 @@ if(message != null) return; boolean doNotCreateEmptyRule = false; //"yes".equals(JSFPreference.DO_NOT_CREATE_EMPTY_RULE.getValue()); - String pp = SeamPagesProcessHelper.toNavigationRulePathPart(path); + String pp = SeamPagesDiagramHelper.toNavigationRulePathPart(path); boolean exists = getTarget().getChildByPath(pp) != null; - if(doNotCreateEmptyRule && exists /*&& !SeamPagesProcessHelper.isPattern(path)*/) { + if(doNotCreateEmptyRule && exists /*&& !SeamPagesDiagramHelper.isPattern(path)*/) { message = "View exists."; //JSFUIMessages.THE_VIEW_EXISTS; } Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DeleteOutputHandler.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DeleteOutputHandler.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DeleteOutputHandler.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -6,12 +6,12 @@ import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; public class DeleteOutputHandler extends DefaultRemoveHandler { public void executeHandler(XModelObject object, Properties p) throws XModelException { - XModelObject redirect = SeamPagesProcessStructureHelper.instance.getReference(object); + XModelObject redirect = SeamPagesDiagramStructureHelper.instance.getReference(object); if(redirect == null) return; XModelObject rule = redirect.getParent(); XModelObject g = rule.getParent(); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/OpenPageHandler.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/OpenPageHandler.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/OpenPageHandler.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -23,8 +23,8 @@ || entity.startsWith(ENT_RULE)) { source = source.getChildByPath("target"); attr = ATTR_VIEW_ID; - } else if(ENT_PROCESS_ITEM.equals(entity) || - ENT_PROCESS_ITEM_OUTPUT.equals(entity)) { + } else if(ENT_DIAGRAM_ITEM.equals(entity) || + ENT_DIAGRAM_ITEM_OUTPUT.equals(entity)) { attr = ATTR_PATH; } if(attr == null) return null; Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -24,13 +24,13 @@ public boolean isAdoptable(XModelObject target, XModelObject object) { String entity = object.getModelEntity().getName(); - if(ENT_PROCESS_ITEM_OUTPUT.equals(entity)) { + if(ENT_DIAGRAM_ITEM_OUTPUT.equals(entity)) { if(move_case) { return canMoveCase(target, object); } return canBeOutputTarget(target); } - if(ENT_PROCESS_ITEM.equals(entity)) { + if(ENT_DIAGRAM_ITEM.equals(entity)) { return canBeOutputTarget(target); } if(entity.startsWith(ENT_SEAM_PAGE)) { @@ -65,14 +65,14 @@ public void adopt(XModelObject target, XModelObject object, Properties p) throws XModelException { String entity = object.getModelEntity().getName(); - if(ENT_PROCESS_ITEM_OUTPUT.equals(entity)) { + if(ENT_DIAGRAM_ITEM_OUTPUT.equals(entity)) { if(move_case) { moveOutput(object, target, p); } else { adoptOutput(object, target, p); } } - else if(ENT_PROCESS_ITEM.equals(entity)) adoptItem(object, target, p); + else if(ENT_DIAGRAM_ITEM.equals(entity)) adoptItem(object, target, p); else if(entity.startsWith(ENT_SEAM_PAGE)) adoptSeamPage(object, target, p); } Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/ProcessAdopt.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/ProcessAdopt.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/ProcessAdopt.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -18,7 +18,7 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramHelper; public class ProcessAdopt implements XAdoptManager, SeamPagesConstants { @@ -46,16 +46,16 @@ if (ADOPTABLE_JSP.indexOf("." + entity + ".") >= 0) { String path = XModelObjectLoaderUtil.getResourcePath(object); if (target.getModelEntity().getName().startsWith(ENT_FILE_SEAM_PAGES)) { - target = target.getChildByPath(ELM_PROCESS); + target = target.getChildByPath(ELM_DIAGRAM); } - return SeamPagesProcessHelper.getHelper(target).getPage(path) == null; + return SeamPagesDiagramHelper.getHelper(target).getPage(path) == null; } return false; } private void adoptJSP(XModelObject target, XModelObject object, Properties p) throws XModelException { if (target.getModelEntity().getName().startsWith(ENT_FILE_SEAM_PAGES)) { - target = target.getChildByPath(ELM_PROCESS); + target = target.getChildByPath(ELM_DIAGRAM); } addRuleByPageAdopt(target, object, p); /* @@ -68,10 +68,10 @@ private void addRuleByPageAdopt(XModelObject process, XModelObject page, Properties p) throws XModelException { String path = XModelObjectLoaderUtil.getResourcePath(page); - XModelObject pageItem = SeamPagesProcessHelper.getHelper(process).getPage(path); + XModelObject pageItem = SeamPagesDiagramHelper.getHelper(process).getPage(path); if(pageItem != null) return; boolean doNotCreateEmptyRule = false; //or read preferences, compare JSF - pageItem = SeamPagesProcessHelper.getHelper(process).findOrCreateItem(path, null, TYPE_PAGE); + pageItem = SeamPagesDiagramHelper.getHelper(process).findOrCreateItem(path, null, TYPE_PAGE); setShape(pageItem, p); if(doNotCreateEmptyRule) { pageItem.setAttributeValue("persistent", "true"); @@ -94,15 +94,15 @@ } public static void setShape(XModelObject group, Properties p) { - String x = (p == null) ? null : p.getProperty("process.mouse.x"); - String y = (p == null) ? null : p.getProperty("process.mouse.y"); + String x = (p == null) ? null : p.getProperty("mouse.x"); + String y = (p == null) ? null : p.getProperty("mouse.y"); if(x != null && y != null) { group.setAttributeValue("shape", "" + x + "," + y + ",0,0"); } } private boolean isAdoptableItem(XModelObject target, XModelObject object) { - return ENT_PROCESS_ITEM.equals(object.getModelEntity().getName()); + return ENT_DIAGRAM_ITEM.equals(object.getModelEntity().getName()); } private void adoptItem(XModelObject target, XModelObject object, Properties p) { Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/SelectOnDiagramHandler.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/SelectOnDiagramHandler.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/SelectOnDiagramHandler.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -16,7 +16,7 @@ import org.jboss.tools.common.meta.action.impl.*; import org.jboss.tools.jst.web.model.ReferenceObject; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; public class SelectOnDiagramHandler extends AbstractHandler implements SeamPagesConstants { @@ -33,28 +33,28 @@ || entity.startsWith(SeamPagesConstants.ENT_RULE)) { object = object.getChildByPath("target"); } - XModelObject item = getItemOnProcess(object); + XModelObject item = getItemOnDiagram(object); if(item == null) return; FindObjectHelper.findModelObject(item, FindObjectHelper.IN_EDITOR_ONLY, "Diagram"); FindObjectHelper.findModelObject(object, FindObjectHelper.IN_EDITOR_ONLY); } - public static XModelObject getItemOnProcess(XModelObject object) { + public static XModelObject getItemOnDiagram(XModelObject object) { if(object == null) return null; - XModelObject process = SeamPagesProcessStructureHelper.instance.getProcess(object); - return (process == null) ? null : getItemOnProcess(process, object); + XModelObject diagram = SeamPagesDiagramStructureHelper.instance.getProcess(object); + return (diagram == null) ? null : getItemOnDiagram(diagram, object); } - public static XModelObject getItemOnProcess(XModelObject processObject, XModelObject object) { - if(processObject instanceof ReferenceObject) { - if(((ReferenceObject)processObject).getReference() == object) return processObject; + public static XModelObject getItemOnDiagram(XModelObject diagramObject, XModelObject object) { + if(diagramObject instanceof ReferenceObject) { + if(((ReferenceObject)diagramObject).getReference() == object) return diagramObject; } - return getItemOnProcess(processObject.getChildren(), object); + return getItemOnDiagram(diagramObject.getChildren(), object); } - public static XModelObject getItemOnProcess(XModelObject[] processObjects, XModelObject object) { - for (int i = 0; i < processObjects.length; i++) { - XModelObject cr = getItemOnProcess(processObjects[i], object); + public static XModelObject getItemOnDiagram(XModelObject[] diagramObjects, XModelObject object) { + for (int i = 0; i < diagramObjects.length; i++) { + XModelObject cr = getItemOnDiagram(diagramObjects[i], object); if(cr != null) return cr; } return null; Copied: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java (from rev 8457, trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessHelper.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -0,0 +1,381 @@ +package org.jboss.tools.seam.pages.xml.model.helpers; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.XModelObjectUtil; +import org.jboss.tools.jst.web.model.ReferenceObject; +import org.jboss.tools.jst.web.model.helpers.autolayout.AutoLayout; +import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; +import org.jboss.tools.seam.pages.xml.model.helpers.autolayout.SeamPagesItems; +import org.jboss.tools.seam.pages.xml.model.impl.ReferenceObjectImpl; +import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl; + +public class SeamPagesDiagramHelper implements SeamPagesConstants { + private XModelObject diagram; + private static XModelObject TEMPLATE; + private XModelObject config; + private Map<String,XModelObject> pageItems = new HashMap<String,XModelObject>(); + private Map<String,XModelObject> exceptionItems = new HashMap<String,XModelObject>(); + private Map<String,XModelObject> targets = new HashMap<String,XModelObject>(); + + public SeamPagesDiagramHelper(XModelObject diagram) { + this.diagram = diagram; + } + + public static SeamPagesDiagramHelper getHelper(XModelObject diagram) { + return ((SeamPagesDiagramImpl)diagram).getHelper(); + } + + private synchronized void reset() { + pageItems.clear(); + exceptionItems.clear(); + targets.clear(); + this.config = diagram.getParent(); + } + + public void restoreRefs() { + ((SeamPagesDiagramImpl)diagram).setReference(diagram.getParent()); + } + + Set<Object> updateLocks = new HashSet<Object>(); + + public boolean isUpdateLocked() { + return updateLocks.size() > 0; + } + + public void addUpdateLock(Object lock) { + updateLocks.add(lock); + } + + public void removeUpdateLock(Object lock) { + updateLocks.remove(lock); + } + + public void updateDiagram() { + if(isUpdateLocked()) return; + addUpdateLock(this); + try { + updateDiagram0(); + } finally { + removeUpdateLock(this); + } + } + + private void updateDiagram0() { + reset(); + XModelObject[] sourcePages = config.getChildByPath(FOLDER_PAGES).getChildren(); + + for (int i = 0; i < sourcePages.length; i++) { + String view = sourcePages[i].getAttributeValue(ATTR_VIEW_ID); + if(view == null) continue; + String pp = toNavigationRulePathPart(view); + XModelObject g = findOrCreateItem(view, pp, TYPE_PAGE); + ((ReferenceObjectImpl)g).setReference(sourcePages[i]); + pageItems.put(pp, g); + XModelObject[] ns = sourcePages[i].getChildren(); + for (int j = 0; j < ns.length; j++) { + String entity = ns[j].getModelEntity().getName(); + if(!entity.startsWith(ENT_NAVIGATION)) continue; + if(entity.startsWith(ENT_NAVIGATION_RULE)) { + addTarget(ns[j]); + } else { + XModelObject[] rs = ns[j].getChildren(); + for (int k = 0; k < rs.length; k++) { + addTarget(rs[k]); + } + } + } + } + + XModelObject[] sourceExceptions = config.getChildByPath(FOLDER_EXCEPTIONS).getChildren(); + for (int i = 0; i < sourceExceptions.length; i++) { + String code = sourceExceptions[i].getAttributeValue("class"); + XModelObject g = findOrCreateItem(code, code, TYPE_EXCEPTION); + ((ReferenceObjectImpl)g).setReference(sourceExceptions[i]); + exceptionItems.put(code, g); + addTarget(sourceExceptions[i]); + } + + Iterator<String> it = pageItems.keySet().iterator(); + while(it.hasNext()) targets.remove(it.next()); + + removeObsoletePageItems(); + removeObsoleteExceptionItems(); + createPageItems(); + updatePageItems(); + updateExceptionItems(); + + updatePages(); + } + + private void addTarget(XModelObject rule) { + XModelObject target = rule.getChildByPath("target"); + if(target == null) return; + String tvi = target.getAttributeValue(ATTR_VIEW_ID); + if(tvi == null) return; + String ppt = toNavigationRulePathPart(tvi); + targets.put(ppt, getTemplate()); + } + + private XModelObject getTemplate() { + if(TEMPLATE == null && diagram != null) { + TEMPLATE = diagram.getModel().createModelObject(ENT_DIAGRAM_ITEM, null); + } + return TEMPLATE; + } + + public XModelObject findOrCreateItem(String path, String pp, String type) { + if(pp == null) pp = toNavigationRulePathPart(path); + XModelObject g = diagram.getChildByPath(pp); + if(g == null) { + g = diagram.getModel().createModelObject(ENT_DIAGRAM_ITEM, null); + g.setAttributeValue(ATTR_NAME, pp); + g.setAttributeValue(ATTR_PATH, path); + g.setAttributeValue(ATTR_TYPE, type); + diagram.addChild(g); + } + return g; + } + + private void removeObsoletePageItems() { + XModelObject[] ps = diagram.getChildren(ENT_DIAGRAM_ITEM); + for (int i = 0; i < ps.length; i++) { + String path = ps[i].getPathPart(); + String type = ps[i].getAttributeValue(ATTR_TYPE); + if(!TYPE_PAGE.equals(type)) continue; + if(!pageItems.containsKey(path) && !targets.containsKey(path)) { + ps[i].removeFromParent(); + } + } + } + + private void removeObsoleteExceptionItems() { + XModelObject[] ps = diagram.getChildren(ENT_DIAGRAM_ITEM); + for (int i = 0; i < ps.length; i++) { + String path = ps[i].getPathPart(); + String type = ps[i].getAttributeValue(ATTR_TYPE); + if(!TYPE_EXCEPTION.equals(type)) continue; + if(!exceptionItems.containsKey(path)) { + ps[i].removeFromParent(); + } + } + } + + private void createPageItems() { + String[] paths = (String[])targets.keySet().toArray(new String[0]); + for (int i = 0; i < paths.length; i++) { + String fvi = toFromViewId(paths[i]); + XModelObject g = findOrCreateItem(fvi, paths[i], TYPE_PAGE); + targets.put(paths[i], g); + } + } + + private void updatePageItems() { + ReferenceObjectImpl[] gs = (ReferenceObjectImpl[])pageItems.values().toArray(new ReferenceObjectImpl[0]); + for (int i = 0; i < gs.length; i++) { + updatePageItem(gs[i]); + } + gs = (ReferenceObjectImpl[])targets.values().toArray(new ReferenceObjectImpl[0]); + for (int i = 0; i < gs.length; i++) { + gs[i].setReference(null); + updatePageItem(gs[i]); + } + } + + private void updateExceptionItems() { + ReferenceObjectImpl[] gs = (ReferenceObjectImpl[])exceptionItems.values().toArray(new ReferenceObjectImpl[0]); + for (int i = 0; i < gs.length; i++) { + updateExceptionItem(gs[i]); + } + } + + private void updatePageItem(ReferenceObjectImpl item) { + if(item.isUpToDate()) return; + item.notifyUpdate(); + XModelObject sourcePage = item.getReference(); + item.setAttributeValue(ATTR_ID, sourcePage.getPathPart()); + item.setAttributeValue(ATTR_PATH, sourcePage.getAttributeValue(ATTR_VIEW_ID)); + String[][] params = SeamPagesDiagramStructureHelper.getInstance().getParams(item); + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < params.length; i++) { + sb.append(params[i][0]).append('=').append(params[i][1]).append(';'); + } + item.setAttributeValue("params", sb.toString()); + XModelObject[] cs = getPageTargets(sourcePage); + updateOutputs(item, cs); + } + + private XModelObject[] getPageTargets(XModelObject o) { + XModelObject[] ns = o.getChildren(); + List<XModelObject> result = null; + for (int i = 0; i < ns.length; i++) { + String entity = ns[i].getModelEntity().getName(); + if(!entity.startsWith(ENT_NAVIGATION)) continue; + if(entity.startsWith(ENT_NAVIGATION_RULE)) { + XModelObject t = getTargetChild(ns[i]); + if(t != null) { + if(result == null) result = new ArrayList<XModelObject>(); + result.add(t); + } + } else { + XModelObject[] rs = ns[i].getChildren(); + for (int k = 0; k < rs.length; k++) { + XModelObject t = getTargetChild(rs[k]); + if(t != null) { + if(result == null) result = new ArrayList<XModelObject>(); + result.add(t); + } + } + } + } + return result == null ? new XModelObject[0] + : result.toArray(new XModelObject[0]); + } + + private void updateExceptionItem(ReferenceObjectImpl item) { + if(item.isUpToDate()) return; + item.notifyUpdate(); + XModelObject exc = item.getReference(); + item.setAttributeValue(ATTR_ID, exc.getPathPart()); + item.setAttributeValue(ATTR_PATH, exc.getAttributeValue(ATTR_VIEW_ID)); + XModelObject t = getTargetChild(exc); + XModelObject[] cs = t == null ? new XModelObject[0] : new XModelObject[]{t}; + updateOutputs(item, cs); + } + + private XModelObject getTargetChild(XModelObject o) { + XModelObject t = o.getChildByPath("target"); + if(t == null || t.getModelEntity().getAttribute(ATTR_VIEW_ID) == null) return null; + return t; + } + + private void updateOutputs(ReferenceObjectImpl item, XModelObject[] cases) { + XModelObject[] os = item.getChildren(); + if(isOutputOrderUpToDate(cases, os)) { + updateOutputs_1(item, cases, os); + } else { + updateOutputs_2(item, cases, os); + } + } + + private void updateOutputs_1(ReferenceObjectImpl item, XModelObject[] cases, XModelObject[] outputs) { + int c = 0; + for (int i = 0; i < cases.length; i++) { + XModelObject output = null; + if(c < outputs.length) { + output = outputs[c]; + } else { + output = createOutput(item, cases[i]); + } + ReferenceObjectImpl r = (ReferenceObjectImpl)output; + r.setReference(cases[i]); + updateOutput(r); + ++c; + } + for (int i = c; i < outputs.length; i++) outputs[i].removeFromParent(); + } + + private void updateOutputs_2(ReferenceObjectImpl item, XModelObject[] cases, XModelObject[] outputs) { + Map<String,XModelObject> map = new HashMap<String,XModelObject>(); + for (int i = 0; i < outputs.length; i++) { + XModelObject output = outputs[i]; + output.removeFromParent(); + map.put(output.getAttributeValue(ATTR_ID), output); + } + for (int i = 0; i < cases.length; i++) { + XModelObject output = map.get(cases[i].getPathPart()); + if(output == null) { + output = createOutput(item, cases[i]); + } else { + item.addChild(output); + } + ReferenceObjectImpl r = (ReferenceObjectImpl)output; + r.setReference(cases[i]); + updateOutput(r); + } + } + + private boolean isOutputOrderUpToDate(XModelObject[] cases, XModelObject[] outputs) { + for (int i = 0; i < cases.length && i < outputs.length; i++) { + ReferenceObject r = (ReferenceObject)outputs[i]; + if(r.getReference() == cases[i]) continue; + String pp = cases[i].getAttributeValue(ATTR_VIEW_ID); + String id = outputs[i].getAttributeValue(ATTR_ID); + if(!pp.equals(id)) return false; + } + return true; + } + + private XModelObject createOutput(XModelObject item, XModelObject rulecase) { + XModelObject output = item.getModel().createModelObject(ENT_DIAGRAM_ITEM_OUTPUT, null); + output.setAttributeValue(ATTR_ID, rulecase.getAttributeValue(ATTR_VIEW_ID)); + output.setAttributeValue(ATTR_PATH, rulecase.getAttributeValue(ATTR_VIEW_ID)); + String name = XModelObjectUtil.createNewChildName("output", item); + output.setAttributeValue(ATTR_NAME, name); + + ReferenceObjectImpl r = (ReferenceObjectImpl)output; + r.setReference(rulecase); + updateOutput(r); + + item.addChild(output); + return output; + } + + private void updateOutput(ReferenceObjectImpl output) { + if(output.isUpToDate()) return; + output.notifyUpdate(); + XModelObject rulecase = output.getReference(); + output.setAttributeValue(ATTR_ID, rulecase.getAttributeValue(ATTR_VIEW_ID)); + String path = rulecase.getAttributeValue(ATTR_VIEW_ID); + output.setAttributeValue(ATTR_PATH, path); +// String title = SeamPagesDiagramStructureHelper.createItemOutputPresentation(rulecase); +// output.setAttributeValue("title", title); + XModelObject g = findGroupByPath(path); + String target = (g == null) ? "" : g.getPathPart(); + output.setAttributeValue(ATTR_TARGET, target); + } + + private XModelObject findGroupByPath(String path) { + return getPage(path); + } + + public void autolayout() { + AutoLayout auto = new AutoLayout(); + auto.setItems(new SeamPagesItems()); + auto.setProcess(diagram); + } + + public XModelObject getPage(String path) { + path = toNavigationRulePathPart(path); + XModelObject g = (XModelObject)pageItems.get(path); + if(g == null) g = (XModelObject)targets.get(path); + return g; + } + + public void updatePages() { + //TODO + } + + public static String toNavigationRulePathPart(String path) { + return "" + path.replace('/', '#'); + } + + public static String toFromViewId(String pathpart) { + if(!pathpart.startsWith("rules:")) return pathpart.replace('#', '/'); + pathpart = pathpart.substring(6).replace('#', '/'); + int i = pathpart.lastIndexOf(':'); + return (i < 0) ? pathpart : pathpart.substring(0, i); + } + + public static boolean isPattern(String path) { + return path != null && (path.length() == 0 || path.indexOf('*') >= 0); + } + +} Copied: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java (from rev 8457, trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessStructureHelper.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -0,0 +1,80 @@ +package org.jboss.tools.seam.pages.xml.model.helpers; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.jst.web.model.ReferenceObject; +import org.jboss.tools.jst.web.model.helpers.WebProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; + +public class SeamPagesDiagramStructureHelper extends WebProcessStructureHelper implements SeamPagesConstants { + public static SeamPagesDiagramStructureHelper instance = new SeamPagesDiagramStructureHelper(); + + public static SeamPagesDiagramStructureHelper getInstance() { + return instance; + } + + public XModelObject getParentProcess(XModelObject element) { + XModelObject p = element; + while(p != null && p.getFileType() == XModelObject.NONE && + !ENT_DIAGRAM.equals(p.getModelEntity().getName())) p = p.getParent(); + return p; + } + + public XModelObject[] getItems(XModelObject process) { + return process.getChildren(ENT_DIAGRAM_ITEM); + } + + public XModelObject[] getOutputs(XModelObject item) { + return item.getChildren(ENT_DIAGRAM_ITEM_OUTPUT); + } + + public String getPath(XModelObject element) { + return element.getAttributeValue(ATTR_PATH); + } + + public XModelObject getItemOutputTarget(XModelObject itemOutput) { + return itemOutput.getParent().getParent().getChildByPath(itemOutput.getAttributeValue(ATTR_TARGET)); + } + + public String getItemOutputPresentation(XModelObject itemOutput) { +// boolean s = isShortcut(itemOutput); + return itemOutput.getPresentationString(); + } + + public boolean isPattern(XModelObject item) { + String path = item.getAttributeValue(ATTR_PATH); + return (path != null) && (path.length() == 0 || path.indexOf('*') >= 0); + } + + public boolean isUnconfirmedPage(XModelObject item) { + String type = item.getAttributeValue(ATTR_TYPE); + if(!TYPE_PAGE.equals(type)) return false; + if(isPattern(item)) return false; + return !"true".equals(item.getAttributeValue("confirmed")); + } + + public XModelObject getReference(XModelObject diagramObject) { + if(diagramObject instanceof ReferenceObject) { + return ((ReferenceObject)diagramObject).getReference(); + } + return null; + } + + public String[][] getParams(XModelObject item) { + XModelObject o = getReference(item); + if(o == null) return new String[0][]; + XModelObject[] os = o.getChildren(); + List<String[]> list = new ArrayList<String[]>(); + for (int i = 0; i < os.length; i++) { + if(os[i].getModelEntity().getName().startsWith(ENT_PARAM)) { + String n = os[i].getAttributeValue(ATTR_NAME); + String v = os[i].getAttributeValue(ATTR_VALUE); + list.add(new String[]{n, v}); + } + } + return list.toArray(new String[0][]); + } + +} Deleted: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessHelper.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessHelper.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -1,381 +0,0 @@ -package org.jboss.tools.seam.pages.xml.model.helpers; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.util.XModelObjectUtil; -import org.jboss.tools.jst.web.model.ReferenceObject; -import org.jboss.tools.jst.web.model.helpers.autolayout.AutoLayout; -import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.autolayout.SeamPagesItems; -import org.jboss.tools.seam.pages.xml.model.impl.ReferenceObjectImpl; -import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesProcessImpl; - -public class SeamPagesProcessHelper implements SeamPagesConstants { - private XModelObject process; - private static XModelObject TEMPLATE; - private XModelObject config; - private Map<String,XModelObject> pageItems = new HashMap<String,XModelObject>(); - private Map<String,XModelObject> exceptionItems = new HashMap<String,XModelObject>(); - private Map<String,XModelObject> targets = new HashMap<String,XModelObject>(); - - public SeamPagesProcessHelper(XModelObject process) { - this.process = process; - } - - public static SeamPagesProcessHelper getHelper(XModelObject process) { - return ((SeamPagesProcessImpl)process).getHelper(); - } - - private synchronized void reset() { - pageItems.clear(); - exceptionItems.clear(); - targets.clear(); - this.config = process.getParent(); - } - - public void restoreRefs() { - ((SeamPagesProcessImpl)process).setReference(process.getParent()); - } - - Set<Object> updateLocks = new HashSet<Object>(); - - public boolean isUpdateLocked() { - return updateLocks.size() > 0; - } - - public void addUpdateLock(Object lock) { - updateLocks.add(lock); - } - - public void removeUpdateLock(Object lock) { - updateLocks.remove(lock); - } - - public void updateProcess() { - if(isUpdateLocked()) return; - addUpdateLock(this); - try { - updateProcess0(); - } finally { - removeUpdateLock(this); - } - } - - private void updateProcess0() { - reset(); - XModelObject[] sourcePages = config.getChildByPath(FOLDER_PAGES).getChildren(); - - for (int i = 0; i < sourcePages.length; i++) { - String view = sourcePages[i].getAttributeValue(ATTR_VIEW_ID); - if(view == null) continue; - String pp = toNavigationRulePathPart(view); - XModelObject g = findOrCreateItem(view, pp, TYPE_PAGE); - ((ReferenceObjectImpl)g).setReference(sourcePages[i]); - pageItems.put(pp, g); - XModelObject[] ns = sourcePages[i].getChildren(); - for (int j = 0; j < ns.length; j++) { - String entity = ns[j].getModelEntity().getName(); - if(!entity.startsWith(ENT_NAVIGATION)) continue; - if(entity.startsWith(ENT_NAVIGATION_RULE)) { - addTarget(ns[j]); - } else { - XModelObject[] rs = ns[j].getChildren(); - for (int k = 0; k < rs.length; k++) { - addTarget(rs[k]); - } - } - } - } - - XModelObject[] sourceExceptions = config.getChildByPath(FOLDER_EXCEPTIONS).getChildren(); - for (int i = 0; i < sourceExceptions.length; i++) { - String code = sourceExceptions[i].getAttributeValue("class"); - XModelObject g = findOrCreateItem(code, code, TYPE_EXCEPTION); - ((ReferenceObjectImpl)g).setReference(sourceExceptions[i]); - exceptionItems.put(code, g); - addTarget(sourceExceptions[i]); - } - - Iterator<String> it = pageItems.keySet().iterator(); - while(it.hasNext()) targets.remove(it.next()); - - removeObsoletePageItems(); - removeObsoleteExceptionItems(); - createPageItems(); - updatePageItems(); - updateExceptionItems(); - - updatePages(); - } - - private void addTarget(XModelObject rule) { - XModelObject target = rule.getChildByPath("target"); - if(target == null) return; - String tvi = target.getAttributeValue(ATTR_VIEW_ID); - if(tvi == null) return; - String ppt = toNavigationRulePathPart(tvi); - targets.put(ppt, getTemplate()); - } - - private XModelObject getTemplate() { - if(TEMPLATE == null && process != null) { - TEMPLATE = process.getModel().createModelObject(ENT_PROCESS_ITEM, null); - } - return TEMPLATE; - } - - public XModelObject findOrCreateItem(String path, String pp, String type) { - if(pp == null) pp = toNavigationRulePathPart(path); - XModelObject g = process.getChildByPath(pp); - if(g == null) { - g = process.getModel().createModelObject(ENT_PROCESS_ITEM, null); - g.setAttributeValue(ATTR_NAME, pp); - g.setAttributeValue(ATTR_PATH, path); - g.setAttributeValue(ATTR_TYPE, type); - process.addChild(g); - } - return g; - } - - private void removeObsoletePageItems() { - XModelObject[] ps = process.getChildren(ENT_PROCESS_ITEM); - for (int i = 0; i < ps.length; i++) { - String path = ps[i].getPathPart(); - String type = ps[i].getAttributeValue(ATTR_TYPE); - if(!TYPE_PAGE.equals(type)) continue; - if(!pageItems.containsKey(path) && !targets.containsKey(path)) { - ps[i].removeFromParent(); - } - } - } - - private void removeObsoleteExceptionItems() { - XModelObject[] ps = process.getChildren(ENT_PROCESS_ITEM); - for (int i = 0; i < ps.length; i++) { - String path = ps[i].getPathPart(); - String type = ps[i].getAttributeValue(ATTR_TYPE); - if(!TYPE_EXCEPTION.equals(type)) continue; - if(!exceptionItems.containsKey(path)) { - ps[i].removeFromParent(); - } - } - } - - private void createPageItems() { - String[] paths = (String[])targets.keySet().toArray(new String[0]); - for (int i = 0; i < paths.length; i++) { - String fvi = toFromViewId(paths[i]); - XModelObject g = findOrCreateItem(fvi, paths[i], TYPE_PAGE); - targets.put(paths[i], g); - } - } - - private void updatePageItems() { - ReferenceObjectImpl[] gs = (ReferenceObjectImpl[])pageItems.values().toArray(new ReferenceObjectImpl[0]); - for (int i = 0; i < gs.length; i++) { - updatePageItem(gs[i]); - } - gs = (ReferenceObjectImpl[])targets.values().toArray(new ReferenceObjectImpl[0]); - for (int i = 0; i < gs.length; i++) { - gs[i].setReference(null); - updatePageItem(gs[i]); - } - } - - private void updateExceptionItems() { - ReferenceObjectImpl[] gs = (ReferenceObjectImpl[])exceptionItems.values().toArray(new ReferenceObjectImpl[0]); - for (int i = 0; i < gs.length; i++) { - updateExceptionItem(gs[i]); - } - } - - private void updatePageItem(ReferenceObjectImpl item) { - if(item.isUpToDate()) return; - item.notifyUpdate(); - XModelObject sourcePage = item.getReference(); - item.setAttributeValue(ATTR_ID, sourcePage.getPathPart()); - item.setAttributeValue(ATTR_PATH, sourcePage.getAttributeValue(ATTR_VIEW_ID)); - String[][] params = SeamPagesProcessStructureHelper.getInstance().getParams(item); - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < params.length; i++) { - sb.append(params[i][0]).append('=').append(params[i][1]).append(';'); - } - item.setAttributeValue("params", sb.toString()); - XModelObject[] cs = getPageTargets(sourcePage); - updateOutputs(item, cs); - } - - private XModelObject[] getPageTargets(XModelObject o) { - XModelObject[] ns = o.getChildren(); - List<XModelObject> result = null; - for (int i = 0; i < ns.length; i++) { - String entity = ns[i].getModelEntity().getName(); - if(!entity.startsWith(ENT_NAVIGATION)) continue; - if(entity.startsWith(ENT_NAVIGATION_RULE)) { - XModelObject t = getTargetChild(ns[i]); - if(t != null) { - if(result == null) result = new ArrayList<XModelObject>(); - result.add(t); - } - } else { - XModelObject[] rs = ns[i].getChildren(); - for (int k = 0; k < rs.length; k++) { - XModelObject t = getTargetChild(rs[k]); - if(t != null) { - if(result == null) result = new ArrayList<XModelObject>(); - result.add(t); - } - } - } - } - return result == null ? new XModelObject[0] - : result.toArray(new XModelObject[0]); - } - - private void updateExceptionItem(ReferenceObjectImpl item) { - if(item.isUpToDate()) return; - item.notifyUpdate(); - XModelObject exc = item.getReference(); - item.setAttributeValue(ATTR_ID, exc.getPathPart()); - item.setAttributeValue(ATTR_PATH, exc.getAttributeValue(ATTR_VIEW_ID)); - XModelObject t = getTargetChild(exc); - XModelObject[] cs = t == null ? new XModelObject[0] : new XModelObject[]{t}; - updateOutputs(item, cs); - } - - private XModelObject getTargetChild(XModelObject o) { - XModelObject t = o.getChildByPath("target"); - if(t == null || t.getModelEntity().getAttribute(ATTR_VIEW_ID) == null) return null; - return t; - } - - private void updateOutputs(ReferenceObjectImpl item, XModelObject[] cases) { - XModelObject[] os = item.getChildren(); - if(isOutputOrderUpToDate(cases, os)) { - updateOutputs_1(item, cases, os); - } else { - updateOutputs_2(item, cases, os); - } - } - - private void updateOutputs_1(ReferenceObjectImpl item, XModelObject[] cases, XModelObject[] outputs) { - int c = 0; - for (int i = 0; i < cases.length; i++) { - XModelObject output = null; - if(c < outputs.length) { - output = outputs[c]; - } else { - output = createOutput(item, cases[i]); - } - ReferenceObjectImpl r = (ReferenceObjectImpl)output; - r.setReference(cases[i]); - updateOutput(r); - ++c; - } - for (int i = c; i < outputs.length; i++) outputs[i].removeFromParent(); - } - - private void updateOutputs_2(ReferenceObjectImpl item, XModelObject[] cases, XModelObject[] outputs) { - Map<String,XModelObject> map = new HashMap<String,XModelObject>(); - for (int i = 0; i < outputs.length; i++) { - XModelObject output = outputs[i]; - output.removeFromParent(); - map.put(output.getAttributeValue(ATTR_ID), output); - } - for (int i = 0; i < cases.length; i++) { - XModelObject output = map.get(cases[i].getPathPart()); - if(output == null) { - output = createOutput(item, cases[i]); - } else { - item.addChild(output); - } - ReferenceObjectImpl r = (ReferenceObjectImpl)output; - r.setReference(cases[i]); - updateOutput(r); - } - } - - private boolean isOutputOrderUpToDate(XModelObject[] cases, XModelObject[] outputs) { - for (int i = 0; i < cases.length && i < outputs.length; i++) { - ReferenceObject r = (ReferenceObject)outputs[i]; - if(r.getReference() == cases[i]) continue; - String pp = cases[i].getAttributeValue(ATTR_VIEW_ID); - String id = outputs[i].getAttributeValue(ATTR_ID); - if(!pp.equals(id)) return false; - } - return true; - } - - private XModelObject createOutput(XModelObject item, XModelObject rulecase) { - XModelObject output = item.getModel().createModelObject(ENT_PROCESS_ITEM_OUTPUT, null); - output.setAttributeValue(ATTR_ID, rulecase.getAttributeValue(ATTR_VIEW_ID)); - output.setAttributeValue(ATTR_PATH, rulecase.getAttributeValue(ATTR_VIEW_ID)); - String name = XModelObjectUtil.createNewChildName("output", item); - output.setAttributeValue(ATTR_NAME, name); - - ReferenceObjectImpl r = (ReferenceObjectImpl)output; - r.setReference(rulecase); - updateOutput(r); - - item.addChild(output); - return output; - } - - private void updateOutput(ReferenceObjectImpl output) { - if(output.isUpToDate()) return; - output.notifyUpdate(); - XModelObject rulecase = output.getReference(); - output.setAttributeValue(ATTR_ID, rulecase.getAttributeValue(ATTR_VIEW_ID)); - String path = rulecase.getAttributeValue(ATTR_VIEW_ID); - output.setAttributeValue(ATTR_PATH, path); -// String title = SeamPagesProcessStructureHelper.createItemOutputPresentation(rulecase); -// output.setAttributeValue("title", title); - XModelObject g = findGroupByPath(path); - String target = (g == null) ? "" : g.getPathPart(); - output.setAttributeValue(ATTR_TARGET, target); - } - - private XModelObject findGroupByPath(String path) { - return getPage(path); - } - - public void autolayout() { - AutoLayout auto = new AutoLayout(); - auto.setItems(new SeamPagesItems()); - auto.setProcess(process); - } - - public XModelObject getPage(String path) { - path = toNavigationRulePathPart(path); - XModelObject g = (XModelObject)pageItems.get(path); - if(g == null) g = (XModelObject)targets.get(path); - return g; - } - - public void updatePages() { - //TODO - } - - public static String toNavigationRulePathPart(String path) { - return "" + path.replace('/', '#'); - } - - public static String toFromViewId(String pathpart) { - if(!pathpart.startsWith("rules:")) return pathpart.replace('#', '/'); - pathpart = pathpart.substring(6).replace('#', '/'); - int i = pathpart.lastIndexOf(':'); - return (i < 0) ? pathpart : pathpart.substring(0, i); - } - - public static boolean isPattern(String path) { - return path != null && (path.length() == 0 || path.indexOf('*') >= 0); - } - -} Deleted: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessStructureHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessStructureHelper.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessStructureHelper.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -1,80 +0,0 @@ -package org.jboss.tools.seam.pages.xml.model.helpers; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.jst.web.model.ReferenceObject; -import org.jboss.tools.jst.web.model.helpers.WebProcessStructureHelper; -import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; - -public class SeamPagesProcessStructureHelper extends WebProcessStructureHelper implements SeamPagesConstants { - public static SeamPagesProcessStructureHelper instance = new SeamPagesProcessStructureHelper(); - - public static SeamPagesProcessStructureHelper getInstance() { - return instance; - } - - public XModelObject getParentProcess(XModelObject element) { - XModelObject p = element; - while(p != null && p.getFileType() == XModelObject.NONE && - !ENT_PROCESS.equals(p.getModelEntity().getName())) p = p.getParent(); - return p; - } - - public XModelObject[] getItems(XModelObject process) { - return process.getChildren(ENT_PROCESS_ITEM); - } - - public XModelObject[] getOutputs(XModelObject item) { - return item.getChildren(ENT_PROCESS_ITEM_OUTPUT); - } - - public String getPath(XModelObject element) { - return element.getAttributeValue(ATTR_PATH); - } - - public XModelObject getItemOutputTarget(XModelObject itemOutput) { - return itemOutput.getParent().getParent().getChildByPath(itemOutput.getAttributeValue(ATTR_TARGET)); - } - - public String getItemOutputPresentation(XModelObject itemOutput) { -// boolean s = isShortcut(itemOutput); - return itemOutput.getPresentationString(); - } - - public boolean isPattern(XModelObject item) { - String path = item.getAttributeValue(ATTR_PATH); - return (path != null) && (path.length() == 0 || path.indexOf('*') >= 0); - } - - public boolean isUnconfirmedPage(XModelObject item) { - String type = item.getAttributeValue(ATTR_TYPE); - if(!TYPE_PAGE.equals(type)) return false; - if(isPattern(item)) return false; - return !"true".equals(item.getAttributeValue("confirmed")); - } - - public XModelObject getReference(XModelObject diagramObject) { - if(diagramObject instanceof ReferenceObject) { - return ((ReferenceObject)diagramObject).getReference(); - } - return null; - } - - public String[][] getParams(XModelObject item) { - XModelObject o = getReference(item); - if(o == null) return new String[0][]; - XModelObject[] os = o.getChildren(); - List<String[]> list = new ArrayList<String[]>(); - for (int i = 0; i < os.length; i++) { - if(os[i].getModelEntity().getName().startsWith(ENT_PARAM)) { - String n = os[i].getAttributeValue(ATTR_NAME); - String v = os[i].getAttributeValue(ATTR_VALUE); - list.add(new String[]{n, v}); - } - } - return list.toArray(new String[0][]); - } - -} Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesUpdateHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesUpdateHelper.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesUpdateHelper.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -4,26 +4,26 @@ import org.jboss.tools.common.model.event.XModelTreeEvent; import org.jboss.tools.jst.web.model.helpers.WebProcessUpdateHelper; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesProcessImpl; +import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl; public class SeamPagesUpdateHelper implements WebProcessUpdateHelper { private XModelObject config; - private SeamPagesProcessImpl process; - private SeamPagesProcessHelper helper; + private SeamPagesDiagramImpl diagram; + private SeamPagesDiagramHelper helper; - public SeamPagesUpdateHelper(SeamPagesProcessImpl process) { - this.process = process; - this.helper = process.getHelper(); - this.config = process.getParent(); - SeamPagesUpdateManager.getInstance(process.getModel()).register(config.getPath(), this); + public SeamPagesUpdateHelper(SeamPagesDiagramImpl diagram) { + this.diagram = diagram; + this.helper = diagram.getHelper(); + this.config = diagram.getParent(); + SeamPagesUpdateManager.getInstance(diagram.getModel()).register(config.getPath(), this); } public void unregister() { - SeamPagesUpdateManager.getInstance(process.getModel()).unregister(config.getPath(), this); + SeamPagesUpdateManager.getInstance(diagram.getModel()).unregister(config.getPath(), this); } public boolean isActive() { - return process.isActive(); + return diagram.isActive(); } public void nodeChanged(XModelTreeEvent event, String localPath) { @@ -32,7 +32,7 @@ } else if(localPath.startsWith(SeamPagesConstants.FOLDER_PAGES) || localPath.startsWith(SeamPagesConstants.FOLDER_EXCEPTIONS) ) { - helper.updateProcess(); + helper.updateDiagram(); } } @@ -41,7 +41,7 @@ if(localPath.startsWith(SeamPagesConstants.FOLDER_PAGES) || localPath.startsWith(SeamPagesConstants.FOLDER_EXCEPTIONS) ) { - helper.updateProcess(); + helper.updateDiagram(); if(!helper.isUpdateLocked()) { helper.autolayout(); } Copied: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPagesDiagramImpl.java (from rev 8447, trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPagesProcessImpl.java) =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPagesDiagramImpl.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPagesDiagramImpl.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -0,0 +1,90 @@ +package org.jboss.tools.seam.pages.xml.model.impl; + +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.impl.OrderedObjectImpl; +import org.jboss.tools.jst.web.model.ReferenceObject; +import org.jboss.tools.jst.web.model.WebProcess; +import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesUpdateHelper; + +public class SeamPagesDiagramImpl extends OrderedObjectImpl implements WebProcess, ReferenceObject, SeamPagesConstants { + private static final long serialVersionUID = 1981573715076399163L; + protected XModelObject reference; + protected SeamPagesDiagramHelper phelper = new SeamPagesDiagramHelper(this); + protected SeamPagesUpdateHelper uhelper = null; + protected boolean isPrepared = false; + + public XModelObject getReference() { + return reference; + } + + public void setReference(XModelObject reference) { + this.reference = reference; + if(reference != null) { + String shape = get("SHAPE"); + if(shape != null && shape.length() > 0) reference.set("_shape", shape); + } + } + + public boolean isPrepared() { + return isPrepared; + } + + public void firePrepared() { + isPrepared = true; + fireStructureChanged(3, getPath()); + } + + public void autolayout() { + phelper.autolayout(); + } + + protected void loadChildren() { + if (isPrepared && reference == null && isActive()) { + restoreRefs(); + registerListener(); + updateDiagram(); + } + } + + protected void restoreRefs() { + phelper.restoreRefs(); + } + + protected void updateDiagram() { + phelper.updateDiagram(); + } + + protected void registerListener() { + if (uhelper == null) { + uhelper = new SeamPagesUpdateHelper(this); + } + } + + protected void deactivate() { + if (uhelper != null) { + uhelper.unregister(); + uhelper = null; + } + } + + public SeamPagesDiagramHelper getHelper() { + return phelper; + } + + protected void changeTimeStamp() { + boolean actualBody = false; + String abts = null; + XModelObject parent = (XModelObject)getParent(); + if(parent != null) { + abts = parent.get("actualBodyTimeStamp"); + actualBody = (abts != null && (abts.equals("0") || abts.equals("" + parent.getTimeStamp()))); + } + super.changeTimeStamp(); + if(actualBody && !abts.equals("0")) { + parent.set("actualBodyTimeStamp", "" + parent.getTimeStamp()); + } + } + +} Deleted: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPagesProcessImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPagesProcessImpl.java 2008-06-05 10:41:43 UTC (rev 8567) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/SeamPagesProcessImpl.java 2008-06-05 10:42:32 UTC (rev 8568) @@ -1,90 +0,0 @@ -package org.jboss.tools.seam.pages.xml.model.impl; - -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.impl.OrderedObjectImpl; -import org.jboss.tools.jst.web.model.ReferenceObject; -import org.jboss.tools.jst.web.model.WebProcess; -import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessHelper; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesUpdateHelper; - -public class SeamPagesProcessImpl extends OrderedObjectImpl implements WebProcess, ReferenceObject, SeamPagesConstants { - private static final long serialVersionUID = 1981573715076399163L; - protected XModelObject reference; - protected SeamPagesProcessHelper phelper = new SeamPagesProcessHelper(this); - protected SeamPagesUpdateHelper uhelper = null; - protected boolean isPrepared = false; - - public XModelObject getReference() { - return reference; - } - - public void setReference(XModelObject reference) { - this.reference = reference; - if(reference != null) { - String shape = get("SHAPE"); - if(shape != null && shape.length() > 0) reference.set("_shape", shape); - } - } - - public boolean isPrepared() { - return isPrepared; - } - - public void firePrepared() { - isPrepared = true; - fireStructureChanged(3, getPath()); - } - - public void autolayout() { - phelper.autolayout(); - } - - protected void loadChildren() { - if (isPrepared && reference == null && isActive()) { - restoreRefs(); - registerListener(); - updateProcess(); - } - } - - protected void restoreRefs() { - phelper.restoreRefs(); - } - - protected void updateProcess() { - phelper.updateProcess(); - } - - protected void registerListener() { - if (uhelper == null) { - uhelper = new SeamPagesUpdateHelper(this); - } - } - - protected void deactivate() { - if (uhelper != null) { - uhelper.unregister(); - uhelper = null; - } - } - - public SeamPagesProcessHelper getHelper() { - return phelper; - } - - protected void changeTimeStamp() { - boolean actualBody = false; - String abts = null; - XModelObject parent = (XModelObject)getParent(); - if(parent != null) { - abts = parent.get("actualBodyTimeStamp"); - actualBody = (abts != null && (abts.equals("0") || abts.equals("" + parent.getTimeStamp()))); - } - super.changeTimeStamp(); - if(actualBody && !abts.equals("0")) { - parent.set("actualBodyTimeStamp", "" + parent.getTimeStamp()); - } - } - -}

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r8567 - in trunk/ws/plugins: org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2008-06-05 06:41:43 -0400 (Thu, 05 Jun 2008) New Revision: 8567 Added: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntime.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeListConverter.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java Removed: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntime.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimeListConverter.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimeManager.java Modified: trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseField.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/ButtonFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/CompositeEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/IFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/INamedElement.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/LabelFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/PushButtonField.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextField.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextFieldEditor.java Log: JBIDE-2261: modify some classes location for other plugins calling them Modified: trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.core/META-INF/MANIFEST.MF 2008-06-05 10:41:43 UTC (rev 8567) @@ -12,7 +12,9 @@ org.eclipse.core.resources, org.eclipse.jst.ws, org.eclipse.jdt.core, - org.eclipse.jdt.launching + org.eclipse.jdt.launching, + org.eclipse.jst.jsf.core, + org.eclipse.jst.jsf.ui Eclipse-LazyStart: true Bundle-Vendor: %PLUGIN_PROVIDER Export-Package: org.jboss.tools.ws.core, Copied: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntime.java (from rev 8556, trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntime.java) =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntime.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntime.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -0,0 +1,88 @@ +/******************************************************************************* + * 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.ws.core.classpath; + +/** + * @author Grid Qian + */ +public class JbossWSRuntime { + + String name = null; + + String homeDir = null; + + boolean defaultRt = false; + + /** + * Default constructor + */ + public JbossWSRuntime() { + } + + /** + * Get JbossWSRuntime name + * + * @return name + */ + public String getName() { + return name; + } + + /** + * Get path to home directory + * + * @return home directory path as string + */ + public String getHomeDir() { + return homeDir; + } + + /** + * Set JbossWSRuntime name + * + * @param name + * new JbossWSRuntime name + */ + public void setName(String name) { + this.name = name; + } + + /** + * Set home directory + * + * @param homeDir + * new JbossWSRuntime's home directory + */ + public void setHomeDir(String homeDir) { + this.homeDir = homeDir; + } + + /** + * Mark runtime as default + * + * @param b + * new value for default property + */ + public void setDefault(boolean b) { + this.defaultRt = b; + } + + /** + * Get default flag + * + * @return default property + */ + public boolean isDefault() { + return defaultRt; + } + +} Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeClassPathInitializer.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -65,7 +65,7 @@ public IClasspathEntry[] getClasspathEntries() { if (entries == null) { ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); - IPath wsPath = JbossWSCoreUtils.getJbossWSRuntimePath(); + IPath wsPath = JbossWSCoreUtils.getJbossWSRuntimePath(null); if (wsPath != null) { IPath libPath = wsPath.append(JbossWSCoreMessages.DIR_LIB); list.addAll(Arrays.asList(getEntries(libPath))); Added: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeListConverter.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeListConverter.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeListConverter.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -0,0 +1,94 @@ +package org.jboss.tools.ws.core.classpath; + + +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; + + +/** + * + * @author Grid Qian + * + */ +public class JbossWSRuntimeListConverter { + + /* + * Constants definitions + */ + private static final String REGEXP_ESCAPE = "\\"; + private static final String COMMA = ","; + private static final String EMPTY_STRING = ""; + private static final String FIELD_SEPARATOR = "|"; + private static final String DEFAULT = "default"; + private static final String HOME_DIR = "homeDir"; + private static final String NAME = "name"; + + /** + * Load String to JbossWSRuntime map from String + * @param input + * String representation of map + * @return + * Map<String, JbossWSRuntime> loaded from string + * TODO - switch to XML? + * TODO - write converter from old serialization format to XML? + * TODO - handle errors in string format + */ + public Map<String, JbossWSRuntime> getMap(String input) { + + Map<String, JbossWSRuntime> result = new HashMap<String, JbossWSRuntime>(); + if (input == null || EMPTY_STRING.equals(input.trim())) { + return result; + } + StringTokenizer runtimes = new StringTokenizer(input, COMMA); + while (runtimes.hasMoreTokens()) { + String runtime = runtimes.nextToken(); + String[] map = runtime.split(REGEXP_ESCAPE + FIELD_SEPARATOR); + JbossWSRuntime rt = new JbossWSRuntime(); + final int step = 2; + for (int i = 0; i < map.length; i += step) { + String name = map[i]; + String value = i + 1 < map.length ? map[i + 1] : EMPTY_STRING; + if (NAME.equals(name)) { + rt.setName(value); + } else if (HOME_DIR.equals(name)) { + rt.setHomeDir(value); + } else if (DEFAULT.equals(name)) { + rt.setDefault(Boolean.parseBoolean(value)); + } + } + result.put(rt.getName(), rt); + } + + return result; + } + + /** + * Convert map String to JbossWSRUntime to string representation + * @param runtimeMap + * Map<String, JbossWSRuntime> - map of String to JbossWS Runtime to convert + * in String + * @return + * String representation of String to JbossWS Runtime map + */ + public String getString(Map<String, JbossWSRuntime> runtimeMap) { + StringBuffer buffer = new StringBuffer(); + JbossWSRuntime[] runtimes = runtimeMap.values().toArray( + new JbossWSRuntime[runtimeMap.size()]); + for (int i = 0; i < runtimes.length; i++) { + buffer.append(NAME).append(FIELD_SEPARATOR); + buffer.append(runtimes[i].getName()); + buffer.append(FIELD_SEPARATOR).append(HOME_DIR).append( + FIELD_SEPARATOR); + buffer.append(runtimes[i].getHomeDir()); + buffer.append(FIELD_SEPARATOR).append(DEFAULT).append( + FIELD_SEPARATOR); + buffer.append(runtimes[i].isDefault()); + if (i != runtimes.length - 1) { + buffer.append(COMMA); + } + } + return buffer.toString(); + } + } + Copied: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java (from rev 8556, trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimeManager.java) =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JbossWSRuntimeManager.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -0,0 +1,274 @@ +/******************************************************************************* + * 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.ws.core.classpath; + + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.preference.IPersistentPreferenceStore; +import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.jboss.tools.ws.core.JbossWSCorePlugin; +import org.jboss.tools.ws.core.messages.JbossWSCoreMessages; + +/** + * @author Grid Qian + */ +public class JbossWSRuntimeManager { + + private static JbossWSRuntimeListConverter converter = new JbossWSRuntimeListConverter(); + + private Map<String, JbossWSRuntime> runtimes = new HashMap<String, JbossWSRuntime>(); + + /** + * Private constructor + */ + private JbossWSRuntimeManager() { + IPreferenceStore ps = JbossWSCorePlugin.getDefault().getPreferenceStore(); + + String runtimeListString = ps.getString(JbossWSCoreMessages.WS_LOCATION); + + runtimes = converter.getMap(runtimeListString); + } + + /** + * This class make Java Runtime responsible for solving synchronization + * problems during initialization if there is any + * + */ + static class JbossWSRuntimeManagerHolder { + private static final JbossWSRuntimeManager INSTANCE = new JbossWSRuntimeManager(); + } + + /** + * Return JbossWSRuntimeManaher instance + * + * @return + * JbossWSRuntimeManager instance + */ + public static JbossWSRuntimeManager getInstance() { + return JbossWSRuntimeManagerHolder.INSTANCE; + } + + /** + * Return Array of configured JbossWSRuntimes + * + * @return + * JbossWSRuntime[] + */ + public JbossWSRuntime[] getRuntimes() { + Collection<JbossWSRuntime> c = runtimes.values(); + return c.toArray(new JbossWSRuntime[runtimes.size()]); + } + + /** + * Add new JbossWSRuntime + * + * @param runtime + * JbossWSRuntime + */ + public void addRuntime(JbossWSRuntime runtime) { + if (runtimes.size() == 0) { + runtime.setDefault(true); + } + + JbossWSRuntime oldDefaultRuntime = getDefaultRuntime(); + if (oldDefaultRuntime != null && runtime.isDefault()) { + oldDefaultRuntime.setDefault(false); + } + runtimes.put(runtime.getName(), runtime); + save(); + } + + /** + * Add new JbossWSRuntime with given parameters + * + * @param name + * String - runtime name + * @param path + * String - runtime home folder + * @param version + * String - string representation of version number + * @param defaultRt + * boolean - default flag + */ + public void addRuntime(String name, String path, + boolean defaultRt) { + JbossWSRuntime jbossWSRt = new JbossWSRuntime(); + jbossWSRt.setHomeDir(path); + jbossWSRt.setName(name); + jbossWSRt.setDefault(defaultRt); + addRuntime(jbossWSRt); + } + + /** + * Return JbossWSRuntime by given name + * + * @param name + * String - JbossWSRuntime name + * @return + * JbossWSRuntime - found JbossWSRuntime instance or null + */ + public JbossWSRuntime findRuntimeByName(String name) { + for (JbossWSRuntime jbossWSRuntime : runtimes.values()) { + if (jbossWSRuntime.getName().equals(name)) { + return jbossWSRuntime; + } + } + return null; + } + + /** + * Remove given JbossWSRuntime from manager + * @param rt + * JbossWSRuntime + */ + public void removeRuntime(JbossWSRuntime rt) { + runtimes.remove(rt.getName()); + } + + + /** + * Save preference value and force save changes to disk + */ + public void save() { + JbossWSCorePlugin.getDefault().getPreferenceStore().setValue( + "jbosswsruntimelocation", + converter.getString(runtimes)); + IPreferenceStore store = JbossWSCorePlugin.getDefault().getPreferenceStore(); + if (store instanceof IPersistentPreferenceStore) { + try { + ((IPersistentPreferenceStore) store).save(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + /** + * Marks this runtime as default. Marks other runtimes with the same version as not default. + * @param runtime + */ + public void setDefaultRuntime(JbossWSRuntime runtime) { + JbossWSRuntime[] runtimes = getRuntimes(); + for (int i = 0; i < runtimes.length; i++) { + runtimes[i].setDefault(false); + } + runtime.setDefault(true); + } + + /** + * Return first default JbossWSRuntime + * + * @return + * JbossWSRuntime + */ + public JbossWSRuntime getDefaultRuntime() { + for (JbossWSRuntime rt : runtimes.values()) { + if (rt.isDefault()) { + return rt; + } + } + return null; + } + + /** + * If project has JbossWS facet then this method returns default JbossWS runtime for proper version of facet. + * Otherwise return first default runtime. + * @param project + * @return + */ + public static JbossWSRuntime getDefaultRuntimeForProject(IProject project) { + if(project==null) { + throw new IllegalArgumentException("Project must not be null."); + } + try { + IProjectFacet facet = ProjectFacetsManager.getProjectFacet("jbossws.core"); + IFacetedProject facetedProject = ProjectFacetsManager.create(project); + if(facetedProject!=null) { + return getInstance().getDefaultRuntime(); + } + } catch (CoreException e) { + e.printStackTrace(); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } + return getInstance().getDefaultRuntime(); + } + + /** + * Return list of available JbossWSRuntime names + * + * @return + * List<String> + */ + public List<String> getRuntimeNames() { + JbossWSRuntime[] rts = getRuntimes(); + List<String> result = new ArrayList<String>(); + for (JbossWSRuntime jbossWSRuntime : rts) { + result.add(jbossWSRuntime.getName()); + } + return result; + } + + /** + * Return a list of all runtime names + * + * @return + * List of all runtime names + */ + public List<String> getAllRuntimeNames() { + JbossWSRuntime[] rts = getRuntimes(); + List<String> result = new ArrayList<String>(); + for (JbossWSRuntime jbossWSRuntime : rts) { + result.add(jbossWSRuntime.getName()); + } + return result; + } + + /** + * TBD + * + * @param oldName + * old runtime name + * @param newName + * new runtime name + */ + public void changeRuntimeName(String oldName, String newName) { + JbossWSRuntime o = findRuntimeByName(oldName); + if (o == null) { + return; + } + o.setName(newName); + onRuntimeNameChanged(oldName, newName); + } + + private void onRuntimeNameChanged(String oldName, String newName) { + IProject[] ps = ResourcesPlugin.getWorkspace().getRoot().getProjects(); +// for (int i = 0; i < ps.length; i++) { +// ISeamProject sp = SeamCorePlugin.getSeamProject(ps[i], false); +// if (sp != null && oldName.equals(sp.getRuntimeName())) { +// sp.setRuntimeName(newName); +// } +// } + } +} \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/command/JbossWSRuntimeCommand.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -45,7 +45,7 @@ IStatus status = Status.OK_STATUS; // copy lib jars to project's folder - IPath wsPath = JbossWSCoreUtils.getJbossWSRuntimePath(); + IPath wsPath = JbossWSCoreUtils.getJbossWSRuntimePath(null); IPath libPath = null; try { libPath = wsPath.append(JbossWSCoreMessages.DIR_LIB); Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/utils/JbossWSCoreUtils.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -15,6 +15,8 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; @@ -37,6 +39,8 @@ import org.eclipse.jst.ws.internal.common.J2EEUtils; import org.eclipse.osgi.util.NLS; import org.jboss.tools.ws.core.JbossWSCorePlugin; +import org.jboss.tools.ws.core.classpath.JbossWSRuntime; +import org.jboss.tools.ws.core.classpath.JbossWSRuntimeListConverter; import org.jboss.tools.ws.core.messages.JbossWSCoreMessages; /** @@ -219,16 +223,29 @@ return file; } } - - public static IPath getJbossWSRuntimePath() { + + public static IPath getJbossWSRuntimePath(String runtimeName) { + Map<String, JbossWSRuntime> runtimes = new HashMap<String, JbossWSRuntime>(); + JbossWSRuntimeListConverter converter = new JbossWSRuntimeListConverter(); IPreferenceStore ps = JbossWSCorePlugin.getDefault() .getPreferenceStore(); String runtimeLocation = ps.getString(JbossWSCoreMessages.WS_LOCATION); - - if(runtimeLocation == null || runtimeLocation.equals("")){ + runtimes = converter.getMap(runtimeLocation); + if (runtimeLocation == null || runtimeLocation.equals("")) { return null; } - return new Path(runtimeLocation); - } + if (runtimeName == null || runtimeName.equals("")) { + for (JbossWSRuntime rt : runtimes.values()) { + if (rt.isDefault()) { + return new Path(rt.getHomeDir()); + } + } + return null; + } + if (runtimes.get(runtimeName) != null) { + return new Path(runtimes.get(runtimeName).getHomeDir()); + } + return null; + } } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseField.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseField.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseField.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -16,6 +16,9 @@ import org.eclipse.swt.widgets.Control; +/** + * @author Grid Qian + */ public abstract class BaseField { public static final String PROPERTY_NAME = "value"; //$NON-NLS-1$ Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseFieldEditor.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/BaseFieldEditor.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -22,14 +22,10 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Widget; import org.jboss.tools.ws.ui.messages.JbossWSUIMessages; /** @@ -95,16 +91,10 @@ } - /** - * - */ public void addPropertyChangeListener(PropertyChangeListener listener) { pcs.addPropertyChangeListener(listener); } - /** - * - */ public void removePropertyChangeListener(PropertyChangeListener listener) { pcs.removePropertyChangeListener(listener); } @@ -125,61 +115,32 @@ return labelControl; } - /** - * - * @return - */ public Label getLabelControl() { return createLabelControl(null); } - /** - * - */ public abstract Object[] getEditorControls(Object composite); - - /** - * - */ + public abstract Object[] getEditorControls(); - - /** - * - * @return - */ + public Control[] getSwtControls() { return (Control[])getEditorControls(); } - /** - * - */ public abstract int getNumberOfControls(); - /** - * - */ public Object getValue() { return value; } - /** - * - */ public String getValueAsString() { return getValue().toString(); } - /** - * - */ public boolean isEnabled() { return this.enabled ; } - /** - * - */ public void setEnabled(boolean enabled) { this.enabled = enabled; Control[] controls = getSwtControls(); @@ -206,9 +167,6 @@ } } - /** - * - */ public boolean setFocus() { return true; } @@ -223,24 +181,14 @@ pcs.firePropertyChange(nameText,oldValue,newValue); } - /** - * - */ public void setValueAsString(String stringValue) { value = stringValue; } - /** - * - */ public String getName() { return nameText; } - /* - * (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#dispose() - */ public void dispose() { PropertyChangeListener[] listeners = pcs.getPropertyChangeListeners(); for (int i = 0; i < listeners.length; i++) { @@ -249,10 +197,6 @@ } } - /* - * (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#dispose(org.eclipse.swt.events.DisposeEvent) - */ public void dispose(DisposeEvent e) { dispose(); for (DisposeListener disposeListener : disposeListeners) { @@ -261,26 +205,14 @@ disposeListeners.clear(); } - /* - * (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#addDisposeListener(org.eclipse.swt.events.DisposeListener) - */ public void addDisposeListener(DisposeListener listener) { disposeListeners.add(listener); } - /* - * (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#removeDisposeListener(org.eclipse.swt.events.DisposeListener) - */ public void removeDisposeListener(DisposeListener listener) { disposeListeners.remove(listener); } - /** - * - * @return - */ public String getLabelText() { return labelText; } @@ -292,22 +224,13 @@ public void setLabelText(String labelText) { this.labelText = labelText; } - - /** - * - */ + private boolean editable = true; - - /** - * - */ + public boolean isEditable() { return editable; } - /** - * - */ public void setEditable(boolean aEditable) { this.editable = aEditable; } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/ButtonFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/ButtonFieldEditor.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/ButtonFieldEditor.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -19,8 +19,7 @@ import org.jboss.tools.ws.ui.messages.JbossWSUIMessages; /** - * @author eskimo - * + * @author Grid Qian */ public class ButtonFieldEditor extends BaseFieldEditor { @@ -104,9 +103,6 @@ } } - /* (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#getNumberOfControls() - */ @Override public int getNumberOfControls() { return 1; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/CompositeEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/CompositeEditor.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/CompositeEditor.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -30,8 +30,7 @@ import org.jboss.tools.ws.ui.messages.JbossWSUIMessages; /** - * @author eskimo - * + * @author Grid Qian */ public class CompositeEditor extends BaseFieldEditor implements PropertyChangeListener { Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/IFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/IFieldEditor.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/IFieldEditor.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -27,16 +27,8 @@ */ public Object[] getEditorControls(Object composite); - /** - * - * @return - */ public Object[] getEditorControls(); - /** - * - * @return - */ public int getNumberOfControls(); /** @@ -69,10 +61,6 @@ */ public void removePropertyChangeListener(PropertyChangeListener listener); - /** - * - * @return - */ public boolean isEditable(); /** @@ -81,16 +69,8 @@ */ public void setEditable(boolean aEdiatble); - /** - * @return - * - */ public boolean setFocus(); - /** - * - * @return - */ public boolean isEnabled(); /** @@ -99,9 +79,6 @@ */ public void setEnabled(boolean enabled); - /** - * - */ public void dispose(); /** Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/INamedElement.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/INamedElement.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/INamedElement.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -18,27 +18,12 @@ public abstract String getName(); - /** - * - * @return - */ public abstract Object getValue(); - /** - * - */ public abstract void setValue(Object newValue); - /** - * - * @return - */ public abstract String getValueAsString(); - - /** - * - * @param aValue - */ + public abstract void setValueAsString(String aValue); } \ No newline at end of file Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -1,999 +0,0 @@ -/******************************************************************************* - * 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.ws.ui.preferences; - -import java.beans.PropertyChangeListener; -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.runtime.Assert; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.ILabelProviderListener; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormLayout; -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.Control; -import org.eclipse.swt.widgets.DirectoryDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.TableColumn; -import org.jboss.tools.ws.ui.messages.JbossWSUIMessages; - -/** - * @author Grid Qian - */ -public class JbossRuntimeListFieldEditor extends BaseFieldEditor { - - // ------------------------------------------------------------------------ - // Layout parameters - // ------------------------------------------------------------------------ - - static final int GL_COLUMNS = 2; - static final int GL_HINT_HEIGHT = 200; - static final int TC_DEFAULT_WIDTH = 21; - static final int TC_NAME_WIDTH = 100; - static final int TC_VERSION_WIDTH = 50; - static final int TC_PATH_WIDTH = 100; - - // ------------------------------------------------------------------------ - // Field declarations - // ------------------------------------------------------------------------ - - private CheckboxTableViewer tableView = null; - - private Composite root = null; - - private ActionPanel actionPanel; - - private Map<JbossWSRuntime, JbossWSRuntime> changed = new HashMap<JbossWSRuntime, JbossWSRuntime>(); - - private List<JbossWSRuntime> checkedElements = new ArrayList<JbossWSRuntime>(); - - private List<JbossWSRuntime> added = new ArrayList<JbossWSRuntime>(); - - private List<JbossWSRuntime> removed = new ArrayList<JbossWSRuntime>(); - - // ------------------------------------------------------------------------ - // Constructors - // ------------------------------------------------------------------------ - - /** - * Control for editing jbossWSRuntime list - * - * @param name - * String - * @param label - * String - * @param defaultValue - * Object - */ - public JbossRuntimeListFieldEditor(String name, String label, - Object defaultValue) { - super(name, label, defaultValue); - } - - /** - * TBD - * - * @return List<JbossWSRuntime> - */ - public List<JbossWSRuntime> getDefaultJbossWSRuntimes() { - return checkedElements; - } - - /** - * TBD - * - * @return List<JbossWSRuntime> - */ - public List<JbossWSRuntime> getAddedJbossWSRuntimes() { - return added; - } - - /** - * TBD - * - * @return List<JbossWSRuntime> - */ - public Map<JbossWSRuntime, JbossWSRuntime> getChangedJbossWSRuntimes() { - return changed; - } - - /** - * TBD - * - * @return List<JbossWSRuntime> - */ - public List<JbossWSRuntime> getRemoved() { - return removed; - } - - /** - * TBD - * - * @param composite - * Object - instance of Composite - * @return Object[] - */ - @Override - public Object[] getEditorControls(Object composite) { - - root = new Composite((Composite) composite, SWT.NONE); - GridData gd = new GridData(); - gd.horizontalAlignment = GridData.FILL; - gd.grabExcessHorizontalSpace = true; - root.setLayoutData(gd); - - root.setLayout(new FormLayout()); - createTableView(); - createActionBar(); - - FormData tableData = new FormData(); - tableData.left = new FormAttachment(0,5); - tableData.right = new FormAttachment(actionPanel, -5); - tableData.top = new FormAttachment(0,5); - tableData.bottom = new FormAttachment(100,-5); - tableView.getControl().setLayoutData(tableData); - - FormData actionsData = new FormData(); - actionsData.top = new FormAttachment(0,5); - actionsData.bottom = new FormAttachment(100,-5); - actionsData.right = new FormAttachment(100,-5); - actionPanel.setLayoutData(actionsData); - return new Control[] {root}; - } - - @SuppressWarnings("unchecked") - protected void createTableView() { - tableView = CheckboxTableViewer.newCheckList(root, SWT.V_SCROLL - | SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE); - - TableColumn tc1 = new TableColumn(tableView.getTable(), SWT.CENTER); - tc1.setWidth(TC_DEFAULT_WIDTH); - tc1.setResizable(false); - - TableColumn tc2 = new TableColumn(tableView.getTable(), SWT.LEFT); - tc2.setWidth(TC_NAME_WIDTH); - tc2.setText(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME); - - TableColumn tc3 = new TableColumn(tableView.getTable(), SWT.LEFT); - tc3.setWidth(TC_PATH_WIDTH); - tc3.setText(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_PATH); - - tableView.setContentProvider(new IStructuredContentProvider() { - - @SuppressWarnings("unchecked") - public Object[] getElements(Object inputElement) { - if (inputElement instanceof List) { - return ((List<JbossWSRuntime>) inputElement).toArray(); - } else { - throw new IllegalArgumentException( - JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE - + JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_AN_INSTANCEOF_OF_LIST); - } - } - - public void dispose() { - } - - public void inputChanged(Viewer viewer, Object oldInput, - Object newInput) { - viewer.refresh(); - } - }); - - tableView.setLabelProvider(new ITableLabelProvider() { - - private static final int TC_DEFAULT_NUMBER = 0; - private static final int TC_NAME_NUMBER = 1; - private static final int TC_PATH_NUMBER = 2; - - public void addListener(ILabelProviderListener listener) { - } - - public void dispose() { - } - - public boolean isLabelProperty(Object element, String property) { - return false; - } - - public void removeListener(ILabelProviderListener listener) { - } - - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - - public String getColumnText(Object element, int columnIndex) { - JbossWSRuntime rt = (JbossWSRuntime) element; - if (columnIndex == TC_DEFAULT_NUMBER) { - return ""; //$NON-NLS-1$ - } - if (columnIndex == TC_NAME_NUMBER) { - return rt.getName(); - } - if (columnIndex == TC_PATH_NUMBER) { - return rt.getHomeDir(); - } - return ""; //$NON-NLS-1$ - } - }); - - tableView.setInput(getValue()); - tableView.getTable().setLinesVisible(true); - tableView.getTable().setHeaderVisible(true); - tableView.addCheckStateListener(new ICheckStateListener() { - public void checkStateChanged(CheckStateChangedEvent event) { - JbossWSRuntime selRt = (JbossWSRuntime) event.getElement(); - if (event.getChecked()) { - JbossWSRuntime deselRt = null; - Object[] selRts = tableView.getCheckedElements(); - - for (int i = 0; i < selRts.length; i++) { - JbossWSRuntime rt = (JbossWSRuntime) selRts[i]; - if (rt != selRt) { - deselRt = rt; - break; - } - } - - if (deselRt != null) { - Object[] newChecked = new Object[selRts.length - 1]; - checkedElements.clear(); - int i = 0; - for (Object object : selRts) { - JbossWSRuntime rt = (JbossWSRuntime) object; - if (rt == selRt) { - newChecked[i] = rt; - checkedElements.add(rt); - i++; - } - } - tableView.setCheckedElements(newChecked); - } else { - checkedElements.add((JbossWSRuntime)event.getElement()); - } - } else { - checkedElements.remove(selRt); - } - pcs.firePropertyChange(getName(), null, getValue()); - } - }); - - for (JbossWSRuntime rt : (List<JbossWSRuntime>) getValue()) { - if (rt.isDefault()) { - tableView.setChecked(rt, true); - checkedElements.add(rt); - } - } - } - - protected void createActionBar() { - actionPanel = new ActionPanel(root, new BaseAction[] { - new AddAction(), new EditAction(), new RemoveAction()}); - tableView.addSelectionChangedListener(actionPanel); - } - - /** - * Checks all runtimes and set default one if user did not do it. - */ - @SuppressWarnings("unchecked") - private void setDefaultRuntimes() { - List<JbossWSRuntime> runtimes = (List<JbossWSRuntime>)getValue(); - for (JbossWSRuntime jbossWSRuntime : runtimes) { - boolean checked = false; - for(JbossWSRuntime checkedElement: checkedElements) { - if(checkedElement == jbossWSRuntime) { - checked = true; - break; - } - } - if(!checked) { - tableView.setChecked(jbossWSRuntime, true); - checkedElements.add(jbossWSRuntime); - } - } - } - - /** - * Return array of Controls that forms and editor - * - * @return Control[] - */ - @Override - public Object[] getEditorControls() { - return new Control[] {root}; - } - - /** - * Return number of controls in editor - * - * @return int - */ - @Override - public int getNumberOfControls() { - return 1; - } - - /** - * Fill wizard page with editors - * - * @param parent - * Composite - parent composite - */ - @Override - public void doFillIntoGrid(Object parent) { - Assert - .isTrue( - parent instanceof Composite, - JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_COMPOSITE); - Assert - .isTrue( - ((Composite) parent).getLayout() instanceof GridLayout, - JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_SUPPORT); - Composite aComposite = (Composite) parent; - getEditorControls(aComposite); - GridLayout gl = (GridLayout) ((Composite) parent).getLayout(); - - GridData gd = new GridData(); - gd.horizontalSpan = gl.numColumns; - gd.grabExcessHorizontalSpace = true; - gd.horizontalAlignment = GridData.FILL; - - ((Control) getEditorControls()[0]).setLayoutData(gd); - } - - /** - * Wizard page for editing JbossWS Runtime parameters - * - */ - public static class JbossWSRuntimeWizardPage extends WizardPage implements - PropertyChangeListener { - - private static final String SRT_NAME = "name"; - private static final String SRT_HOMEDIR = "homeDir"; - - private static final int GL_PARENT_COLUMNS = 1; - private static final int GL_CONTENT_COLUMNS = 3; - - List<JbossWSRuntime> value = null; - - IFieldEditor name = createTextEditor( - SRT_NAME, JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME2, - ""); //$NON-NLS-1$ - - IFieldEditor homeDir = createBrowseFolderEditor( - SRT_HOMEDIR, - JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER, - ""); //$NON-NLS-1$ - - JbossWSRuntime current = null; - - public JbossWSRuntimeWizardPage(List<JbossWSRuntime> editedList) { - super(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NEW_RUNTIME); - - setMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_RUNTIME); - setTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME); - value = editedList; - } - - /** - * Create Wizard page content - * - * @param parent - * Composite - parent composite - */ - public void createControl(Composite parent) { - parent.setLayout(new GridLayout(GL_PARENT_COLUMNS, false)); - GridData dg = new GridData(); - dg.horizontalAlignment = GridData.FILL; - dg.grabExcessHorizontalSpace = true; - Composite root = new Composite(parent, SWT.NONE); - root.setLayoutData(dg); - GridLayout gl = new GridLayout(GL_CONTENT_COLUMNS, false); - root.setLayout(gl); - homeDir.doFillIntoGrid(root); - homeDir.addPropertyChangeListener(this); - name.doFillIntoGrid(root); - name.addPropertyChangeListener(this); - setPageComplete(false); - setControl(root); - } - - /** - * Process evt: setup default values based on JbossWS Home folder and - * validate user input - * - * @param evt - * PropertyChangeEvent describes changes in wizard - */ - public void propertyChange(java.beans.PropertyChangeEvent evt) { - if ("homeDir".equals(evt.getPropertyName())) { - if (name.getValueAsString() == null - || "".equals(name.getValueAsString().trim())) { - String homeDirName = homeDir.getValueAsString(); - if (homeDirName != null && !"".equals(homeDirName.trim())) { - File folder = new File(homeDirName); - homeDirName = folder.getName(); - } - name.setValue(homeDirName); - } - } - - if (name.getValueAsString() == null || "".equals(//$NON-NLS-1$ - name.getValueAsString().toString().trim())) { - setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY); - setPageComplete(false); - return; - } - - if (!name.getValueAsString().matches( - "[a-zA-Z_][a-zA-Z0-9_\\-\\. ]*")) { //$NON-NLS-1$ - setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT); - setPageComplete(false); - return; - } - for (JbossWSRuntime rt : value) { - if (current != null && current.getName().equals(rt.getName())) { - continue; - } - if (rt.getName().equals(name.getValueAsString())) { - setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME - + name.getValueAsString() - + JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS); - setPageComplete(false); - return; - } - } - - if (current != null - && current.getName().equals(name.getValueAsString()) - && current.getHomeDir().equals(homeDir.getValueAsString())) { - setErrorMessage(null); - setPageComplete(false); - return; - } - - if (homeDir.getValueAsString() == null - || "".equals(homeDir.getValueAsString().trim())) { //$NON-NLS-1$ - setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_HOME_DIRECTORY_CANNOT_BE_EMPTY); - setPageComplete(false); - return; - } - - setErrorMessage(null); - setPageComplete(true); - } - - /** - * Return JbossWS Runtime instance initialized by user input - * - * @return JbossWSRuntime instance - */ - public JbossWSRuntime getRuntime() { - JbossWSRuntime newRt = new JbossWSRuntime(); - newRt.setName(name.getValueAsString()); - newRt.setHomeDir(homeDir.getValueAsString()); - return newRt; - } - - public IFieldEditor createTextEditor(String name, String label, String defaultValue) { - CompositeEditor editor = new CompositeEditor(name,label, defaultValue); - editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,label), - new TextFieldEditor(name,label, defaultValue)}); - return editor; - } - - public IFieldEditor createBrowseFolderEditor(String name, String label, String defaultValue) { - CompositeEditor editor = new CompositeEditor(name, label, defaultValue); - editor.addFieldEditors(new IFieldEditor[]{new LabelFieldEditor(name,label), - new TextFieldEditor(name,label, defaultValue), - new ButtonFieldEditor(name,createSelectFolderAction(JbossWSUIMessages.JBOSSWS_SWT_FIELD_EDITOR_FACTORY_BROWSE),defaultValue)}); - return editor; - } - - public ButtonFieldEditor.ButtonPressedAction createSelectFolderAction(String buttonName) { - return new ButtonFieldEditor.ButtonPressedAction(buttonName) { - @Override - public void run() { - DirectoryDialog dialog = new DirectoryDialog(Display.getCurrent().getActiveShell()); - dialog.setFilterPath(getFieldEditor().getValueAsString()); - dialog.setMessage(JbossWSUIMessages.JBOSSWS_SWT_FIELD_EDITOR_FACTORY_SELECT_HOME_FOLDER); - dialog.setFilterPath(getFieldEditor().getValueAsString()); - String directory = dialog.open(); - if(directory!=null) { - getFieldEditor().setValue(directory); - } - } - }; - } - } - - /** - * Wizard collect information and creates new JbossWSRuntime instances. - * - */ - public static class JbossWSRuntimeNewWizard extends Wizard { - - JbossWSRuntimeWizardPage page1 = null; - List<JbossWSRuntime> added = null; - List<JbossWSRuntime> value = null; - - public JbossWSRuntimeNewWizard(List<JbossWSRuntime> exist,List<JbossWSRuntime> added) { - super(); - setWindowTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NEW_RUNTIME); - page1 = new JbossWSRuntimeWizardPage(exist); - addPage(page1); - this.value = exist; - this.added = added; - } - - /** - * Do finish steps - * - * @return boolean - */ - @Override - public boolean performFinish() { - JbossWSRuntime rt = page1.getRuntime(); - added.add(rt); - value.add(rt); - return true; - } - } - - /** - * Wizard for editing JbossWS Runrtime parameters: name, version and path to - * home folder - * - */ - public static class JbossWSRuntimeEditWizard extends Wizard { - JbossWSRuntimeWizardPage page1 = null; - List<JbossWSRuntime> added = null; - Map<JbossWSRuntime, JbossWSRuntime> changed = null; - List<JbossWSRuntime> value = null; - JbossWSRuntime source = null; - - /** - * Constructor with almost all initialization parameters - * - * @param existing - * List<JbossWSRuntime> - edited list of JbossWS Runtimes - * @param source - * JbossWSRuntime - edited JbossWS Runtime - * @param added - * List<JbossWSRuntime> - TBD - * @param changed - * List<JbossWSRuntime> - TBD - */ - public JbossWSRuntimeEditWizard(List<JbossWSRuntime> existing, - JbossWSRuntime source, List<JbossWSRuntime> added, - Map<JbossWSRuntime, JbossWSRuntime> changed) { - super(); - setWindowTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_EDIT_RUNTIME); - page1 = new JbossWSRuntimeWizardPage(existing); - page1 - .setMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_MODIFY_RUNTIME); - page1 - .setTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_EDIT_RUNTIME); - addPage(page1); - this.value = existing; - this.added = added; - this.changed = changed; - this.source = source; - page1.name.setValue(source.getName()); - page1.homeDir.setValue(source.getHomeDir()); - page1.current = source; - } - - /** - * Perform operations to finish editing JbossWS Runtime parameters - * - * @return boolean - always true - */ - @Override - public boolean performFinish() { - JbossWSRuntime rt = page1.getRuntime(); - if (rt.getName().equals(source.getName()) - && rt.getHomeDir().equals(source.getHomeDir())) { - return true; - } - if (added.contains(source) || changed.containsKey(source)) { - source.setName(rt.getName()); - source.setHomeDir(rt.getName()); - } else { - changed.put(rt, source); - int i = value.indexOf(source); - if (i >= 0) { - value.set(i, rt); - } else { - value.remove(source); - value.add(rt); - } - } - return true; - } - } - - /** - * Composite that holds list of BaseActions and presents them as column of - * buttons - * - */ - public static class ActionPanel extends Composite implements - ISelectionChangedListener { - - private BaseAction[] actions = null; - - /** - * Constructor creates panel with style, grid layout and buttons - * represented the actions - * - * @param parent - * Composite - * @param style - * int - * @param actions - * BaseAction[] - */ - public ActionPanel(Composite parent, int style, BaseAction[] actions) { - super(parent, style); - this.actions = actions; - setLayout(new GridLayout(1, false)); - for (BaseAction action : this.actions) { - new ActionButton(this, SWT.PUSH, action); - } - } - - /** - * Constructor creates panel with default style, grid layout and buttons - * represented the actions - * - * @param parent - * Composite - * @param actions - * BaseAction[] - */ - public ActionPanel(Composite parent, BaseAction[] actions) { - this(parent, SWT.NONE, actions); - } - - /** - * Listen to the selection changes and update actions state - * (enable/disable) - * - * @param event - * SelectionChangeEvent - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ - public void selectionChanged(SelectionChangedEvent event) { - for (BaseAction action : actions) { - action.setSelection(event.getSelection()); - } - } - } - - /** - * Class represents an BaseAction as SWT button control and runs action when - * button is prtessed - * - */ - public static class ActionButton implements IPropertyChangeListener { - - private Button button; - private BaseAction action; - - /** - * Create Button control with parent control and style that represents - * action - * - * @param parent - * Composite - * @param style - * int - * @param action - * BaseAction - */ - public ActionButton(Composite parent, int style, BaseAction action) { - this.button = new Button(parent, style); - this.action = action; - - GridData gd = new GridData(GridData.FILL_HORIZONTAL, - GridData.CENTER, false, false); - - gd.horizontalAlignment = GridData.FILL; - gd.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING; - this.button.setLayoutData(gd); - this.action.addPropertyChangeListener(this); - this.button.setText(action.getText()); - this.button.setEnabled(action.isEnabled()); - this.button.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - ActionButton.this.action.run(); - } - - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - - } - - /** - * Return SWT button control that calls provided action - * - * @return Control - button swt control - */ - public Control getControl() { - return button; - } - - /** - * Update enabled/disabled button state - * - * @param event - * PropertyChangeEvent - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(IAction.ENABLED)) { - button.setEnabled(((Boolean) event.getNewValue()) - .booleanValue()); - } - } - } - - /** - * Action that changes state enable/disable based on current table selection - * - */ - public abstract class BaseAction extends Action { - - JbossWSRuntime[] runtimes = new JbossWSRuntime[0]; - - /** - * Constructor creates action with provided name - * - * @param name - * String - action name - */ - public BaseAction(String name) { - super(name); - updateEnablement(); - } - - /** - * Set current selection - * - * @param selection - * ISelection - selected items - */ - public void setSelection(ISelection selection) { - if (selection instanceof IStructuredSelection) { - List<JbossWSRuntime> rts = new ArrayList<JbossWSRuntime>(); - for (Object rt : ((IStructuredSelection) selection).toArray()) { - rts.add((JbossWSRuntime) rt); - } - runtimes = rts.toArray(new JbossWSRuntime[] {}); - } else { - runtimes = new JbossWSRuntime[0]; - } - updateEnablement(); - } - - protected abstract void updateEnablement(); - } - - /** - * Action that invokes New JbossWS Runtime Dialog - * - */ - public class AddAction extends BaseAction { - - static final String ACTION_NAME = "&Add"; - - /** - * Constructor create Add action with default name - */ - public AddAction() { - super(ACTION_NAME); - // This action is always available - setEnabled(true); - } - - /** - * Do nothing, because Add action should be always available - */ - @Override - protected void updateEnablement() { - // Add button is always available - } - - /** - * Invoke New JbossWS Runtime Dialog - * - * @see org.eclipse.jface.action.Action#run() - */ - @SuppressWarnings("unchecked") - @Override - public void run() { - Wizard wiz = new JbossWSRuntimeNewWizard( - (List<JbossWSRuntime>) getValue(), added); - WizardDialog dialog = new WizardDialog(Display.getCurrent() - .getActiveShell(), wiz); - dialog.open(); - tableView.refresh(); - setDefaultRuntimes(); - } - } - - /** - * Action starts an editing selected JbossWS Runtime in Edit JbossWS Runtime - * dialog - * - */ - public class EditAction extends BaseAction { - - static final String ACTION_NAME = "&Edit"; - - - /** - * Create EditAction with default name - * - * @param text - */ - public EditAction() { - super(ACTION_NAME); - } - - /** - * Edit action is enabled when the only JbossWS Runtime is selected - */ - @Override - protected void updateEnablement() { - // available when the only JbossWSRuntime is selected - setEnabled(runtimes.length == 1); - } - - /** - * Start editing selected JbossWS Runtime in Edit JbossWS Runtime Wizard - * Dialog - * - * @see org.eclipse.jface.action.Action#run() - */ - @SuppressWarnings("unchecked") - @Override - public void run() { - JbossWSRuntime selected = runtimes[0]; - Wizard wiz = new JbossWSRuntimeEditWizard( - (List<JbossWSRuntime>) getValue(), runtimes[0], added, changed); - WizardDialog dialog = new WizardDialog(Display.getCurrent() - .getActiveShell(), wiz); - dialog.open(); - tableView.refresh(); - if (changed.containsValue(selected)) { - JbossWSRuntime c = findChangedRuntime(selected); - if (c != null) { - tableView.setSelection(new StructuredSelection(c)); - } - } - } - - private JbossWSRuntime findChangedRuntime(JbossWSRuntime source) { - for (JbossWSRuntime r : changed.keySet()) { - if (source == changed.get(r)) { - return r; - } - } - return null; - } - } - - /** - * Action deletes all selected JbossWS Runtimes. A warning message is shown for - * used JbossWS Runtimes - * - */ - public class RemoveAction extends BaseAction { - - static final String ACTION_NAME = "&Remove"; - /** - * Create DeleteAction action with default name - */ - public RemoveAction() { - super(ACTION_NAME); - } - - @Override - protected void updateEnablement() { - setEnabled(runtimes.length > 0); - } - - /** - * Remove all selected JbossWS Runtimes one by one - * - * @see org.eclipse.jface.action.Action#run() - */ - @Override - public void run() { - for (JbossWSRuntime rt : runtimes) { - removeRuntime(rt); - } - tableView.refresh(); - setDefaultRuntimes(); - } - - @SuppressWarnings("unchecked") - private void removeRuntime(JbossWSRuntime r) { - boolean used = isRuntimeUsed(r.getName()); - String title = JbossWSUIMessages.JBOSSWS_RUNTIME_DELETE_CONFIRM_TITLE; - String message = (used) ? NLS.bind( - JbossWSUIMessages.JBOSSWS_RUNTIME_DELETE_USED_CONFIRM, r.getName()) - : NLS.bind(JbossWSUIMessages.JBOSSWS_RUNTIME_DELETE_NOT_USED_CONFIRM, - r.getName()); - boolean b = MessageDialog.openConfirm(tableView.getControl() - .getShell(), title, message); - if (b) { - if (changed.containsKey(r)) { - r = changed.remove(r); - } - removed.add(r); - if (added.contains(r)) { - added.remove(r); - } - ((List) getValue()).remove(r); - } - checkedElements.remove(r); - } - - private boolean isRuntimeUsed(String runtimeName) { -// IProject[] ps = ResourcesPlugin.getWorkspace().getRoot() -// .getProjects(); -// for (int i = 0; i < ps.length; i++) { -// ISeamProject sp = SeamCorePlugin.getSeamProject(ps[i], false); -// if (sp != null && runtimeName.equals(sp.getRuntimeName())) { -// return true; -// } -// } - return false; - } - } -} \ No newline at end of file Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossRuntimeListFieldEditor.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -0,0 +1,1021 @@ +/******************************************************************************* + * 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.ws.ui.preferences; + +import java.beans.PropertyChangeListener; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.runtime.Assert; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.jface.viewers.CheckStateChangedEvent; +import org.eclipse.jface.viewers.CheckboxTableViewer; +import org.eclipse.jface.viewers.ICheckStateListener; +import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +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.Control; +import org.eclipse.swt.widgets.DirectoryDialog; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.TableColumn; +import org.jboss.tools.ws.ui.messages.JbossWSUIMessages; +import org.jboss.tools.ws.core.classpath.JbossWSRuntime; + +/** + * @author Grid Qian + */ +public class JbossRuntimeListFieldEditor extends BaseFieldEditor { + + // ------------------------------------------------------------------------ + // Layout parameters + // ------------------------------------------------------------------------ + + static final int GL_COLUMNS = 2; + static final int GL_HINT_HEIGHT = 200; + static final int TC_DEFAULT_WIDTH = 21; + static final int TC_NAME_WIDTH = 100; + static final int TC_VERSION_WIDTH = 50; + static final int TC_PATH_WIDTH = 100; + + // ------------------------------------------------------------------------ + // Field declarations + // ------------------------------------------------------------------------ + + private CheckboxTableViewer tableView = null; + + private Composite root = null; + + private ActionPanel actionPanel; + + private Map<JbossWSRuntime, JbossWSRuntime> changed = new HashMap<JbossWSRuntime, JbossWSRuntime>(); + + private JbossWSRuntime checkedElement = new JbossWSRuntime(); + + private List<JbossWSRuntime> added = new ArrayList<JbossWSRuntime>(); + + private List<JbossWSRuntime> removed = new ArrayList<JbossWSRuntime>(); + + // ------------------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------------------ + + /** + * Control for editing jbossWSRuntime list + * + * @param name + * String + * @param label + * String + * @param defaultValue + * Object + */ + public JbossRuntimeListFieldEditor(String name, String label, + Object defaultValue) { + super(name, label, defaultValue); + } + + /** + * TBD + * + * @return JbossWSRuntime; + */ + public JbossWSRuntime getDefaultJbossWSRuntime() { + return checkedElement; + } + + public void setDefaultJbossWSRuntime(JbossWSRuntime rt) { + checkedElement = rt; + } + + /** + * TBD + * + * @return List<JbossWSRuntime> + */ + public List<JbossWSRuntime> getAddedJbossWSRuntimes() { + return added; + } + + /** + * TBD + * + * @return List<JbossWSRuntime> + */ + public Map<JbossWSRuntime, JbossWSRuntime> getChangedJbossWSRuntimes() { + return changed; + } + + /** + * TBD + * + * @return List<JbossWSRuntime> + */ + public List<JbossWSRuntime> getRemoved() { + return removed; + } + + /** + * TBD + * + * @param composite + * Object - instance of Composite + * @return Object[] + */ + @Override + public Object[] getEditorControls(Object composite) { + + root = new Composite((Composite) composite, SWT.NONE); + GridData gd = new GridData(); + gd.horizontalAlignment = GridData.FILL; + gd.grabExcessHorizontalSpace = true; + root.setLayoutData(gd); + + root.setLayout(new FormLayout()); + createTableView(); + createActionBar(); + + FormData tableData = new FormData(); + tableData.left = new FormAttachment(0, 5); + tableData.right = new FormAttachment(actionPanel, -5); + tableData.top = new FormAttachment(0, 5); + tableData.bottom = new FormAttachment(100, -5); + tableView.getControl().setLayoutData(tableData); + + FormData actionsData = new FormData(); + actionsData.top = new FormAttachment(0, 5); + actionsData.bottom = new FormAttachment(100, -5); + actionsData.right = new FormAttachment(100, -5); + actionPanel.setLayoutData(actionsData); + return new Control[] { root }; + } + + @SuppressWarnings("unchecked") + protected void createTableView() { + tableView = CheckboxTableViewer.newCheckList(root, SWT.V_SCROLL + | SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE); + + TableColumn tc1 = new TableColumn(tableView.getTable(), SWT.CENTER); + tc1.setWidth(TC_DEFAULT_WIDTH); + tc1.setResizable(false); + + TableColumn tc2 = new TableColumn(tableView.getTable(), SWT.LEFT); + tc2.setWidth(TC_NAME_WIDTH); + tc2.setText(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME); + + TableColumn tc3 = new TableColumn(tableView.getTable(), SWT.LEFT); + tc3.setWidth(TC_PATH_WIDTH); + tc3.setText(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_PATH); + + tableView.setContentProvider(new IStructuredContentProvider() { + + @SuppressWarnings("unchecked") + public Object[] getElements(Object inputElement) { + if (inputElement instanceof List) { + return ((List<JbossWSRuntime>) inputElement).toArray(); + } else { + throw new IllegalArgumentException( + JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE + + JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_AN_INSTANCEOF_OF_LIST); + } + } + + public void dispose() { + } + + public void inputChanged(Viewer viewer, Object oldInput, + Object newInput) { + viewer.refresh(); + } + }); + + tableView.setLabelProvider(new ITableLabelProvider() { + + private static final int TC_DEFAULT_NUMBER = 0; + private static final int TC_NAME_NUMBER = 1; + private static final int TC_PATH_NUMBER = 2; + + public void addListener(ILabelProviderListener listener) { + } + + public void dispose() { + } + + public boolean isLabelProperty(Object element, String property) { + return false; + } + + public void removeListener(ILabelProviderListener listener) { + } + + public Image getColumnImage(Object element, int columnIndex) { + return null; + } + + public String getColumnText(Object element, int columnIndex) { + JbossWSRuntime rt = (JbossWSRuntime) element; + if (columnIndex == TC_DEFAULT_NUMBER) { + return ""; //$NON-NLS-1$ + } + if (columnIndex == TC_NAME_NUMBER) { + return rt.getName(); + } + if (columnIndex == TC_PATH_NUMBER) { + return rt.getHomeDir(); + } + return ""; //$NON-NLS-1$ + } + }); + + tableView.setInput(getValue()); + tableView.getTable().setLinesVisible(true); + tableView.getTable().setHeaderVisible(true); + tableView.addCheckStateListener(new ICheckStateListener() { + public void checkStateChanged(CheckStateChangedEvent event) { + JbossWSRuntime selRt = (JbossWSRuntime) event.getElement(); + if (event.getChecked()) { + JbossWSRuntime deselRt = null; + Object[] selRts = tableView.getCheckedElements(); + + for (int i = 0; i < selRts.length; i++) { + JbossWSRuntime rt = (JbossWSRuntime) selRts[i]; + if (rt != selRt) { + deselRt = rt; + break; + } + } + + if (deselRt != null) { + Object[] newChecked = new Object[selRts.length - 1]; + checkedElement = null; + int i = 0; + for (Object object : selRts) { + JbossWSRuntime rt = (JbossWSRuntime) object; + if (rt == selRt) { + newChecked[i] = rt; + checkedElement = rt; + i++; + } + } + tableView.setCheckedElements(newChecked); + } else { + checkedElement = (JbossWSRuntime) event.getElement(); + } + } else { + if (checkedElement == selRt) { + checkedElement = null; + } + } + pcs.firePropertyChange(getName(), null, getValue()); + } + }); + + for (JbossWSRuntime rt : (List<JbossWSRuntime>) getValue()) { + if (rt.isDefault()) { + tableView.setChecked(rt, true); + checkedElement = rt; + } + } + } + + protected void createActionBar() { + actionPanel = new ActionPanel(root, new BaseAction[] { new AddAction(), + new EditAction(), new RemoveAction() }); + tableView.addSelectionChangedListener(actionPanel); + } + + /** + * Checks all runtimes and set default one if user did not do it. + */ + @SuppressWarnings("unchecked") + private void setDefaultRuntime() { + List<JbossWSRuntime> runtimes = (List<JbossWSRuntime>) getValue(); + boolean checked = false; + for (JbossWSRuntime jbossWSRuntime : runtimes) { + + if (checkedElement == jbossWSRuntime) { + checked = true; + break; + } + } + if (!checked) { + tableView.setChecked(runtimes.get(0), true); + checkedElement = runtimes.get(0); + } + + } + + /** + * Return array of Controls that forms and editor + * + * @return Control[] + */ + @Override + public Object[] getEditorControls() { + return new Control[] { root }; + } + + /** + * Return number of controls in editor + * + * @return int + */ + @Override + public int getNumberOfControls() { + return 1; + } + + /** + * Fill wizard page with editors + * + * @param parent + * Composite - parent composite + */ + @Override + public void doFillIntoGrid(Object parent) { + Assert.isTrue(parent instanceof Composite, + JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_COMPOSITE); + Assert.isTrue(((Composite) parent).getLayout() instanceof GridLayout, + JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_SUPPORT); + Composite aComposite = (Composite) parent; + getEditorControls(aComposite); + GridLayout gl = (GridLayout) ((Composite) parent).getLayout(); + + GridData gd = new GridData(); + gd.horizontalSpan = gl.numColumns; + gd.grabExcessHorizontalSpace = true; + gd.horizontalAlignment = GridData.FILL; + + ((Control) getEditorControls()[0]).setLayoutData(gd); + } + + /** + * Wizard page for editing JbossWS Runtime parameters + * + */ + public static class JbossWSRuntimeWizardPage extends WizardPage implements + PropertyChangeListener { + + private static final String SRT_NAME = "name"; + private static final String SRT_HOMEDIR = "homeDir"; + + private static final int GL_PARENT_COLUMNS = 1; + private static final int GL_CONTENT_COLUMNS = 3; + + List<JbossWSRuntime> value = null; + + IFieldEditor name = createTextEditor(SRT_NAME, + JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME2, ""); //$NON-NLS-1$ + + IFieldEditor homeDir = createBrowseFolderEditor( + SRT_HOMEDIR, + JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER, + ""); //$NON-NLS-1$ + + JbossWSRuntime current = null; + + public JbossWSRuntimeWizardPage(List<JbossWSRuntime> editedList) { + super( + JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NEW_RUNTIME); + + setMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_RUNTIME); + setTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME); + value = editedList; + } + + /** + * Create Wizard page content + * + * @param parent + * Composite - parent composite + */ + public void createControl(Composite parent) { + parent.setLayout(new GridLayout(GL_PARENT_COLUMNS, false)); + GridData dg = new GridData(); + dg.horizontalAlignment = GridData.FILL; + dg.grabExcessHorizontalSpace = true; + Composite root = new Composite(parent, SWT.NONE); + root.setLayoutData(dg); + GridLayout gl = new GridLayout(GL_CONTENT_COLUMNS, false); + root.setLayout(gl); + homeDir.doFillIntoGrid(root); + homeDir.addPropertyChangeListener(this); + name.doFillIntoGrid(root); + name.addPropertyChangeListener(this); + setPageComplete(false); + setControl(root); + } + + /** + * Process evt: setup default values based on JbossWS Home folder and + * validate user input + * + * @param evt + * PropertyChangeEvent describes changes in wizard + */ + public void propertyChange(java.beans.PropertyChangeEvent evt) { + if ("homeDir".equals(evt.getPropertyName())) { + if (name.getValueAsString() == null + || "".equals(name.getValueAsString().trim())) { + String homeDirName = homeDir.getValueAsString(); + if (homeDirName != null && !"".equals(homeDirName.trim())) { + File folder = new File(homeDirName); + homeDirName = folder.getName(); + } + name.setValue(homeDirName); + } + } + + if (name.getValueAsString() == null || "".equals(//$NON-NLS-1$ + name.getValueAsString().toString().trim())) { + setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY); + setPageComplete(false); + return; + } + + if (!name.getValueAsString().matches( + "[a-zA-Z_][a-zA-Z0-9_\\-\\. ]*")) { //$NON-NLS-1$ + setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT); + setPageComplete(false); + return; + } + for (JbossWSRuntime rt : value) { + if (current != null && current.getName().equals(rt.getName())) { + continue; + } + if (rt.getName().equals(name.getValueAsString())) { + setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_RUNTIME + + name.getValueAsString() + + JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_ALREADY_EXISTS); + setPageComplete(false); + return; + } + } + + if (current != null + && current.getName().equals(name.getValueAsString()) + && current.getHomeDir().equals(homeDir.getValueAsString())) { + setErrorMessage(null); + setPageComplete(false); + return; + } + + if (homeDir.getValueAsString() == null + || "".equals(homeDir.getValueAsString().trim())) { //$NON-NLS-1$ + setErrorMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_HOME_DIRECTORY_CANNOT_BE_EMPTY); + setPageComplete(false); + return; + } + + setErrorMessage(null); + setPageComplete(true); + } + + /** + * Return JbossWS Runtime instance initialized by user input + * + * @return JbossWSRuntime instance + */ + public JbossWSRuntime getRuntime() { + JbossWSRuntime newRt = new JbossWSRuntime(); + newRt.setName(name.getValueAsString()); + newRt.setHomeDir(homeDir.getValueAsString()); + return newRt; + } + + public IFieldEditor createTextEditor(String name, String label, + String defaultValue) { + CompositeEditor editor = new CompositeEditor(name, label, + defaultValue); + editor.addFieldEditors(new IFieldEditor[] { + new LabelFieldEditor(name, label), + new TextFieldEditor(name, label, defaultValue) }); + return editor; + } + + public IFieldEditor createBrowseFolderEditor(String name, String label, + String defaultValue) { + CompositeEditor editor = new CompositeEditor(name, label, + defaultValue); + editor + .addFieldEditors(new IFieldEditor[] { + new LabelFieldEditor(name, label), + new TextFieldEditor(name, label, defaultValue), + new ButtonFieldEditor( + name, + createSelectFolderAction(JbossWSUIMessages.JBOSSWS_SWT_FIELD_EDITOR_FACTORY_BROWSE), + defaultValue) }); + return editor; + } + + public ButtonFieldEditor.ButtonPressedAction createSelectFolderAction( + String buttonName) { + return new ButtonFieldEditor.ButtonPressedAction(buttonName) { + @Override + public void run() { + DirectoryDialog dialog = new DirectoryDialog(Display + .getCurrent().getActiveShell()); + dialog.setFilterPath(getFieldEditor().getValueAsString()); + dialog + .setMessage(JbossWSUIMessages.JBOSSWS_SWT_FIELD_EDITOR_FACTORY_SELECT_HOME_FOLDER); + dialog.setFilterPath(getFieldEditor().getValueAsString()); + String directory = dialog.open(); + if (directory != null) { + getFieldEditor().setValue(directory); + } + } + }; + } + } + + /** + * Wizard collect information and creates new JbossWSRuntime instances. + * + */ + public static class JbossWSRuntimeNewWizard extends Wizard { + + JbossWSRuntimeWizardPage page1 = null; + List<JbossWSRuntime> added = null; + List<JbossWSRuntime> value = null; + + public JbossWSRuntimeNewWizard(List<JbossWSRuntime> exist, + List<JbossWSRuntime> added) { + super(); + setWindowTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_NEW_RUNTIME); + page1 = new JbossWSRuntimeWizardPage(exist); + addPage(page1); + this.value = exist; + this.added = added; + } + + /** + * Do finish steps + * + * @return boolean + */ + @Override + public boolean performFinish() { + JbossWSRuntime rt = page1.getRuntime(); + added.add(rt); + value.add(rt); + return true; + } + } + + /** + * Wizard for editing JbossWS Runrtime parameters: name, version and path to + * home folder + * + */ + public static class JbossWSRuntimeEditWizard extends Wizard { + JbossWSRuntimeWizardPage page1 = null; + List<JbossWSRuntime> added = null; + Map<JbossWSRuntime, JbossWSRuntime> changed = null; + List<JbossWSRuntime> value = null; + JbossWSRuntime source = null; + + /** + * Constructor with almost all initialization parameters + * + * @param existing + * List<JbossWSRuntime> - edited list of JbossWS + * Runtimes + * @param source + * JbossWSRuntime - edited JbossWS Runtime + * @param added + * List<JbossWSRuntime> - TBD + * @param changed + * List<JbossWSRuntime> - TBD + */ + public JbossWSRuntimeEditWizard(List<JbossWSRuntime> existing, + JbossWSRuntime source, List<JbossWSRuntime> added, + Map<JbossWSRuntime, JbossWSRuntime> changed) { + super(); + setWindowTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_EDIT_RUNTIME); + page1 = new JbossWSRuntimeWizardPage(existing); + page1 + .setMessage(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_MODIFY_RUNTIME); + page1 + .setTitle(JbossWSUIMessages.JBOSSWS_RUNTIME_LIST_FIELD_EDITOR_EDIT_RUNTIME); + addPage(page1); + this.value = existing; + this.added = added; + this.changed = changed; + this.source = source; + page1.name.setValue(source.getName()); + page1.homeDir.setValue(source.getHomeDir()); + page1.current = source; + } + + /** + * Perform operations to finish editing JbossWS Runtime parameters + * + * @return boolean - always true + */ + @Override + public boolean performFinish() { + JbossWSRuntime rt = page1.getRuntime(); + if (rt.getName().equals(source.getName()) + && rt.getHomeDir().equals(source.getHomeDir())) { + return true; + } + if (added.contains(source) || changed.containsKey(source)) { + source.setName(rt.getName()); + source.setHomeDir(rt.getName()); + } else { + changed.put(rt, source); + int i = value.indexOf(source); + if (i >= 0) { + value.set(i, rt); + } else { + value.remove(source); + value.add(rt); + } + } + return true; + } + } + + /** + * Composite that holds list of BaseActions and presents them as column of + * buttons + * + */ + public static class ActionPanel extends Composite implements + ISelectionChangedListener { + + private BaseAction[] actions = null; + + /** + * Constructor creates panel with style, grid layout and buttons + * represented the actions + * + * @param parent + * Composite + * @param style + * int + * @param actions + * BaseAction[] + */ + public ActionPanel(Composite parent, int style, BaseAction[] actions) { + super(parent, style); + this.actions = actions; + setLayout(new GridLayout(1, false)); + for (BaseAction action : this.actions) { + new ActionButton(this, SWT.PUSH, action); + } + } + + /** + * Constructor creates panel with default style, grid layout and buttons + * represented the actions + * + * @param parent + * Composite + * @param actions + * BaseAction[] + */ + public ActionPanel(Composite parent, BaseAction[] actions) { + this(parent, SWT.NONE, actions); + } + + /** + * Listen to the selection changes and update actions state + * (enable/disable) + * + * @param event + * SelectionChangeEvent + * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) + */ + public void selectionChanged(SelectionChangedEvent event) { + for (BaseAction action : actions) { + action.setSelection(event.getSelection()); + } + } + } + + /** + * Class represents an BaseAction as SWT button control and runs action when + * button is prtessed + * + */ + public static class ActionButton implements IPropertyChangeListener { + + private Button button; + private BaseAction action; + + /** + * Create Button control with parent control and style that represents + * action + * + * @param parent + * Composite + * @param style + * int + * @param action + * BaseAction + */ + public ActionButton(Composite parent, int style, BaseAction action) { + this.button = new Button(parent, style); + this.action = action; + + GridData gd = new GridData(GridData.FILL_HORIZONTAL, + GridData.CENTER, false, false); + + gd.horizontalAlignment = GridData.FILL; + gd.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING; + this.button.setLayoutData(gd); + this.action.addPropertyChangeListener(this); + this.button.setText(action.getText()); + this.button.setEnabled(action.isEnabled()); + this.button.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + ActionButton.this.action.run(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + + } + + /** + * Return SWT button control that calls provided action + * + * @return Control - button swt control + */ + public Control getControl() { + return button; + } + + /** + * Update enabled/disabled button state + * + * @param event + * PropertyChangeEvent + * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) + */ + public void propertyChange(PropertyChangeEvent event) { + if (event.getProperty().equals(IAction.ENABLED)) { + button.setEnabled(((Boolean) event.getNewValue()) + .booleanValue()); + } + } + } + + /** + * Action that changes state enable/disable based on current table selection + * + */ + public abstract class BaseAction extends Action { + + JbossWSRuntime[] runtimes = new JbossWSRuntime[0]; + + /** + * Constructor creates action with provided name + * + * @param name + * String - action name + */ + public BaseAction(String name) { + super(name); + updateEnablement(); + } + + /** + * Set current selection + * + * @param selection + * ISelection - selected items + */ + public void setSelection(ISelection selection) { + if (selection instanceof IStructuredSelection) { + List<JbossWSRuntime> rts = new ArrayList<JbossWSRuntime>(); + for (Object rt : ((IStructuredSelection) selection).toArray()) { + rts.add((JbossWSRuntime) rt); + } + runtimes = rts.toArray(new JbossWSRuntime[] {}); + } else { + runtimes = new JbossWSRuntime[0]; + } + updateEnablement(); + } + + protected abstract void updateEnablement(); + } + + /** + * Action that invokes New JbossWS Runtime Dialog + * + */ + public class AddAction extends BaseAction { + + static final String ACTION_NAME = "&Add"; + + /** + * Constructor create Add action with default name + */ + public AddAction() { + super(ACTION_NAME); + // This action is always available + setEnabled(true); + } + + /** + * Do nothing, because Add action should be always available + */ + @Override + protected void updateEnablement() { + // Add button is always available + } + + /** + * Invoke New JbossWS Runtime Dialog + * + * @see org.eclipse.jface.action.Action#run() + */ + @SuppressWarnings("unchecked") + @Override + public void run() { + Wizard wiz = new JbossWSRuntimeNewWizard( + (List<JbossWSRuntime>) getValue(), added); + WizardDialog dialog = new WizardDialog(Display.getCurrent() + .getActiveShell(), wiz); + dialog.open(); + tableView.refresh(); + setDefaultRuntime(); + } + } + + /** + * Action starts an editing selected JbossWS Runtime in Edit JbossWS Runtime + * dialog + * + */ + public class EditAction extends BaseAction { + + static final String ACTION_NAME = "&Edit"; + + /** + * Create EditAction with default name + * + * @param text + */ + public EditAction() { + super(ACTION_NAME); + } + + /** + * Edit action is enabled when the only JbossWS Runtime is selected + */ + @Override + protected void updateEnablement() { + // available when the only JbossWSRuntime is selected + setEnabled(runtimes.length == 1); + } + + /** + * Start editing selected JbossWS Runtime in Edit JbossWS Runtime Wizard + * Dialog + * + * @see org.eclipse.jface.action.Action#run() + */ + @SuppressWarnings("unchecked") + @Override + public void run() { + JbossWSRuntime selected = runtimes[0]; + Wizard wiz = new JbossWSRuntimeEditWizard( + (List<JbossWSRuntime>) getValue(), runtimes[0], added, + changed); + WizardDialog dialog = new WizardDialog(Display.getCurrent() + .getActiveShell(), wiz); + dialog.open(); + tableView.refresh(); + if (changed.containsValue(selected)) { + JbossWSRuntime c = findChangedRuntime(selected); + if (c != null) { + tableView.setSelection(new StructuredSelection(c)); + } + } + } + + private JbossWSRuntime findChangedRuntime(JbossWSRuntime source) { + for (JbossWSRuntime r : changed.keySet()) { + if (source == changed.get(r)) { + return r; + } + } + return null; + } + } + + /** + * Action deletes all selected JbossWS Runtimes. A warning message is shown + * for used JbossWS Runtimes + * + */ + public class RemoveAction extends BaseAction { + + static final String ACTION_NAME = "&Remove"; + + /** + * Create DeleteAction action with default name + */ + public RemoveAction() { + super(ACTION_NAME); + } + + @Override + protected void updateEnablement() { + setEnabled(runtimes.length > 0); + } + + /** + * Remove all selected JbossWS Runtimes one by one + * + * @see org.eclipse.jface.action.Action#run() + */ + @Override + public void run() { + for (JbossWSRuntime rt : runtimes) { + removeRuntime(rt); + } + tableView.refresh(); + setDefaultRuntime(); + } + + @SuppressWarnings("unchecked") + private void removeRuntime(JbossWSRuntime r) { + boolean used = isRuntimeUsed(r.getName()); + String title = JbossWSUIMessages.JBOSSWS_RUNTIME_DELETE_CONFIRM_TITLE; + String message = (used) ? NLS.bind( + JbossWSUIMessages.JBOSSWS_RUNTIME_DELETE_USED_CONFIRM, r + .getName()) : NLS.bind( + JbossWSUIMessages.JBOSSWS_RUNTIME_DELETE_NOT_USED_CONFIRM, + r.getName()); + boolean b = MessageDialog.openConfirm(tableView.getControl() + .getShell(), title, message); + if (b) { + if (changed.containsKey(r)) { + r = changed.remove(r); + } + removed.add(r); + if (added.contains(r)) { + added.remove(r); + } + ((List) getValue()).remove(r); + } + if (checkedElement == r) { + checkedElement = null; + } + } + + private boolean isRuntimeUsed(String runtimeName) { + // IProject[] ps = ResourcesPlugin.getWorkspace().getRoot() + // .getProjects(); + // for (int i = 0; i < ps.length; i++) { + // ISeamProject sp = SeamCorePlugin.getSeamProject(ps[i], false); + // if (sp != null && runtimeName.equals(sp.getRuntimeName())) { + // return true; + // } + // } + return false; + } + } +} \ No newline at end of file Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntime.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntime.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntime.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -1,128 +0,0 @@ -package org.jboss.tools.ws.ui.preferences; - -public class JbossWSRuntime { - - String name = null; - - String homeDir = null; - - boolean defaultRt = false; - - /** - * Default constructor - */ - public JbossWSRuntime() { - } - - /** - * Get JbossWSRuntime name - * - * @return name - */ - public String getName() { - return name; - } - - /** - * Get path to home directory - * - * @return home directory path as string - */ - public String getHomeDir() { - return homeDir; - } - - /** - * Set JbossWSRuntime name - * - * @param name - * new JbossWSRuntime name - */ - public void setName(String name) { - this.name = name; - } - - /** - * Set home directory - * - * @param homeDir - * new JbossWSRuntime's home directory - */ - public void setHomeDir(String homeDir) { - this.homeDir = homeDir; - } - - /** - * Mark runtime as default - * - * @param b - * new value for default property - */ - public void setDefault(boolean b) { - this.defaultRt = b; - } - - /** - * Get default flag - * - * @return default property - */ - public boolean isDefault() { - return defaultRt; - } - - /** - * Calculate path to seam-gen - * - * @return absolute path to seam-gen folder - */ - public String getSeamGenDir() { - return getHomeDir() + "/seam-gen"; //$NON-NLS-1$ - } - - /** - * Calculate path to source templates - * - * @return absolute path to source templates - */ - public String getSrcTemplatesDir() { - return getSeamGenDir() + "/src"; //$NON-NLS-1$ - } - - /** - * Calculate path to view templates - * - * @return absolute path to view templates - */ - public String getViewTemplatesDir() { - return getSeamGenDir() + "/view"; //$NON-NLS-1$ - } - - /** - * Calculate path to resource templates - * - * @return absolute path to resource templates - */ - public String getResourceTemplatesDir() { - return getSeamGenDir() + "/resources"; //$NON-NLS-1$ - } - - /** - * Calculate path to test templates - * - * @return absolute path to test templates - */ - public String getTestTemplatesDir() { - return getSeamGenDir() + "/test"; //$NON-NLS-1$ - } - - /** - * Calculate path to templates root directory - * - * @return absolute path to templates root directory - */ - public String getTemplatesDir() { - return getSeamGenDir(); - } - -} Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimeListConverter.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimeListConverter.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimeListConverter.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -1,87 +0,0 @@ -package org.jboss.tools.ws.ui.preferences; - -import java.util.HashMap; -import java.util.Map; -import java.util.StringTokenizer; - -public class JbossWSRuntimeListConverter { - - /* - * Constants definitions - */ - private static final String REGEXP_ESCAPE = "\\"; - private static final String COMMA = ","; - private static final String EMPTY_STRING = ""; - private static final String FIELD_SEPARATOR = "|"; - private static final String DEFAULT = "default"; - private static final String HOME_DIR = "homeDir"; - private static final String NAME = "name"; - - /** - * Load String to SeamRuntime map from String - * @param input - * String representation of map - * @return - * Map<String, SeamRuntime> loaded from string - * TODO - switch to XML? - * TODO - write converter from old serialization format to XML? - * TODO - handle errors in string format - */ - public Map<String, JbossWSRuntime> getMap(String input) { - - Map<String, JbossWSRuntime> result = new HashMap<String, JbossWSRuntime>(); - if (input == null || EMPTY_STRING.equals(input.trim())) { - return result; - } - StringTokenizer runtimes = new StringTokenizer(input, COMMA); - while (runtimes.hasMoreTokens()) { - String runtime = runtimes.nextToken(); - String[] map = runtime.split(REGEXP_ESCAPE + FIELD_SEPARATOR); - JbossWSRuntime rt = new JbossWSRuntime(); - final int step = 2; - for (int i = 0; i < map.length; i += step) { - String name = map[i]; - String value = i + 1 < map.length ? map[i + 1] : EMPTY_STRING; - if (NAME.equals(name)) { - rt.setName(value); - } else if (HOME_DIR.equals(name)) { - rt.setHomeDir(value); - } else if (DEFAULT.equals(name)) { - rt.setDefault(Boolean.parseBoolean(value)); - } - } - result.put(rt.getName(), rt); - } - - return result; - } - - /** - * Convert map String to SeamRUntime to string representation - * @param runtimeMap - * Map<String, SeamRuntime> - map of String to Seam Runtime to convert - * in String - * @return - * String representation of String to Seam Runtime map - */ - public String getString(Map<String, JbossWSRuntime> runtimeMap) { - StringBuffer buffer = new StringBuffer(); - JbossWSRuntime[] runtimes = runtimeMap.values().toArray( - new JbossWSRuntime[runtimeMap.size()]); - for (int i = 0; i < runtimes.length; i++) { - buffer.append(NAME).append(FIELD_SEPARATOR); - buffer.append(runtimes[i].getName()); - buffer.append(FIELD_SEPARATOR).append(HOME_DIR).append( - FIELD_SEPARATOR); - buffer.append(runtimes[i].getHomeDir()); - buffer.append(FIELD_SEPARATOR).append(DEFAULT).append( - FIELD_SEPARATOR); - buffer.append(runtimes[i].isDefault()); - if (i != runtimes.length - 1) { - buffer.append(COMMA); - } - } - return buffer.toString(); - } - } - Deleted: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimeManager.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimeManager.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/JbossWSRuntimeManager.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -1,259 +0,0 @@ -package org.jboss.tools.ws.ui.preferences; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.preference.IPersistentPreferenceStore; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.tools.ws.core.JbossWSCorePlugin; - -public class JbossWSRuntimeManager { - - private static JbossWSRuntimeListConverter converter = new JbossWSRuntimeListConverter(); - - private Map<String, JbossWSRuntime> runtimes = new HashMap<String, JbossWSRuntime>(); - - /** - * Private constructor - */ - private JbossWSRuntimeManager() { - IPreferenceStore ps = JbossWSCorePlugin.getDefault().getPreferenceStore(); - - String runtimeListString = ps.getDefaultString("jbosswsruntimelocation"); - - runtimes = converter.getMap(runtimeListString); - } - - /** - * This class make Java Runtime responsible for solving synchronization - * problems during initialization if there is any - * - */ - static class JbossWSRuntimeManagerHolder { - private static final JbossWSRuntimeManager INSTANCE = new JbossWSRuntimeManager(); - } - - /** - * Return SeamRuntimeManaher instance - * - * @return - * SeamRuntimeManager instance - */ - public static JbossWSRuntimeManager getInstance() { - return JbossWSRuntimeManagerHolder.INSTANCE; - } - - /** - * Return Array of configured SeamRuntimes - * - * @return - * SeamRuntime[] - */ - public JbossWSRuntime[] getRuntimes() { - Collection<JbossWSRuntime> c = runtimes.values(); - return c.toArray(new JbossWSRuntime[runtimes.size()]); - } - - /** - * Add new SeamRuntime - * - * @param runtime - * SeamRuntime - */ - public void addRuntime(JbossWSRuntime runtime) { - if (runtimes.size() == 0) { - runtime.setDefault(true); - } - - JbossWSRuntime oldDefaultRuntime = getDefaultRuntime(); - if (oldDefaultRuntime != null && runtime.isDefault()) { - oldDefaultRuntime.setDefault(false); - } - runtimes.put(runtime.getName(), runtime); - save(); - } - - /** - * Add new SeamRuntime with given parameters - * - * @param name - * String - runtime name - * @param path - * String - runtime home folder - * @param version - * String - string representation of version number - * @param defaultRt - * boolean - default flag - */ - public void addRuntime(String name, String path, - boolean defaultRt) { - JbossWSRuntime seamRt = new JbossWSRuntime(); - seamRt.setHomeDir(path); - seamRt.setName(name); - seamRt.setDefault(defaultRt); - addRuntime(seamRt); - } - - /** - * Return SeamRuntime by given name - * - * @param name - * String - SeamRuntime name - * @return - * SeamRuntime - found SeamRuntime instance or null - */ - public JbossWSRuntime findRuntimeByName(String name) { - for (JbossWSRuntime seamRuntime : runtimes.values()) { - if (seamRuntime.getName().equals(name)) { - return seamRuntime; - } - } - return null; - } - - /** - * Remove given SeamRuntime from manager - * @param rt - * SeamRuntime - */ - public void removeRuntime(JbossWSRuntime rt) { - runtimes.remove(rt.getName()); - } - - - /** - * Save preference value and force save changes to disk - */ - public void save() { - JbossWSCorePlugin.getDefault().getPreferenceStore().setValue( - "jbosswsruntimelocation", - converter.getString(runtimes)); - IPreferenceStore store = JbossWSCorePlugin.getDefault().getPreferenceStore(); - if (store instanceof IPersistentPreferenceStore) { - try { - ((IPersistentPreferenceStore) store).save(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - /** - * Marks this runtime as default. Marks other runtimes with the same version as not default. - * @param runtime - */ - public void setDefaultRuntime(JbossWSRuntime runtime) { - JbossWSRuntime[] runtimes = getRuntimes(); - for (int i = 0; i < runtimes.length; i++) { - runtimes[i].setDefault(false); - } - runtime.setDefault(true); - } - - /** - * Return first default SeamRuntime - * - * @return - * SeamRuntime - */ - public JbossWSRuntime getDefaultRuntime() { - for (JbossWSRuntime rt : runtimes.values()) { - if (rt.isDefault()) { - return rt; - } - } - return null; - } - - /** - * If project has seam facet then this method returns default seam runtime for proper version of facet. - * Otherwise return first default runtime. - * @param project - * @return - */ - public static JbossWSRuntime getDefaultRuntimeForProject(IProject project) { - if(project==null) { - throw new IllegalArgumentException("Project must not be null."); - } - try { - IProjectFacet facet = ProjectFacetsManager.getProjectFacet("jbossws.core"); - IFacetedProject facetedProject = ProjectFacetsManager.create(project); - if(facetedProject!=null) { - return getInstance().getDefaultRuntime(); - } - } catch (CoreException e) { - e.printStackTrace(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } - return getInstance().getDefaultRuntime(); - } - - /** - * Return list of available SeamRuntime names - * - * @return - * List<String> - */ - public List<String> getRuntimeNames() { - JbossWSRuntime[] rts = getRuntimes(); - List<String> result = new ArrayList<String>(); - for (JbossWSRuntime seamRuntime : rts) { - result.add(seamRuntime.getName()); - } - return result; - } - - /** - * Return a list of all runtime names - * - * @return - * List of all runtime names - */ - public List<String> getAllRuntimeNames() { - JbossWSRuntime[] rts = getRuntimes(); - List<String> result = new ArrayList<String>(); - for (JbossWSRuntime seamRuntime : rts) { - result.add(seamRuntime.getName()); - } - return result; - } - - /** - * TBD - * - * @param oldName - * old runtime name - * @param newName - * new runtime name - */ - public void changeRuntimeName(String oldName, String newName) { - JbossWSRuntime o = findRuntimeByName(oldName); - if (o == null) { - return; - } - o.setName(newName); - onRuntimeNameChanged(oldName, newName); - } - - private void onRuntimeNameChanged(String oldName, String newName) { - IProject[] ps = ResourcesPlugin.getWorkspace().getRoot().getProjects(); -// for (int i = 0; i < ps.length; i++) { -// ISeamProject sp = SeamCorePlugin.getSeamProject(ps[i], false); -// if (sp != null && oldName.equals(sp.getRuntimeName())) { -// sp.setRuntimeName(newName); -// } -// } - } -} \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/LabelFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/LabelFieldEditor.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/LabelFieldEditor.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -15,8 +15,7 @@ import org.eclipse.swt.widgets.Control; /** - * @author eskimo - * + * @author Grid Qian */ public class LabelFieldEditor extends BaseFieldEditor { @@ -24,52 +23,34 @@ super(name, label, ""); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#doFillIntoGrid(java.lang.Object) - */ @Override public void doFillIntoGrid(Object parent) { // TODO Auto-generated method stub } - /* (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#getEditorControls(java.lang.Object) - */ @Override public Object[] getEditorControls(Object composite) { // TODO Auto-generated method stub return new Control[]{createLabelControl((Composite)composite)}; } - /* (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#getEditorControls() - */ @Override public Object[] getEditorControls() { return getEditorControls(null); } - /* (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#isEditable() - */ @Override public boolean isEditable() { // TODO Auto-generated method stub return false; } - - /* (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#save(java.lang.Object) - */ + public void save(Object object) { // TODO Auto-generated method stub } - /* (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.IFieldEditor#setEditable(boolean) - */ @Override public void setEditable(boolean ediatble) { // TODO Auto-generated method stub @@ -80,9 +61,6 @@ public void setValue(Object value) { } - /* (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#getNumberOfControls() - */ @Override public int getNumberOfControls() { // TODO Auto-generated method stub Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/PushButtonField.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/PushButtonField.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/PushButtonField.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -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.ws.ui.preferences; import org.eclipse.swt.SWT; @@ -7,7 +18,7 @@ import org.jboss.tools.ws.ui.preferences.ButtonFieldEditor.ButtonPressedAction; /** - * @author eskimo + * @author Grid Qian * */ public class PushButtonField extends BaseField { Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextField.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextField.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextField.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -17,6 +17,9 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Text; +/** + * @author Grid Qian + */ public class TextField extends BaseField implements ModifyListener{ Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextFieldEditor.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextFieldEditor.java 2008-06-05 09:38:40 UTC (rev 8566) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/preferences/TextFieldEditor.java 2008-06-05 10:41:43 UTC (rev 8567) @@ -26,14 +26,11 @@ /** * - * @author eskimo + * @author Grid Qian * */ public class TextFieldEditor extends BaseFieldEditor implements PropertyChangeListener{ - /** - * - */ public static final int UNLIMITED = -1; protected int style = -1; @@ -60,28 +57,15 @@ setEditable(editable); } - /** - * - */ protected TextField fTextField = null; - /** - * - */ protected int fWidthInChars = 0; - /** - * - */ @Override public Object[] getEditorControls() { return new Control[] {getTextControl()}; } - /* - * (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#doFillIntoGrid(java.lang.Object) - */ @Override public void doFillIntoGrid(Object aParent) { Assert.isTrue(aParent instanceof Composite, JbossWSUIMessages.JBOSSWS_BASIC_EDITOR_COMPOSITE); @@ -120,17 +104,10 @@ return fTextField.getTextControl(); } - /** - * - */ protected void updateWidgetValues() { setValueAsString(getValueAsString()); } - /** - * - * @return - */ protected int getInitialStyle() { if(this.style >= 0) return style; return SWT.SINGLE | SWT.BORDER; @@ -173,9 +150,6 @@ return (value != null) ? value.toString() : ""; //$NON-NLS-1$ } - /** - * - */ @Override public int getNumberOfControls() { return 2; @@ -191,10 +165,6 @@ return fTextField!=null?fTextField.getTextControl():null; } - /* - * (non-Javadoc) - * @see org.jboss.tools.seam.ui.widget.editor.BaseFieldEditor#setFocus() - */ @Override public boolean setFocus() { boolean setfocus = false; @@ -203,9 +173,6 @@ return setfocus; } - /** - * - */ @Override public Object[] getEditorControls(Object composite) { return new Control[]{getTextControl((Composite)composite)}; @@ -231,18 +198,12 @@ } } - /** - * - */ @Override public void setEditable(boolean aEditable) { super.setEditable(aEditable); if(getTextControl()!=null) getTextControl().setEditable(aEditable); } - /** - * - */ public void propertyChange(PropertyChangeEvent evt) { super.setValue(evt.getNewValue()); }

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r8566 - trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-05 05:38:40 -0400 (Thu, 05 Jun 2008) New Revision: 8566 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties Log: Dialog title 'Properties' is made common so that not to keep a lot of ..._Properties.WindowTitle constants in *.properties files. Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2008-06-05 09:28:33 UTC (rev 8565) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2008-06-05 09:38:40 UTC (rev 8566) @@ -18,7 +18,6 @@ FileSeamComponent12_AddMapProperty.WindowTitle=Add Map Property FileSeamComponent12_AddMapProperty.Title=Property -FileSeamComponent12_Properties.WindowTitle=Properties FileSeamComponent12_Properties.Title=File Seam Component 1.2 FileSeamComponent12_EditorActionList_AddProperty.WindowTitle=Add Simple Property @@ -42,7 +41,6 @@ FileSeamComponent20_AddMapProperty.WindowTitle=Add Map Property FileSeamComponent20_AddMapProperty.Title=Property -FileSeamComponent20_Properties.WindowTitle=Properties FileSeamComponent20_Properties.Title=File Seam Component 2.0 FileSeamComponent20_EditorActionList_AddProperty.WindowTitle=Add Simple Property @@ -66,7 +64,6 @@ FileSeamComponents11_AddEvent.WindowTitle=Add Event FileSeamComponents11_AddEvent.Title=Seam Event -FileSeamComponents11_Properties.WindowTitle=Properties FileSeamComponents11_Properties.Title=File Seam Component 1.1 FileSeamComponents11_EditorActionList_AddComponent.WindowTitle=Add Component @@ -114,7 +111,6 @@ FileSeamComponents20_AddImport.WindowTitle=Add Import FileSeamComponents20_AddImport.Title=Seam Import -FileSeamComponents20_Properties.WindowTitle=Properties FileSeamComponents20_Properties.Title=File Seam Components 2.0 FileSeamComponents20_EditorActionList_AddComponent.WindowTitle=Add Component @@ -129,10 +125,8 @@ FileSeamComponents20_EditorActionList_AddImport.WindowTitle=Add Import FileSeamComponents20_EditorActionList_AddImport.Title=Seam Import -SeamAction_Properties.WindowTitle=Properties SeamAction_Properties.Title=Seam Action -SeamAction20_Properties.WindowTitle=Properties SeamAction20_Properties.Title=Seam Action SeamComponent_AddProperty.WindowTitle=Add Simple Property @@ -144,49 +138,38 @@ SeamComponent_AddMapProperty.WindowTitle=Add Map Property SeamComponent_AddMapProperty.Title=Property -SeamComponent_Properties.WindowTitle=Properties SeamComponent_Properties.Title=Seam Component SeamEvent_AddAction.WindowTitle=Add Action SeamEvent_AddAction.Title=Seam Action -SeamEvent_Properties.WindowTitle=Properties SeamEvent_Properties.Title=Seam Event SeamEvent20_AddAction.WindowTitle=Add Action SeamEvent20_AddAction.Title=Action -SeamEvent20_Properties.WindowTitle=Properties SeamEvent20_Properties.Title=Seam Event -SeamFactory_Properties.WindowTitle=Properties SeamFactory_Properties.Title=Seam Factory -SeamFactory20_Properties.WindowTitle=Properties SeamFactory20_Properties.Title=Seam Factory -SeamImport_Properties.WindowTitle=Properties SeamImport_Properties.Title=Seam Import -SeamListEntry_Properties.WindowTitle=Properties SeamListEntry_Properties.Title=Seam List Entry -SeamMapEntry_Properties.WindowTitle=Properties SeamMapEntry_Properties.Title=Seam Map Entry -SeamProperty_Properties.WindowTitle=Properties SeamProperty_Properties.Title=Seam Property SeamPropertyList_AddEntry.WindowTitle=Add Entry SeamPropertyList_AddEntry.Title=Entry -SeamPropertyList_Properties.WindowTitle=Properties SeamPropertyList_Properties.Title=Seam Property List SeamPropertyMap_AddEntry.WindowTitle=Add Entry SeamPropertyMap_AddEntry.Title=Entry -SeamPropertyMap_Properties.WindowTitle=Properties SeamPropertyMap_Properties.Title=Seam Property Map FileFolder_CreateFileSeamComponents.WindowTitle=New Seam Components @@ -199,88 +182,66 @@ FileSystemFolder_CreateFileSeamComponents_0.WindowTitle=New Seam Components FileSystemFolder_CreateFileSeamComponents_0.Title=Seam Components File -SeamCoreActor_Properties.WindowTitle=Properties SeamCoreActor_Properties.Title=Seam Core Actor SeamCoreBundleNames_AddEntry.WindowTitle=Add Entry SeamCoreBundleNames_AddEntry.Title=Entry -SeamCoreBundleNames_Properties.WindowTitle=Properties SeamCoreBundleNames_Properties.Title=Seam Core Bundle Names -SeamCoreDispatcher_Properties.WindowTitle=Properties SeamCoreDispatcher_Properties.Title=Seam Core Dispatcher -SeamCoreEJB_Properties.WindowTitle=Properties SeamCoreEJB_Properties.Title=Seam Core EJB -SeamCoreEntityManagerFactory_Properties.WindowTitle=Properties SeamCoreEntityManagerFactory_Properties.Title=Seam Core Entity Manager Factory -SeamCoreFilter_Properties.WindowTitle=Properties SeamCoreFilter_Properties.Title=Seam Core Filter SeamCoreFilters_AddEntry.WindowTitle=Add Entry SeamCoreFilters_AddEntry.Title=Entry -SeamCoreFilters_Properties.WindowTitle=Properties SeamCoreFilters_Properties.Title=Seam Core Filters -SeamCoreInit_Properties.WindowTitle=Properties SeamCoreInit_Properties.Title=Seam Core Init -SeamCoreJBPM_Properties.WindowTitle=Properties SeamCoreJBPM_Properties.Title=Seam Core JBPM -SeamCoreLocaleSelector_Properties.WindowTitle=Properties SeamCoreLocaleSelector_Properties.Title=Seam Core Locale Selector -SeamCoreManagedPersistenceContext_Properties.WindowTitle=Properties SeamCoreManagedPersistenceContext_Properties.Title=Seam Core Managed Persistence Context -SeamCoreManager_Properties.WindowTitle=Properties SeamCoreManager_Properties.Title=Seam Core Manager -SeamCoreMicrocontainer_Properties.WindowTitle=Properties SeamCoreMicrocontainer_Properties.Title=Seam Core Microcontainer SeamCorePageflowDefinitions_AddEntry.WindowTitle=Add Entry SeamCorePageflowDefinitions_AddEntry.Title=Entry -SeamCorePageflowDefinitions_Properties.WindowTitle=Properties SeamCorePageflowDefinitions_Properties.Title=Seam Core Pageflow Definitions -SeamCorePages_Properties.WindowTitle=Properties SeamCorePages_Properties.Title=Seam Core Pages SeamCoreParameters_AddEntry.WindowTitle=Add Entry SeamCoreParameters_AddEntry.Title=Entry -SeamCoreParameters_Properties.WindowTitle=Properties SeamCoreParameters_Properties.Title=Seam Core Parameters SeamCorePersistenceUnitProperties_AddEntry.WindowTitle=Add Entry SeamCorePersistenceUnitProperties_AddEntry.Title=Entry -SeamCorePersistenceUnitProperties_Properties.WindowTitle=Properties SeamCorePersistenceUnitProperties_Properties.Title=Seam Core Persistence Unit -SeamCorePojoCache_Properties.WindowTitle=Properties SeamCorePojoCache_Properties.Title=Seam Core POJO Cache SeamCoreProcessDefinitions_AddEntry.WindowTitle=Add Entry SeamCoreProcessDefinitions_AddEntry.Title=Entry -SeamCoreProcessDefinitions_Properties.WindowTitle=Properties SeamCoreProcessDefinitions_Properties.Title=Seam Core Process Definitions -SeamCoreResourceBundle_Properties.WindowTitle=Properties SeamCoreResourceBundle_Properties.Title=Seam Core Resource Bundle -SeamCoreTimeZoneSelector_Properties.WindowTitle=Properties SeamCoreTimeZoneSelector_Properties.Title=Seam Core TimeZone Selector -SeamCoreTransactionListener_Properties.WindowTitle=Properties SeamCoreTransactionListener_Properties.Title=Seam Core Transaction Listener FileSeamComponents12_AddActor.WindowTitle=Add Actor @@ -379,16 +340,13 @@ FileSeamComponents12_EditorActionList_AddFilter.WindowTitle=Add Filter FileSeamComponents12_EditorActionList_AddFilter.Title=Filter -SeamDroolsManagedWorkingMemory_Properties.WindowTitle=Properties SeamDroolsManagedWorkingMemory_Properties.Title=Seam Drools Managed Working Memory -SeamDroolsRuleBase_Properties.WindowTitle=Properties SeamDroolsRuleBase_Properties.Title=Seam Drools Rule Base SeamDroolsRuleFiles_AddEntry.WindowTitle=Add Entry SeamDroolsRuleFiles_AddEntry.Title=Entry -SeamDroolsRuleFiles_Properties.WindowTitle=Properties SeamDroolsRuleFiles_Properties.Title=Seam Drools Rule Files FileSeamComponents12_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory @@ -403,28 +361,22 @@ FileSeamComponents12_EditorActionList_AddRuleBase.WindowTitle=Add Rule Base FileSeamComponents12_EditorActionList_AddRuleBase.Title=Rule Base -SeamFrameworkEntityHome_Properties.WindowTitle=Properties SeamFrameworkEntityHome_Properties.WindowTitle=Seam Framework Entity Home -SeamFrameworkEntityQuery_Properties.WindowTitle=Properties SeamFrameworkEntityQuery_Properties.WindowTitle=Seam Framework Entity Query -SeamFrameworkHibernateEntityHome_Properties.WindowTitle=Properties SeamFrameworkHibernateEntityHome_Properties.WindowTitle=Seam Framework Hibernate Entity Home -SeamFrameworkHibernateEntityQuery_Properties.WindowTitle=Properties SeamFrameworkHibernateEntityQuery_Properties.WindowTitle=Seam Framework Hibernate Entity Query SeamFrameworkHints_AddEntry.WindowTitle=Add Entry SeamFrameworkHints_AddEntry.Title=Entry -SeamFrameworkHints_Properties.WindowTitle=Properties SeamFrameworkHints_Properties.Title=Seam Framework Hints SeamFrameworkRestrictions_AddEntry.WindowTitle=Add Entry SeamFrameworkRestrictions_AddEntry.Title=Entry -SeamFrameworkRestrictions_Properties.WindowTitle=Properties SeamFrameworkRestrictions_Properties.Title=Seam Framework Restrictions FileSeamComponents12_AddEntityQuery.WindowTitle=Add Entity Query @@ -451,16 +403,12 @@ FileSeamComponents12_EditorActionList_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home FileSeamComponents12_EditorActionList_AddHibernateEntityHome.Title=Hibernate Entity Home -SeamJmsQueueConnection_Properties.WindowTitle=Properties SeamJmsQueueConnection_Properties.Title=Seam JMS Queue Connection -SeamJmsQueueSender_Properties.WindowTitle=Properties SeamJmsQueueSender_Properties.Title=Seam JMS Queue Sender -SeamJmsTopicConnection_Properties.WindowTitle=Properties SeamJmsTopicConnection_Properties.Title=Seam JMS Topic Connection -SeamJmsTopicPublisher_Properties.WindowTitle=Properties SeamJmsTopicPublisher_Properties.Title=Seam JMS Topic Publisher FileSeamComponents12_AddQueueConnection.WindowTitle=Add Queue Connection @@ -487,7 +435,6 @@ FileSeamComponents12_EditorActionList_AddQueueSender.WindowTitle=Add Managed Queue Sender FileSeamComponents12_EditorActionList_AddQueueSender.Title=Managed Queue Sender -SeamMailSession_Properties.WindowTitle=Properties SeamMailSession_Properties.Title=Seam Mail Session FileSeamComponents12_AddMailSession.WindowTitle=Add Mail Session @@ -496,10 +443,8 @@ FileSeamComponents12_EditorActionList_AddMailSession.WindowTitle=Add Mail Session FileSeamComponents12_EditorActionList_AddMailSession.Title=Mail Session -SeamPdfDocumentStore_Properties.WindowTitle=Properties SeamPdfDocumentStore_Properties.Title=Seam PDF Document Store -SeamPdfKeyStoreConfig_Properties.WindowTitle=Properties SeamPdfKeyStoreConfig_Properties.Title=Seam PDF Key Store Config FileSeamComponents12_AddDocumentStore.WindowTitle=Add Document Store @@ -514,7 +459,6 @@ FileSeamComponents12_EditorActionList_AddKeyStoreConfig.WindowTitle=Add Key Store Config FileSeamComponents12_EditorActionList_AddKeyStoreConfig.Title=Key Store Config -SeamRemotingConfig_Properties.WindowTitle=Properties SeamRemotingConfig_Properties.Title=Seam Remoting Config FileSeamComponents12_AddRemotingConfig.WindowTitle=Add Remoting Config @@ -523,7 +467,6 @@ FileSeamComponents12_EditorActionList_AddRemotingConfig.WindowTitle=Add Remoting Config FileSeamComponents12_EditorActionList_AddRemotingConfig.Title=Remoting Config -SeamSecurityIdentity_Properties.WindowTitle=Properties SeamSecurityIdentity_Properties.Title=Seam Security Identity FileSeamComponents12_AddIdentity.WindowTitle=Add Identity @@ -535,10 +478,8 @@ SeamSpringConfigLocations_AddEntry.WindowTitle=Add Entry SeamSpringConfigLocations_AddEntry.Title=Entry -SeamSpringConfigLocations_Properties.WindowTitle=Properties SeamSpringConfigLocations_Properties.Title=Seam Spring Config Locations -SeamSpringContextLoader_Properties.WindowTitle=Properties SeamSpringContextLoader_Properties.Title=Seam Spring Context Loader FileSeamComponents12_AddContextLoader.WindowTitle=Add Context Loader @@ -550,10 +491,8 @@ SeamThemeAvailableThemes_AddEntry.WindowTitle=Add Entry SeamThemeAvailableThemes_AddEntry.Title=Entry -SeamThemeAvailableThemes_Properties.WindowTitle=Properties SeamThemeAvailableThemes_Properties.Title=Seam Available Themes -SeamThemeSelector_Properties.WindowTitle=Properties SeamThemeSelector_Properties.Title=Theme Selector FileSeamComponents12_AddThemeSelector.WindowTitle=Add Theme Selector @@ -562,16 +501,12 @@ FileSeamComponents12_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector FileSeamComponents12_EditorActionList_AddThemeSelector.Title=Theme Selector -SeamWebContextFilter_Properties.WindowTitle=Properties SeamWebContextFilter_Properties.Title=Seam Web Context Filter -SeamWebExceptionFilter_Properties.WindowTitle=Properties SeamWebExceptionFilter_Properties.Title=Seam Web Exception Filter -SeamWebMultipartFilter_Properties.WindowTitle=Properties SeamWebMultipartFilter_Properties.Title=Seam Web Multipart Filter -SeamWebRedirectFilter_Properties.WindowTitle=Properties SeamWebRedirectFilter_Properties.Title=Seam Web Redirect Filter FileSeamComponents12_AddContextFilter.WindowTitle=Add Context Filter @@ -598,109 +533,82 @@ FileSeamComponents12_EditorActionList_AddRedirectFilter.WindowTitle=Add Redirect Filter FileSeamComponents12_EditorActionList_AddRedirectFilter.Title=Redirect Filter -SeamBPMActor20_Properties.WindowTitle=Properties SeamBPMActor20_Properties.Title=Seam BPM Actor -SeamBPMJBPM20_Properties.WindowTitle=Properties SeamBPMJBPM20_Properties.Title=Seam JBPM SeamBPMPageflowDefinitions20_AddEntry.WindowTitle=Add Entry SeamBPMPageflowDefinitions20_AddEntry.Title=Seam Pageflow Definition -SeamBPMPageflowDefinitions20_Properties.WindowTitle=Properties SeamBPMPageflowDefinitions20_Properties.Title=Seam Pageflow Definitions SeamBPMProcessDefinitions20_AddEntry.WindowTitle=Add Entry SeamBPMProcessDefinitions20_AddEntry.Title=Seam Process Definition -SeamBPMProcessDefinitions20_Properties.WindowTitle=Properties SeamBPMProcessDefinitions20_Properties.Title=Seam Process Definitions -SeamCoreActor_Properties.WindowTitle=Properties SeamCoreActor_Properties.Title=Seam Core Actor SeamCoreBundleNames_AddEntry.WindowTitle=Add Entry SeamCoreBundleNames_AddEntry.Title=Seam Bundle Name -SeamCoreBundleNames_Properties.WindowTitle=Properties SeamCoreBundleNames_Properties.Title=Seam Core Bundle Names -SeamCoreDispatcher_Properties.WindowTitle=Properties SeamCoreDispatcher_Properties.Title=Seam Core Dispatcher -SeamCoreEJB_Properties.WindowTitle=Properties SeamCoreEJB_Properties.Title=Seam Core EJB -SeamCoreEntityManagerFactory_Properties.WindowTitle=Properties SeamCoreEntityManagerFactory_Properties.Title=Seam Core Entity Manager Factory -SeamCoreFilter_Properties.WindowTitle=Properties SeamCoreFilter_Properties.Title=Seam Core Filter SeamCoreFilters_AddEntry.WindowTitle=Add Entry SeamCoreFilters_AddEntry.Title=Seam Core Filter -SeamCoreFilters_Properties.WindowTitle=Properties SeamCoreFilters_Properties.Title=Seam Core Filters -SeamCoreInit_Properties.WindowTitle=Properties SeamCoreInit_Properties.Title=Seam Core Init -SeamCoreJBPM_Properties.WindowTitle=Properties SeamCoreJBPM_Properties.Title=Seam Core JBPM -SeamCoreLocaleSelector_Properties.WindowTitle=Properties SeamCoreLocaleSelector_Properties.Title=Seam Core Locale Selector -SeamCoreManagedPersistenceContext_Properties.WindowTitle=Properties SeamCoreManagedPersistenceContext_Properties.Title=Seam Core Managed Persistence Context -SeamCoreManager_Properties.WindowTitle=Properties SeamCoreManager_Properties.Title=Seam Core Manager -SeamCoreMicrocontainer_Properties.WindowTitle=Properties SeamCoreMicrocontainer_Properties.Title=Seam Core Microcontainer SeamCorePageflowDefinitions_AddEntry.WindowTitle=Add Entry SeamCorePageflowDefinitions_AddEntry.Title=Seam Pageflow Definition -SeamCorePageflowDefinitions_Properties.WindowTitle=Properties SeamCorePageflowDefinitions_Properties.Title=Seam Core Pageflow Definitions -SeamCorePages_Properties.WindowTitle=Properties SeamCorePages_Properties.Title=Seam Core Pages SeamCoreParameters_AddEntry.WindowTitle=Add Entry SeamCoreParameters_AddEntry.Title=Seam Map Entry -SeamCoreParameters_Properties.WindowTitle=Properties SeamCoreParameters_Properties.Title=Seam Core Parameters SeamCorePersistenceUnitProperties_AddEntry.WindowTitle=Add Entry SeamCorePersistenceUnitProperties_AddEntry.Title=Seam Map Entry -SeamCorePersistenceUnitProperties_Properties.WindowTitle=Properties SeamCorePersistenceUnitProperties_Properties.Title=Seam Core Persistence Unit Properties -SeamCorePojoCache_Properties.WindowTitle=Properties SeamCorePojoCache_Properties.Title=Seam Core POJO Cache SeamCoreProcessDefinitions_AddEntry.WindowTitle=Add Entry SeamCoreProcessDefinitions_AddEntry.Title=Seam Process Definition -SeamCoreProcessDefinitions_Properties.WindowTitle=Properties SeamCoreProcessDefinitions_Properties.Title=Seam Core Process Definitions -SeamCoreResourceBundle_Properties.WindowTitle=Properties SeamCoreResourceBundle_Properties.Title=Seam Core Resource Bundle -SeamCoreResourceLoader20_Properties.WindowTitle=Properties SeamCoreResourceLoader20_Properties.Title=Seam Core Resource Loader -SeamCoreTimeZoneSelector_Properties.WindowTitle=Properties SeamCoreTimeZoneSelector_Properties.Title=Seam Core Time Zone Selector -SeamCoreTransactionListener_Properties.WindowTitle=Properties SeamCoreTransactionListener_Properties.Title=Seam Core Transaction Listener FileSeamComponents12_AddActor.WindowTitle=Add Actor @@ -835,19 +743,14 @@ FileSeamComponents20_EditorActionList_AddJBPM.WindowTitle=Add JBPM FileSeamComponents20_EditorActionList_AddJBPM.Title=Seam BPMJBPM -SeamDroolsManagedWorkingMemory_Properties.WindowTitle=Properties SeamDroolsManagedWorkingMemory_Properties.Title=Seam Drools Managed Working Memory -SeamDroolsRuleAgent_Properties.WindowTitle=Properties SeamDroolsRuleAgent_Properties.Title=Seam Drools Rule Agent -SeamDroolsRuleBase_Properties.WindowTitle=Properties SeamDroolsRuleBase_Properties.Title=Seam Drools Rule Base -SeamDroolsRuleFiles_AddEntry.WindowTitle=Add Entry SeamDroolsRuleFiles_AddEntry.Title=Seam Drools Rule File -SeamDroolsRuleFiles_Properties.WindowTitle=Properties SeamDroolsRuleFiles_Properties.Title=Seam Drools Rule Files FileSeamComponents12_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory @@ -880,28 +783,22 @@ FileSeamComponents20_EditorActionList_AddRuleAgent.WindowTitle=Add Rule Base FileSeamComponents20_EditorActionList_AddRuleAgent.Title=Seam Drools Rule Agent -SeamFrameworkEntityHome_Properties.WindowTitle=Properties SeamFrameworkEntityHome_Properties.Title=Seam Framework Entity Home -SeamFrameworkEntityQuery_Properties.WindowTitle=Properties SeamFrameworkEntityQuery_Properties.Title=Seam Framework Entity Query -SeamFrameworkHibernateEntityHome_Properties.WindowTitle=Properties SeamFrameworkHibernateEntityHome_Properties.Title=Seam Framework Hibernate Entity Home -SeamFrameworkHibernateEntityQuery_Properties.WindowTitle=Properties SeamFrameworkHibernateEntityQuery_Properties.Title=Seam Framework Hibernate Entity Query SeamFrameworkHints_AddEntry.WindowTitle=Add Entry SeamFrameworkHints_AddEntry.Title=Seam Framework Hint -SeamFrameworkHints_Properties.WindowTitle=Properties SeamFrameworkHints_Properties.Title=Seam Framework Hints SeamFrameworkRestrictions_AddEntry.WindowTitle=Add Entry SeamFrameworkRestrictions_AddEntry.Title=Seam Framework Restriction -SeamFrameworkRestrictions_Properties.WindowTitle=Properties SeamFrameworkRestrictions_Properties.Title=Seam Framework Restrictions FileSeamComponents12_AddEntityQuery.WindowTitle=Add Entity Query @@ -928,16 +825,12 @@ FileSeamComponents12_EditorActionList_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home FileSeamComponents12_EditorActionList_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home -SeamJmsQueueConnection_Properties.WindowTitle=Properties SeamJmsQueueConnection_Properties.Title=Seam Jms Queue Connection -SeamJmsQueueSender_Properties.WindowTitle=Properties SeamJmsQueueSender_Properties.Title=Seam Jms Queue Sender -SeamJmsTopicConnection_Properties.WindowTitle=Properties SeamJmsTopicConnection_Properties.Title=Seam Jms Topic Connection -SeamJmsTopicPublisher_Properties.WindowTitle=Properties SeamJmsTopicPublisher_Properties.Title=Seam Jms Topic Publisher FileSeamComponents12_AddQueueConnection.WindowTitle=Add Queue Connection @@ -967,22 +860,17 @@ SeamMailAliases_AddEntry.WindowTitle=Add Entry SeamMailAliases_AddEntry.Title=Seam List Entry -SeamMailAliases_Properties.WindowTitle=Properties SeamMailAliases_Properties.Title=Seam Mail Aliases -SeamMailMeldware_Properties.WindowTitle=Properties SeamMailMeldware_Properties.Title=Seam Mail Meldware -SeamMailMeldwareUser_Properties.WindowTitle=Properties SeamMailMeldwareUser_Properties.Title=Seam Mail Meldware User -SeamMailSession_Properties.WindowTitle=Properties SeamMailSession_Properties.Title=Seam Mail Session SeamMailUsers_AddEntry.WindowTitle=Add Entry SeamMailUsers_AddEntry.Title=Seam Mail User -SeamMailUsers_Properties.WindowTitle=Properties SeamMailUsers_Properties.Title=Seam Mail Users FileSeamComponents12_AddMailSession.WindowTitle=Add Mail Session @@ -1009,10 +897,8 @@ FileSeamComponents20_EditorActionList_AddMeldwareUser.WindowTitle=Add Meldware User FileSeamComponents20_EditorActionList_AddMeldwareUser.Title=Seam Mail Meldware User -SeamPdfDocumentStore_Properties.WindowTitle=Properties SeamPdfDocumentStore_Properties.Title=Seam PDF Document Store -SeamPdfKeyStoreConfig_Properties.WindowTitle=Properties SeamPdfKeyStoreConfig_Properties.Title=Seam PDF Key Store Config FileSeamComponents12_AddDocumentStore.WindowTitle=Add Document Store @@ -1027,7 +913,6 @@ FileSeamComponents12_EditorActionList_AddKeyStoreConfig.WindowTitle=Add Key Store Config FileSeamComponents12_EditorActionList_AddKeyStoreConfig.Title=Seam PDF Key Store Config -SeamRemotingConfig_Properties.WindowTitle=Properties SeamRemotingConfig_Properties.Title=Seam Remoting Config FileSeamComponents12_AddRemotingConfig.WindowTitle=Add Config @@ -1036,7 +921,6 @@ FileSeamComponents12_EditorActionList_AddRemotingConfig.WindowTitle=Add Config FileSeamComponents12_EditorActionList_AddRemotingConfig.Title=Seam Remoting Config -SeamSecurityIdentity_Properties.WindowTitle=Properties SeamSecurityIdentity_Properties.Title=Seam Security Identity FileSeamComponents12_AddIdentity.WindowTitle=Add Identity @@ -1048,16 +932,12 @@ SeamSpringConfigLocations_AddEntry.WindowTitle=Add Entry SeamSpringConfigLocations_AddEntry.Title=Seam Spring Config Location -SeamSpringConfigLocations_Properties.WindowTitle=Properties SeamSpringConfigLocations_Properties.Title=Seam Spring Config Locations -SeamSpringContextLoader_Properties.WindowTitle=Properties SeamSpringContextLoader_Properties.Title=Seam Spring Context Loader -SeamSpringTaskDispatcher20_Properties.WindowTitle=Properties SeamSpringTaskDispatcher20_Properties.Title=Seam Spring Task Dispatcher -SeamSpringTransaction20_Properties.WindowTitle=Properties SeamSpringTransaction20_Properties.Title=Seam Spring Transaction FileSeamComponents12_AddContextLoader.WindowTitle=Add Context Loader @@ -1088,10 +968,8 @@ SeamThemeAvailableThemes_AddEntry.WindowTitle=Add Entry SeamThemeAvailableThemes_AddEntry.Title=Available Theme -SeamThemeAvailableThemes_Properties.WindowTitle=Properties SeamThemeAvailableThemes_Properties.Title=Seam Available Themes -SeamThemeSelector_Properties.WindowTitle=Properties SeamThemeSelector_Properties.Title=Seam Theme Selector FileSeamComponents12_AddThemeSelector.WindowTitle=Add Theme Selector @@ -1100,16 +978,12 @@ FileSeamComponents12_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector FileSeamComponents12_EditorActionList_AddThemeSelector.Title=Seam Theme Selector -SeamNoTransaction_Properties.WindowTitle=Properties SeamNoTransaction_Properties.Title=Seam No Transaction -SeamTransactionEjb_Properties.WindowTitle=Properties SeamTransactionEjb_Properties.Title=Seam Transaction EJB -SeamTransactionEntity_Properties.WindowTitle=Properties SeamTransactionEntity_Properties.Title=Seam Transaction Entity -SeamTransactionHibernate_Properties.WindowTitle=Properties SeamTransactionHibernate_Properties.Title=Seam Transaction Hibernate FileSeamComponents20_AddEjb.WindowTitle=Add EJB @@ -1136,31 +1010,22 @@ FileSeamComponents20_EditorActionList_AddNo.WindowTitle=Add No Transaction FileSeamComponents20_EditorActionList_AddNo.Title=Seam No Transaction -SeamWebAjaxFilter20_Properties.WindowTitle=Properties SeamWebAjaxFilter20_Properties.Title=Seam Web Ajax Filter -SeamWebAuthenticationFilter20_Properties.WindowTitle=Properties SeamWebAuthenticationFilter20_Properties.Title=Seam Web Authentication Filter -SeamWebCharacterFilter20_Properties.WindowTitle=Properties SeamWebCharacterFilter20_Properties.Title=Seam Web Character Filter -SeamWebContextFilter_Properties.WindowTitle=Properties SeamWebContextFilter_Properties.Title=Seam Web Context Filter -SeamWebExceptionFilter_Properties.WindowTitle=Properties SeamWebExceptionFilter_Properties.Title=Seam Web Exception Filter -SeamWebLoggingFilter20_Properties.WindowTitle=Properties SeamWebLoggingFilter20_Properties.Title=Seam Web Logging Filter -SeamWebMultipartFilter_Properties.WindowTitle=Properties SeamWebMultipartFilter_Properties.Title=Seam Web Multipart Filter -SeamWebRedirectFilter_Properties.WindowTitle=Properties SeamWebRedirectFilter_Properties.Title=Seam Web Redirect Filter -SeamWebServletSession20_Properties.WindowTitle=Properties SeamWebServletSession20_Properties.Title=Seam Web Servlet Session FileSeamComponents12_AddContextFilter.WindowTitle=Add Context Filter @@ -1244,13 +1109,10 @@ FileSeamComponents20_EditorActionList_AddServletSession.WindowTitle=Add Servlet Session FileSeamComponents20_EditorActionList_AddServletSession.Title=Seam Web Servlet Session -SeamAsyncPool_Properties.WindowTitle=Properties SeamAsyncPool_Properties.Title=Seam Async Pool -SeamAsyncQuartz_Properties.WindowTitle=Properties SeamAsyncQuartz_Properties.Title=Seam Async Quartz -SeamAsyncTimer_Properties.WindowTitle=Properties SeamAsyncTimer_Properties.Title=Seam Async Timer FileSeamComponents20_AddTimer.WindowTitle=Add Timer Service Dispatcher @@ -1271,10 +1133,8 @@ FileSeamComponents20_EditorActionList_AddPool.WindowTitle=Add Thread Pool Dispatcher FileSeamComponents20_EditorActionList_AddPool.Title=Seam Async Pool -SeamFrameworkEjbql_Properties.WindowTitle=Properties SeamFrameworkEjbql_Properties.Title=Seam Framework EJB QL -SeamFrameworkOrder_Properties.WindowTitle=Properties SeamFrameworkOrder_Properties.Title=Seam Framework Order FileSeamComponents20_AddEntityQuery.WindowTitle=Add Entity Query @@ -1301,10 +1161,8 @@ FileSeamComponents20_EditorActionList_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home FileSeamComponents20_EditorActionList_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home -SeamCoreLocaleSelector20_Properties.WindowTitle=Properties SeamCoreLocaleSelector20_Properties.Title=Seam Core Locale Selector -SeamCoreTimeZoneSelector20_Properties.WindowTitle=Properties SeamCoreTimeZoneSelector20_Properties.Title=Seam Core Time Zone Selector FileSeamComponents20_AddLocaleSelector.WindowTitle=Add Locale Selector @@ -1358,70 +1216,56 @@ SeamPersistenceCfgProperties_AddEntry.WindowTitle=Add Entry SeamPersistenceCfgProperties_AddEntry.Title=Seam Persistence Config Propertie -SeamPersistenceCfgProperties_Properties.WindowTitle=Properties SeamPersistenceCfgProperties_Properties.Title=Seam Persistence Config Properties -SeamPersistenceEntityManagerFactory_Properties.WindowTitle=Properties SeamPersistenceEntityManagerFactory_Properties.Title=Seam Persistence Entity Manager Factory -SeamPersistenceFilter_Properties.WindowTitle=Properties SeamPersistenceFilter_Properties.Title=Seam Persistence Filter SeamPersistenceFilters_AddEntry.WindowTitle=Add Entry SeamPersistenceFilters_AddEntry.Title=Seam Persistence Filter -SeamPersistenceFilters_Properties.WindowTitle=Properties SeamPersistenceFilters_Properties.Title=Seam Persistence Filters -SeamPersistenceHibernateSessionFactory_Properties.WindowTitle=Properties SeamPersistenceHibernateSessionFactory_Properties.Title=Seam Persistence Hibernate Session Factory -SeamPersistenceManagedContext_Properties.WindowTitle=Properties SeamPersistenceManagedContext_Properties.Title=Seam Persistence Managed Context -SeamPersistenceManagedHibernateSession_Properties.WindowTitle=Properties SeamPersistenceManagedHibernateSession_Properties.Title=Seam Persistence Managed Hibernate Session SeamPersistenceMappingClasses_AddEntry.WindowTitle=Add Entry SeamPersistenceMappingClasses_AddEntry.Title=Seam Persistence Mapping Class -SeamPersistenceMappingClasses_Properties.WindowTitle=Properties SeamPersistenceMappingClasses_Properties.Title=Seam Persistence Mapping Classes SeamPersistenceMappingFiles_AddEntry.WindowTitle=Add Entry SeamPersistenceMappingFiles_AddEntry.Title=Seam Persistence Mapping File -SeamPersistenceMappingFiles_Properties.WindowTitle=Properties SeamPersistenceMappingFiles_Properties.Title=Seam Persistence Mapping Files SeamPersistenceMappingJars_AddEntry.WindowTitle=Add Entry SeamPersistenceMappingJars_AddEntry.Title=Seam Persistence Mapping Jar -SeamPersistenceMappingJars_Properties.WindowTitle=Properties SeamPersistenceMappingJars_Properties.Title=Seam Persistence Mapping Jars SeamPersistenceMappingPackages_AddEntry.WindowTitle=Add Entry SeamPersistenceMappingPackages_AddEntry.Title=Seam Persistence Mapping Package -SeamPersistenceMappingPackages_Properties.WindowTitle=Properties SeamPersistenceMappingPackages_Properties.Title=Seam Persistence Mapping Packages SeamPersistenceMappingResources_AddEntry.WindowTitle=Add Entry SeamPersistenceMappingResources_AddEntry.Title=Seam Persistence Mapping Resource -SeamPersistenceMappingResources_Properties.WindowTitle=Properties SeamPersistenceMappingResources_Properties.Title=Seam Persistence Mapping Resources SeamPersistenceParameters_AddEntry.WindowTitle=Add Entry SeamPersistenceParameters_AddEntry.Title=Seam Persistence Parameter -SeamPersistenceParameters_Properties.WindowTitle=Properties SeamPersistenceParameters_Properties.Title=Seam Persistence Parameters SeamPersistenceUnitProperties_AddEntry.WindowTitle=Add Entry SeamPersistenceUnitProperties_AddEntry.Title=Seam Persistence Unit Property -SeamPersistenceUnitProperties_Properties.WindowTitle=Properties SeamPersistenceUnitProperties_Properties.Title=Seam Persistence Unit Properties FileSeamComponents20_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context @@ -1460,7 +1304,6 @@ FileSeamComponents20_EditorActionList_AddRemotingConfig.WindowTitle=Add Config FileSeamComponents20_EditorActionList_AddRemotingConfig.Title=Seam Remoting Config -SeamSecurityIdentity20_Properties.WindowTitle=Properties SeamSecurityIdentity20_Properties.Title=Seam Security Identity FileSeamComponents20_AddIdentity.WindowTitle=Add Identity @@ -1469,7 +1312,6 @@ FileSeamComponents20_EditorActionList_AddIdentity.WindowTitle=Add Identity FileSeamComponents20_EditorActionList_AddIdentity.Title=Seam Security Identity -SeamThemeSelector20_Properties.WindowTitle=Properties SeamThemeSelector20_Properties.Title=Seam Theme Selector FileSeamComponents20_AddThemeSelector.WindowTitle=Add Theme Selector

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r8565 - trunk/jst/plugins/org.jboss.tools.jst.web/resources/help.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-05 05:28:33 -0400 (Thu, 05 Jun 2008) New Revision: 8565 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties Log: Dialog title 'Properties' is made common so that not to keep a lot of ..._Properties.WindowTitle constants in *.properties files. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2008-06-05 09:15:33 UTC (rev 8564) +++ trunk/jst/plugins/org.jboss.tools.jst.web/resources/help/keys-web.properties 2008-06-05 09:28:33 UTC (rev 8565) @@ -24,32 +24,17 @@ FileFolder_CreateFileXML_0.WindowTitle=New XML File FileFolder_CreateFileXML_0.Title=XML File -FileXML=/struts/FileXML.html - -FileXML_Properties.WindowTitle=Properties FileXML_Properties.Title=File XML FileXML_Rename.WindowTitle=Rename FileXML_Rename.Title=File XML -FileTLD=/struts/FileTLD.html - -FileTLD_Properties=/struts/FileTLD_Properties.html -FileTLD_Properties.WindowTitle=Properties FileTLD_Properties.Title=File TLD -FileJS=/model/noHelpYet.html - -FileJS_Properties=/model/noHelpYet.html -FileJS_Properties.WindowTitle=Properties FileJS_Properties.Title=File JS FileJS_Rename.WindowTitle=Rename FileJS_Rename.Title=File JS -FileCSS=/struts/FileCSS.html - -FileCSS_Properties=/model/noHelpYet.html -FileCSS_Properties.WindowTitle=Properties FileCSS_Properties.Title=File CSS FileCSS_Rename.WindowTitle=Rename @@ -59,62 +44,43 @@ ##### Create TLD File ##### -FileFolder_CreateFileTLD=/model/noHelpYet.html FileFolder_CreateFileTLD.WindowTitle=New TLD File FileFolder_CreateFileTLD.Title=Tag Library Definition File -FileFolder_CreateFileTLD20=/model/noHelpYet.html FileFolder_CreateFileTLD20.WindowTitle=New TLD File 2.0 FileFolder_CreateFileTLD20.Title=Tag Library Definition File -FileFolder_CreateFileTLD21=/model/noHelpYet.html FileFolder_CreateFileTLD21.WindowTitle=New TLD File 2.1 FileFolder_CreateFileTLD21.Title=Tag Library Definition File -FileSystemFolder_CreateFileTLD=/model/noHelpYet.html FileSystemFolder_CreateFileTLD.WindowTitle=New TLD File FileSystemFolder_CreateFileTLD.Title=Tag Library Definition File -FileSystemFolder_CreateFileTLD20=/model/noHelpYet.html FileSystemFolder_CreateFileTLD20.WindowTitle=New TLD File 2.0 FileSystemFolder_CreateFileTLD20.Title=Tag Library Definition File -FileSystemFolder_CreateFileTLD21=/model/noHelpYet.html FileSystemFolder_CreateFileTLD21.WindowTitle=New TLD File 2.0 FileSystemFolder_CreateFileTLD21.Title=Tag Library Definition File ###### File *.tld 1.2 ##### -FileTLD_1_2=/struts/FileTLD_1_2.html - -FileTLD_1_2_Properties=/struts/FileTLD_1_2_Properties.html -FileTLD_1_2_Properties.WindowTitle=Properties FileTLD_1_2_Properties.Title=File TLD -FileTLD_1_2_CreateListener=/struts/FileTLD_1_2_CreateListener.html FileTLD_1_2_CreateListener.WindowTitle=Add Listener FileTLD_1_2_CreateListener.Title=TLD Listener -FileTLD_1_2_CreateTag=/struts/FileTLD_1_2_CreateTag.html FileTLD_1_2_CreateTag.WindowTitle=Add Tag FileTLD_1_2_CreateTag.Title=TLD Tag -FileTLD_1_2=/struts/FileTLD_1_2.html - -FileTLD_1_2_Properties=/struts/FileTLD_1_2_Properties.html -FileTLD_1_2_Properties.WindowTitle=Properties FileTLD_1_2_Properties.Title=File TLD -FileTLD_1_2_CreateListener=/struts/FileTLD_1_2_CreateListener.html FileTLD_1_2_CreateListener.WindowTitle=Add Listener FileTLD_1_2_CreateListener.Title=TLD Listener -FileTLD_1_2_CreateTag=/struts/FileTLD_1_2_CreateTag.html FileTLD_1_2_CreateTag.WindowTitle=Add Tag FileTLD_1_2_CreateTag.Title=TLD Tag -FileTLD_1_2_CreateValidator=/struts/FileTLD_1_2_CreateValidator.html FileTLD_1_2_CreateValidator.WindowTitle=Add Validator FileTLD_1_2_CreateValidator.Title=TLD Validator @@ -123,50 +89,34 @@ TLDValidator_Edit.Title=Validator -FileTLD_2_0=/struts/FileTLD_1_2.html - -FileTLD_2_0_Properties=/struts/FileTLD_1_2_Properties.html -FileTLD_2_0_Properties.WindowTitle=Properties FileTLD_2_0_Properties.Title=File TLD 2.0 -FileTLD_2_0_CreateListener=/struts/FileTLD_1_2_CreateListener.html FileTLD_2_0_CreateListener.WindowTitle=Add Listener FileTLD_2_0_CreateListener.Title=TLD Listener -FileTLD_2_0_CreateValidator=/struts/FileTLD_1_2_CreateValidator.html FileTLD_2_0_CreateValidator.WindowTitle=Add Validator FileTLD_2_0_CreateValidator.Title=TLD Validator -FileTLD_2_0_CreateTag=/struts/FileTLD_1_2_CreateTag.html FileTLD_2_0_CreateTag.WindowTitle=Add Tag FileTLD_2_0_CreateTag.Title=TLD Tag -FileTLD_2_0_CreateTagFile=/struts/FileTLD_1_2_CreateTag.html FileTLD_2_0_CreateTagFile.WindowTitle=Add Tag File FileTLD_2_0_CreateTagFile.Title=TLD Tag File FileTLD_2_0_Rename.WindowTitle=Rename FileTLD_2_0_Rename.Title=Tag Library Definition File -FileTLD_2_1=/struts/FileTLD_1_2.html - -FileTLD_2_1_Properties=/struts/FileTLD_1_2_Properties.html -FileTLD_2_1_Properties.WindowTitle=Properties FileTLD_2_1_Properties.Title=File TLD 2.1 -FileTLD_2_1_CreateListener=/struts/FileTLD_1_2_CreateListener.html FileTLD_2_1_CreateListener.WindowTitle=Add Listener FileTLD_2_1_CreateListener.Title=TLD Listener -FileTLD_2_1_CreateValidator=/struts/FileTLD_1_2_CreateValidator.html FileTLD_2_1_CreateValidator.WindowTitle=Add Validator FileTLD_2_1_CreateValidator.Title=TLD Validator -FileTLD_2_1_CreateTag=/struts/FileTLD_1_2_CreateTag.html FileTLD_2_1_CreateTag.WindowTitle=Add Tag FileTLD_2_1_CreateTag.Title=TLD Tag -FileTLD_2_1_CreateTagFile=/struts/FileTLD_1_2_CreateTag.html FileTLD_2_1_CreateTagFile.WindowTitle=Add Tag File FileTLD_2_1_CreateTagFile.Title=TLD Tag File @@ -174,104 +124,61 @@ FileTLD_2_1_Rename.Title=Tag Library Definition File -FileTLD_PRO=/struts/FileTLD.html - -FileTLD_PRO_Properties=/struts/FileTLD_Properties.html -FileTLD_PRO_Properties.WindowTitle=Properties FileTLD_PRO_Properties.Title=File TLD -FileTLD_PRO_CreateTag=/struts/FileTLD_CreateTag.html FileTLD_PRO_CreateTag.WindowTitle=Add Tag FileTLD_PRO_CreateTag.Title=TLD Tag ##### TLD Tag ##### -TLDTag=/struts_pro/TLDTag.html - -TLDTag_Properties=/struts_pro/TLDTag_Properties.html -TLDTag_Properties.WindowTitle=Properties TLDTag_Properties.Title=TLD Tag -TLDTag_CreateAttribute=/struts_pro/TLDTag_CreateAttribute.html TLDTag_CreateAttribute.WindowTitle=Add Attribute TLDTag_CreateAttribute.Title=TLD Attribute TLDTag12=/struts_pro/TLDTag12.html -TLDTag12_Properties=/struts_pro/TLDTag12_Properties.html -TLDTag12_Properties.WindowTitle=Properties TLDTag12_Properties.Title=TLD Tag -TLDTag12_CreateVariable=/struts_pro/TLDTag12_CreateVariable.html TLDTag12_CreateVariable.WindowTitle=Add Variable TLDTag12_CreateVariable.Title=TLD Variable -TLDTag12_CreateAttribute=/struts_pro/TLDTag12_CreateAttribute.html TLDTag12_CreateAttribute.WindowTitle=Add Attribute TLDTag12_CreateAttribute.Title=TLD Attribute -TLDTag21=/struts_pro/TLDTag12.html - -TLDTag21_Properties=/struts_pro/TLDTag12_Properties.html -TLDTag21_Properties.WindowTitle=Properties TLDTag21_Properties.Title=TLD Tag -TLDTag21_CreateVariable=/struts_pro/TLDTag12_CreateVariable.html TLDTag21_CreateVariable.WindowTitle=Add Variable TLDTag21_CreateVariable.Title=TLD Variable -TLDTag21_CreateAttribute=/struts_pro/TLDTag12_CreateAttribute.html TLDTag21_CreateAttribute.WindowTitle=Add Attribute TLDTag21_CreateAttribute.Title=TLD Attribute ##### TLD Attribute ##### -TLDAttribute=/struts_pro/TLDAttribute.html - -TLDAttribute_Properties.WindowTitle=Properties TLDAttribute_Properties.Title=TLD Attribute -TLDAttribute12_Properties.WindowTitle=Properties TLDAttribute12_Properties.Title=TLD Attribute -TLDAttribute21_Properties.WindowTitle=Properties TLDAttribute21_Properties.Title=TLD Attribute ##### TLD 1.2 Variable ##### -TLDVariable=/struts_pro/TLDVariable.html - -TLDVariable_Properties=/struts_pro/TLDVariable_Properties.html -TLDVariable_Properties.WindowTitle=Properties TLDVariable_Properties.Title=TLD Variable -TLDVariable_CreateInitParam=/struts_pro/WebAppServlet_CreateInitParam.html TLDVariable_CreateInitParam.WindowTitle=Add Init Param TLDVariable_CreateInitParam.Title=TLD Init Param ##### TLD 1.2 Validator ##### -TLDValidator=/struts_pro/TLDValidator.html - -TLDValidator_Properties=/struts_pro/TLDValidator.html -TLDValidator_Properties.WindowTitle=Properties TLDValidator_Properties.Title=TLD Validator -TLDValidator_CreateInitParam=/struts_pro/WebAppServlet_CreateInitParam.html TLDValidator_CreateInitParam.WindowTitle=Add Init Param TLDValidator_CreateInitParam.Title=TLD Init Param ##### TLD 1.2 Listener ##### -TLDListener=/struts_pro/TLDListener.html - -TLDListener_Properties=/struts_pro/TLDListener.html -TLDListener_Properties.WindowTitle=Properties TLDListener_Properties.Title=TLD Listener -TLDListeners=/struts_pro/TLDListener.html - -TLDListeners_Properties=/struts_pro/TLDListener.html -TLDListeners_Properties.WindowTitle=Properties TLDListeners_Properties.Title=TLD Listeners TLDListeners_CreateListener.WindowTitle=Add Listener @@ -279,55 +186,36 @@ ##### TLD Taglib element ##### -TLDTaglib=/model/noHelpYet.html - -TLDTaglib_Properties=/model/noHelpYet.html -TLDTaglib_Properties.WindowTitle=Properties TLDTaglib_Properties.Title=TLD Taglib -TLDTaglib_CreateTag=/model/noHelpYet.html TLDTaglib_CreateTag.WindowTitle=Add Tag TLDTaglib_CreateTag.Title=TLD Tag ##### TLD Function ##### -TLDFunction=/model/noHelpYet.html - -TLDFunction_Properties=/struts_pro/TLDAttribute_Properties.html -TLDFunction_Properties.WindowTitle=Properties TLDFunction_Properties.Title=TLD Function TLDFunctions_CreateFunction=/model/noHelpYet.html TLDFunctions_CreateFunction.WindowTitle=Add Function TLDFunctions_CreateFunction.Title=TLD Function -TLDFunctions_Properties=/struts_pro/TLDAttribute_Properties.html -TLDFunctions_Properties.WindowTitle=Properties TLDFunctions_Properties.Title=TLD Function List ##### File web.xml ##### -FileWebApp=/struts_pro/FileWebApp.html - -FileWebApp_Properties=/struts_pro/FileWebApp_Properties.html -FileWebApp_Properties.WindowTitle=Properties FileWebApp_Properties.Title=File Web Descriptor FileWebApp.editorTitle=Web XML Editor -FileWebApp24_Properties=/struts_pro/FileWebApp_Properties.html -FileWebApp24_Properties.WindowTitle=Properties FileWebApp24_Properties.Title=File Web Descriptor FileWebApp24.editorTitle=Web XML Editor FileWebApp25.editorTitle=Web XML Editor -FileWebApp25_Properties.WindowTitle=Properties FileWebApp25_Properties.Title=File Web Descriptor WebAppFolderContextParams_CreateContextParam.WindowTitle=Add Context Param WebAppFolderContextParams_CreateContextParam.Title=Web Context Param -WebAppFolderContextParams_Properties.WindowTitle=Properties WebAppFolderContextParams_Properties.Title=Context Params WebAppFolderServlets_CreateServlet=/struts_pro/FileWebApp_CreateServlet.html @@ -338,7 +226,6 @@ WebAppFolderServlets_CreateServletMapping.WindowTitle=Add Servlet Mapping WebAppFolderServlets_CreateServletMapping.Title=Web Servlet Mapping -WebAppFolderServlets_Properties.WindowTitle=Properties WebAppFolderServlets_Properties.Title=Servlets FileWebApp_CreateSessionConfig.WindowTitle=Add Session Config @@ -347,7 +234,6 @@ WebAppFolderMimeMappings_CreateMimeMapping.WindowTitle=Add Mime Mapping WebAppFolderMimeMappings_CreateMimeMapping.Title=Web Mime Mapping -WebAppFolderMimeMappings_Properties.WindowTitle=Properties WebAppFolderMimeMappings_Properties.Title=Mime Mappings WebAppFolderErrorPages_CreateErrorPage.WindowTitle=Add Error Page @@ -355,7 +241,6 @@ WebAppFolderErrorPages_CreateErrorPage_0.WindowTitle=Add Error Page WebAppFolderErrorPages_CreateErrorPage_0.Title=Web Error Page -WebAppFolderErrorPages_Properties.WindowTitle=Properties WebAppFolderErrorPages_Properties.Title=Error Pages FileWebApp_CreateTaglib.WindowTitle=Add Taglib @@ -373,13 +258,11 @@ WebAppFolderResources_CreateResourceEnvRef.WindowTitle=Add Resource Env Reference WebAppFolderResources_CreateResourceEnvRef.Title=Web Resource Env Reference -WebAppFolderResources_Properties.WindowTitle=Properties WebAppFolderResources_Properties.Title=Resources WebAppFolderSecurityConstraints_CreateSecurityConstraint.WindowTitle=Add Security Constraint WebAppFolderSecurityConstraints_CreateSecurityConstraint.Title=Web Security Constraint -WebAppFolderSecurityConstraints_Properties.WindowTitle=Properties WebAppFolderSecurityConstraints_Properties.Title=Security Constraints FileWebApp_CreateLoginConfig.WindowTitle=Add Login Config @@ -388,13 +271,11 @@ WebAppFolderSecurityRoles_CreateSecurityRole.WindowTitle=Add Security Role WebAppFolderSecurityRoles_CreateSecurityRole.Title=Web Security Role -WebAppFolderSecurityRoles_Properties.WindowTitle=Properties WebAppFolderSecurityRoles_Properties.Title=Security Roles WebAppFolderEnvEntries_CreateEnvEntry.WindowTitle=Add Env Entry WebAppFolderEnvEntries_CreateEnvEntry.Title=Web Env Entry -WebAppFolderEnvEntries_Properties.WindowTitle=Properties WebAppFolderEnvEntries_Properties.Title=Env Entries WebAppFolderEJB_CreateEjbRef.WindowTitle=Add EJB Ref @@ -403,7 +284,6 @@ WebAppFolderEJB_CreateEjbLocalRef.WindowTitle=Add EJB Local Ref WebAppFolderEJB_CreateEjbLocalRef.Title=Web EJB Local Ref -WebAppFolderEJB_Properties.WindowTitle=Properties WebAppFolderEJB_Properties.Title=EJB WebAppFolderFilters_CreateFilter.WindowTitle=Add Filter @@ -411,9 +291,7 @@ WebAppFolderFilters24_CreateFilter.WindowTitle=Add Filter WebAppFolderFilters24_CreateFilter.Title=Filter -WebAppFolderFilters_Properties.WindowTitle=Properties WebAppFolderFilters_Properties.Title=Filters -WebAppFolderFilters24_Properties.WindowTitle=Properties WebAppFolderFilters24_Properties.Title=Filters WebAppFolderFilters_CreateFilterMapping.WindowTitle=Add Filter Mapping @@ -421,9 +299,7 @@ WebAppFolderFilters24_CreateFilterMapping.WindowTitle=Add Filter Mapping WebAppFolderFilters24_CreateFilterMapping.Title=Filter Mapping -WebAppFolderListeners_Properties.WindowTitle=Properties WebAppFolderListeners_Properties.Title=Web Listeners -WebAppFolderListeners24_Properties.WindowTitle=Properties WebAppFolderListeners24_Properties.Title=Web Listeners WebAppFolderListeners_CreateListener.WindowTitle=Add Listener @@ -435,7 +311,6 @@ WebAppFolderServices_CreateServiceRef.WindowTitle=Add Service Ref WebAppFolderServices_CreateServiceRef.Title=Service Ref -WebAppFolderServices_Properties.WindowTitle=Properties WebAppFolderServices_Properties.Title=Services WebAppFolderMessageDestinations_CreateServiceMessageDestinationRef.WindowTitle=Add Service Message Destination Ref @@ -444,123 +319,64 @@ WebAppFolderMessageDestinations_CreateServiceMessageDestination.WindowTitle=Add Service Message Destination WebAppFolderMessageDestinations_CreateServiceMessageDestination.Title=Service Message Destination -WebAppFolderMessageDestinations_Properties.WindowTitle=Properties WebAppFolderMessageDestinations_Properties.Title=Message Destinations ##### web auth-constraint element ##### -WebAppAuthConstraint=/struts_pro/WebAppAuthConstraint.html - -WebAppAuthConstraint_Properties=/struts_pro/WebAppAuthConstraint_Properties.html -WebAppAuthConstraint_Properties.WindowTitle=Properties WebAppAuthConstraint_Properties.Title=Web Auth Constraint -WebAppAuthConstraint_CreateRole=/struts_pro/WebAppAuthConstraint_CreateRole.html WebAppAuthConstraint_CreateRole.WindowTitle=Add Role WebAppAuthConstraint_CreateRole.Title=Web Role ##### web context-param element ##### -WebAppContextParam=/struts_pro/WebAppContextParam.html - -WebAppContextParam_Properties=/struts_pro/WebAppContextParam.html -WebAppContextParam_Properties.WindowTitle=Properties WebAppContextParam_Properties.Title=Web Context Param ##### web ejb-ref element ##### -WebAppEjbRef=/struts_pro/WebAppEjbRef.html - -WebAppEjbRef_Properties=/struts_pro/WebAppEjbRef.html -WebAppEjbRef_Properties.WindowTitle=Properties WebAppEjbRef_Properties.Title=Web Ejb Ref ##### web ejb-local-ref element ##### -WebAppEjbRef=/struts_pro/WebAppEjbLocalRef.html - -WebAppEjbLocalRef_Properties=/struts_pro/WebAppEjbRef.html -WebAppEjbLocalRef_Properties.WindowTitle=Properties WebAppEjbLocalRef_Properties.Title=Web Ejb Local Ref ##### web env-entry element ##### -WebAppEnvEntry=/struts_pro/WebAppEnvEntry.html - -WebAppEnvEntry_Properties=/struts_pro/WebAppEnvEntry.html -WebAppEnvEntry_Properties.WindowTitle=Properties WebAppEnvEntry_Properties.Title=Web Env Entry ##### web error-page element ##### -WebAppErrorPage=/struts_pro/WebAppErrorPage.html - -WebAppErrorPage_Properties=/struts_pro/WebAppErrorPage.html -WebAppErrorPage_Properties.WindowTitle=Properties WebAppErrorPage_Properties.Title=Web Error Page ##### web init-param element ##### -WebAppInitParam=/struts_pro/WebAppInitParam.html - -WebAppInitParam_Properties=/struts_pro/WebAppInitParam.html -WebAppInitParam_Properties.WindowTitle=Properties WebAppInitParam_Properties.Title=Web Init Param - ##### web login-config element ##### -WebAppLoginConfig=/struts_pro/WebAppLoginConfig.html - -WebAppLoginConfig_Properties=/struts_pro/WebAppLoginConfig.html -WebAppLoginConfig_Properties.WindowTitle=Properties WebAppLoginConfig_Properties.Title=Web Login Config ##### web mime-mapping element ##### -WebAppMimeMapping=/struts_pro/WebAppMimeMapping.html - -WebAppMimeMapping_Properties.WindowTitle=Properties -WebAppMimeMapping_Properties=/struts_pro/WebAppMimeMapping.html WebAppMimeMapping_Properties.Title=Web Mime Mapping ##### web resource-collection element ##### -WebAppResourceCollection=/struts_pro/WebAppResourceCollection.html - -WebAppResourceCollection_Properties=/struts_pro/WebAppResourceCollection.html -WebAppResourceCollection_Properties.WindowTitle=Properties WebAppResourceCollection_Properties.Title=Web Resource Collection ##### web resource-ref element ##### -WebAppResourceRef=/struts_pro/WebAppResourceRef.html - -WebAppResourceRef_Properties=/struts_pro/WebAppResourceRef.html -WebAppResourceRef_Properties.WindowTitle=Properties WebAppResourceRef_Properties.Title=Web Resource Ref ##### web resource-env-ref element ##### -WebAppResourceEnvRef=/struts_pro/WebAppResourceEnvRef.html - -WebAppResourceEnvRef_Properties=/struts_pro/WebAppResourceEnvRef.html -WebAppResourceEnvRef_Properties.WindowTitle=Properties WebAppResourceEnvRef_Properties.Title=Web Resource Env Ref ##### web run-as element ##### -WebAppRunAs=/struts_pro/WebAppRunAs.html - -WebAppRunAs_Properties=/struts_pro/WebAppRunAs.html -WebAppRunAs_Properties.WindowTitle=Properties WebAppRunAs_Properties.Title=Run As ##### web security-constraint element ##### -WebAppSecurityConstraint=/struts_pro/WebAppSecurityConstraint.html - -WebAppSecurityConstraint_Properties=/struts_pro/WebAppSecurityConstraint_Properties.html -WebAppSecurityConstraint_Properties.WindowTitle=Properties WebAppSecurityConstraint_Properties.Title=Web Security Constraint WebAppSecurityConstraint_CreateResourceCollection=/struts_pro/WebAppSecurityConstraint_CreateResourceCollection.html @@ -577,26 +393,14 @@ ##### web security-role element ##### -WebAppSecurityRole=/struts_pro/WebAppSecurityRole.html - -WebAppSecurityRole_Properties=/struts_pro/WebAppSecurityRole.html -WebAppSecurityRole_Properties.WindowTitle=Properties WebAppSecurityRole_Properties.Title=Web Security Role ##### web security-role-ref element ##### -WebAppSecurityRoleRef=/struts_pro/WebAppSecurityRoleRef.html - -WebAppSecurityRoleRef_Properties=/struts_pro/WebAppSecurityRoleRef.html -WebAppSecurityRoleRef_Properties.WindowTitle=Properties WebAppSecurityRoleRef_Properties.Title=Web Security Role Ref ##### web servlet element ##### -WebAppServlet=/struts_pro/WebAppServlet.html - -WebAppServlet_Properties=/struts_pro/WebAppServlet.html -WebAppServlet_Properties.WindowTitle=Properties WebAppServlet_Properties.Title=Web Servlet WebAppServlet_CreateInitParam.WindowTitle=Add Init Param @@ -610,153 +414,86 @@ ##### web servlet-mapping element ##### -WebAppServletMapping=/struts_pro/WebAppServletMapping.html - -WebAppServletMapping_Properties=/struts_pro/WebAppServletMapping.html -WebAppServletMapping_Properties.WindowTitle=Properties WebAppServletMapping_Properties.Title=Web Servlet Mapping ##### web session-config element ##### -WebAppSessionConfig=/struts_pro/WebAppSessionConfig.html - -WebAppSessionConfig_Properties=/struts_pro/WebAppSessionConfig.html -WebAppSessionConfig_Properties.WindowTitle=Properties WebAppSessionConfig_Properties.Title=Web Session Config ##### web taglib element ##### -WebAppTaglib=/struts_pro/WebAppTaglib.html - -WebAppTaglib_Properties=/struts_pro/WebAppTaglib.html -WebAppTaglib_Properties.WindowTitle=Properties WebAppTaglib_Properties.Title=Web taglib ##### web user-constraint element ##### -WebAppUserConstraint=/struts_pro/WebAppUserConstraint.html - -WebAppUserConstraint_Properties=/struts_pro/WebAppUserConstraint.html -WebAppUserConstraint_Properties.WindowTitle=Properties WebAppUserConstraint_Properties.Title=Web User Constraint ##### web welcome-file element ##### -WebAppWelcomFile=/struts_pro/WebAppWelcomFile.html - -WebAppWelcomFile_Properties=/struts_pro/WebAppWelcomFile.html -WebAppWelcomFile_Properties.WindowTitle=Properties WebAppWelcomFile_Properties.Title=Web Welcome File ##### web welcome-file-list element ##### -WebAppWelcomFileList=/struts_pro/WebAppWelcomFileList.html - -WebAppWelcomFileList_Properties=/model/noHelpYet.html -WebAppWelcomFileList_Properties.WindowTitle=Properties WebAppWelcomFileList_Properties.Title=Web Welcom File List -WebAppWelcomFileList_CreateWelcomFile=/struts_pro/WebAppWelcomFileList_CreateWelcomFile.html WebAppWelcomFileList_CreateWelcomFile.WindowTitle=Add Welcome File WebAppWelcomFileList_CreateWelcomFile.Title=Web Welcome File ##### web role element ##### -WebAppRoleName=/struts_pro/WebAppRoleName.html - -WebAppRoleName_Properties=/struts_pro/WebAppRoleName.html -WebAppRoleName_Properties.WindowTitle=Properties WebAppRoleName_Properties.Title=Web Role ##### Create File web.xml ##### -FileFolder_CreateWebApp=/struts_pro/FileFolder_CreateWebApp.html FileFolder_CreateWebApp.WindowTitle=New Web Descriptor File FileFolder_CreateWebApp.Title=Web Descriptor File -FileFolder_CreateWebApp_0=/struts_pro/FileFolder_CreateWebApp.html FileFolder_CreateWebApp_0.WindowTitle=New Web Descriptor File FileFolder_CreateWebApp_0.Title=Web Descriptor File -FileSystemFolder_CreateWebApp=/struts_pro/FileFolder_CreateWebApp.html FileSystemFolder_CreateWebApp.WindowTitle=New Web Descriptor File FileSystemFolder_CreateWebApp.Title=Web Descriptor File FileSystemFolder_CreateWebApp_0=/struts_pro/FileFolder_CreateWebApp.html FileSystemFolder_CreateWebApp_0.WindowTitle=New Web Descriptor File FileSystemFolder_CreateWebApp_0.Title=Web Descriptor File -FileFolder_CreateWebApp24=/struts_pro/FileFolder_CreateWebApp.html FileFolder_CreateWebApp24.WindowTitle=New Web Descriptor File FileFolder_CreateWebApp24.Title=Web 2.4 Descriptor File -FileFolder_CreateWebApp24_0=/struts_pro/FileFolder_CreateWebApp.html FileFolder_CreateWebApp24_0.WindowTitle=New Web Descriptor File FileFolder_CreateWebApp24_0.Title=Web 2.4 Descriptor File -FileSystemFolder_CreateWebApp24=/struts_pro/FileFolder_CreateWebApp.html FileSystemFolder_CreateWebApp24.WindowTitle=New Web Descriptor File FileSystemFolder_CreateWebApp24.Title=Web 2.4 Descriptor File -FileSystemFolder_CreateWebApp24_0=/struts_pro/FileFolder_CreateWebApp.html FileSystemFolder_CreateWebApp24_0.WindowTitle=New Web Descriptor File FileSystemFolder_CreateWebApp24_0.Title=Web 2.4 Descriptor File ##### web filter ##### -WebAppFilter=/struts/noHelpYet.html - -WebAppFilter_Properties=/struts/noHelpYet.html -WebAppFilter_CreateInitParam=/struts/noHelpYet.html -WebAppFilter_Properties.WindowTitle=Properties WebAppFilter_Properties.Title=Web Filter ##### web filter mapping ##### -WebAppFilterMapping=/struts/noHelpYet.html - -WebAppFilterMapping_Properties=/struts/noHelpYet.html -WebAppFilterMapping_CreateInitParam=/struts/noHelpYet.html -WebAppFilterMapping_Properties.WindowTitle=Properties WebAppFilterMapping_Properties.Title=Web Filter Mapping -WebAppFilterMapping24_Properties.WindowTitle=Properties WebAppFilterMapping24_Properties.Title=Web Filter Mapping ##### web listener ##### -WebAppListener=/struts/noHelpYet.html -WebAppListener_Properties=/struts/noHelpYet.html -WebAppListener_Properties.WindowTitle=Properties WebAppListener_Properties.Title=Web Listener -WebAppListener24_Properties.WindowTitle=Properties WebAppListener24_Properties.Title=Web Listener ##### jsp config ##### -WebAppJspConfig=/struts/noHelpYet.html -WebAppJspConfig_Properties=/struts/noHelpYet.html -WebAppJspConfig_Properties.WindowTitle=Properties WebAppJspConfig_Properties.Title=JSP Config -WebAppFolderTaglibs_Properties.WindowTitle=Properties WebAppFolderTaglibs_Properties.Title=JSP Config ##### jsp property group ##### -WebAppJSPPropertyGroup_Properties=/struts/noHelpYet.html -WebAppJSPPropertyGroup_Properties.WindowTitle=Properties WebAppJSPPropertyGroup_Properties.Title=JSP Property Group ##### service ref ##### -WebAppServiceRef=/struts/noHelpYet.html -WebAppServiceRef_Properties=/struts/noHelpYet.html -WebAppServiceRef_Properties.WindowTitle=Properties WebAppServiceRef_Properties.Title=Service Ref ##### message destination ##### -WebAppMessageDestination=/struts/noHelpYet.html -WebAppMessageDestination_Properties=/struts/noHelpYet.html -WebAppMessageDestination_Properti -es.WindowTitle=Properties WebAppMessageDestination_Properties.Title=Message Destination ##### message destination reference ##### -WebAppMessageDestinationRef=/struts/noHelpYet.html -WebAppMessageDestinationRef_Properties=/struts/noHelpYet.html -WebAppMessageDestinationRef_Properties.WindowTitle=Properties WebAppMessageDestinationRef_Properties.Title=Message Destination Reference @@ -775,10 +512,8 @@ WebAppLocaleEncodingMappingList_CreateLocaleEncodingMapping.WindowTitle=Add Locale Encoding Mapping WebAppLocaleEncodingMappingList_CreateLocaleEncodingMapping.Title=Locale Encoding Mapping -WebAppLocaleEncodingMappingList_Properties.WindowTitle=Properties WebAppLocaleEncodingMappingList_Properties.Title=Encoding Mappings -WebAppLocaleEncodingMapping_Properties.WindowTitle=Properties WebAppLocaleEncodingMapping_Properties.Title=Encoding Mapping OptionRoot_CreatePageTemplate_0.WindowTitle=Add Page Template

17 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r8564 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/help.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-06-05 05:15:33 -0400 (Thu, 05 Jun 2008) New Revision: 8564 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties Log: Dialog title 'Properties' is made common so that not to keep a lot of ..._Properties.WindowTitle constants in *.properties files. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2008-06-05 09:13:17 UTC (rev 8563) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2008-06-05 09:15:33 UTC (rev 8564) @@ -1,164 +1,124 @@ FileSystems_RegisterInServerXML_jsf=/jsf/noHelpYet.html -FacesConfig=/jsf/noHelpYet.html - -FacesConfig_Rename=/jsf/noHelpYet.html FacesConfig_Rename.WindowTitle=Rename FacesConfig_Rename.Title=Faces Config FacesConfig_Rename.Message=Enter new name -FacesConfig_WithId=/jsf/noHelpYet.html FacesConfig_WithId.WindowTitle=Add Converter FacesConfig_WithId.Title=Converter FacesConfig_WithId.Message= -FacesConfig_ForClass=/jsf/noHelpYet.html FacesConfig_ForClass.WindowTitle=Add Converter FacesConfig_ForClass.Title=Converter FacesConfig_ForClass.Message= -FacesConfig_AddRule=/jsf/noHelpYet.html FacesConfig_AddRule.WindowTitle=Add Rule FacesConfig_AddRule.Title=Navigation Rule FacesConfig_AddRule.Message= -FacesConfig_AddComponent=/jsf/noHelpYet.html FacesConfig_AddComponent.WindowTitle=Add Component FacesConfig_AddComponent.Title=Component FacesConfig_AddComponent.Message= -FacesConfig_AddManagedBean=/jsf/noHelpYet.html FacesConfig_AddManagedBean.WindowTitle=Add Managed Bean FacesConfig_AddManagedBean.Title=Managed Bean FacesConfig_AddManagedBean.Message= -FacesConfig_AddReferencedBean=/jsf/noHelpYet.html FacesConfig_AddReferencedBean.WindowTitle=Add Referenced Bean FacesConfig_AddReferencedBean.Title=Referenced Bean FacesConfig_AddReferencedBean.Message= -FacesConfig_AddRenderKit=/jsf/noHelpYet.html FacesConfig_AddRenderKit.WindowTitle=Add Render Kit FacesConfig_AddRenderKit.Title=Render Kit FacesConfig_AddRenderKit.Message= -FacesConfig_AddValidator=/jsf/noHelpYet.html FacesConfig_AddValidator.WindowTitle=Add Validator FacesConfig_AddValidator.Title=Validator FacesConfig_AddValidator.Message= -FacesConfig_Properties=/jsf/noHelpYet.html -FacesConfig_Properties.WindowTitle=Properties FacesConfig_Properties.Title=Faces Config 1.0 - FacesConfig11=/jsf/noHelpYet.html -FacesConfig11_Rename=/jsf/noHelpYet.html FacesConfig11_Rename.WindowTitle=Rename FacesConfig11_Rename.Title=Faces Config FacesConfig11_Rename.Message=Enter new name -FacesConfig11_WithId=/jsf/noHelpYet.html FacesConfig11_WithId.WindowTitle=Add Converter FacesConfig11_WithId.Title=Converter FacesConfig11_WithId.Message= -FacesConfig11_ForClass=/jsf/noHelpYet.html FacesConfig11_ForClass.WindowTitle=Add Converter FacesConfig11_ForClass.Title=Converter FacesConfig11_ForClass.Message= -FacesConfig11_AddRule=/jsf/noHelpYet.html FacesConfig11_AddRule.WindowTitle=Add Rule FacesConfig11_AddRule.Title=Navigation Rule FacesConfig11_AddRule.Message= -FacesConfig11_AddComponent=/jsf/noHelpYet.html FacesConfig11_AddComponent.WindowTitle=Add Component FacesConfig11_AddComponent.Title=Component FacesConfig11_AddComponent.Message= -FacesConfig11_AddManagedBean=/jsf/noHelpYet.html FacesConfig11_AddManagedBean.WindowTitle=Add Managed Bean FacesConfig11_AddManagedBean.Title=Managed Bean FacesConfig11_AddManagedBean.Message= -FacesConfig11_AddReferencedBean=/jsf/noHelpYet.html FacesConfig11_AddReferencedBean.WindowTitle=Add Referenced Bean FacesConfig11_AddReferencedBean.Title=Referenced Bean FacesConfig11_AddReferencedBean.Message= -FacesConfig11_AddRenderKit=/jsf/noHelpYet.html FacesConfig11_AddRenderKit.WindowTitle=Add Render Kit FacesConfig11_AddRenderKit.Title=Render Kit FacesConfig11_AddRenderKit.Message= -FacesConfig11_AddValidator=/jsf/noHelpYet.html FacesConfig11_AddValidator.WindowTitle=Add Validator FacesConfig11_AddValidator.Title=Validator FacesConfig11_AddValidator.Message= -FacesConfig11_Properties=/jsf/noHelpYet.html -FacesConfig11_Properties.WindowTitle=Properties FacesConfig11_Properties.Title=Faces Config 1.1 - -FacesConfig12=/jsf/noHelpYet.html - -FacesConfig12_Rename=/jsf/noHelpYet.html FacesConfig12_Rename.WindowTitle=Rename FacesConfig12_Rename.Title=Faces Config FacesConfig12_Rename.Message=Enter new name -FacesConfig12_WithId=/jsf/noHelpYet.html FacesConfig12_WithId.WindowTitle=Add Converter FacesConfig12_WithId.Title=Converter FacesConfig12_WithId.Message= -FacesConfig12_ForClass=/jsf/noHelpYet.html FacesConfig12_ForClass.WindowTitle=Add Converter FacesConfig12_ForClass.Title=Converter FacesConfig12_ForClass.Message= -FacesConfig12_AddRule=/jsf/noHelpYet.html FacesConfig12_AddRule.WindowTitle=Add Rule FacesConfig12_AddRule.Title=Navigation Rule FacesConfig12_AddRule.Message= -FacesConfig12_AddComponent=/jsf/noHelpYet.html FacesConfig12_AddComponent.WindowTitle=Add Component FacesConfig12_AddComponent.Title=Component FacesConfig12_AddComponent.Message= -FacesConfig12_AddManagedBean=/jsf/noHelpYet.html FacesConfig12_AddManagedBean.WindowTitle=Add Managed Bean FacesConfig12_AddManagedBean.Title=Managed Bean FacesConfig12_AddManagedBean.Message= -FacesConfig12_AddReferencedBean=/jsf/noHelpYet.html FacesConfig12_AddReferencedBean.WindowTitle=Add Referenced Bean FacesConfig12_AddReferencedBean.Title=Referenced Bean FacesConfig12_AddReferencedBean.Message= -FacesConfig12_AddRenderKit=/jsf/noHelpYet.html FacesConfig12_AddRenderKit.WindowTitle=Add Render Kit FacesConfig12_AddRenderKit.Title=Render Kit FacesConfig12_AddRenderKit.Message= -FacesConfig12_AddValidator=/jsf/noHelpYet.html FacesConfig12_AddValidator.WindowTitle=Add Validator FacesConfig12_AddValidator.Title=Validator FacesConfig12_AddValidator.Message= -FacesConfig12_Properties=/jsf/noHelpYet.html -FacesConfig12_Properties.WindowTitle=Properties FacesConfig12_Properties.Title=Faces Config 1.2 JSFValidators12_AddValidator.WindowTitle=Add Validator JSFValidators12_AddValidator.Title=Validator -JSFValidators12_Properties.WindowTitle=Properties JSFValidators12_Properties.Title=Validators JSFValidator12_CreateAttribute.WindowTitle=Add Attribute @@ -167,7 +127,6 @@ JSFValidator12_CreateProperty.WindowTitle=Add Property JSFValidator12_CreateProperty.Title=Property -JSFValidator12_Properties.WindowTitle=Properties JSFValidator12_Properties.Title=Validator JSFApplication=/jsf/noHelpYet.html @@ -193,7 +152,6 @@ JSFApplication_Edit.Message= JSFApplication_Properties=/jsf/noHelpYet.html -JSFApplication_Properties.WindowTitle=Properties JSFApplication_Properties.Title=Application @@ -230,14 +188,12 @@ JSFApplication12_Edit.Message= JSFApplication12_Properties=/jsf/noHelpYet.html -JSFApplication12_Properties.WindowTitle=Properties JSFApplication12_Properties.Title=Application JSFAttribute=/jsf/noHelpYet.html JSFAttribute_Properties=/jsf/noHelpYet.html -JSFAttribute_Properties.WindowTitle=Properties JSFAttribute_Properties.Title=Attribute @@ -254,7 +210,6 @@ JSFComponent_CreateProperty.Message= JSFComponent_Properties=/jsf/noHelpYet.html -JSFComponent_Properties.WindowTitle=Properties JSFComponent_Properties.Title=Component JSFComponent11=/jsf/noHelpYet.html @@ -274,8 +229,6 @@ JSFComponent11_CreateProperty.Title=Property JSFComponent11_CreateProperty.Message= -JSFComponent11_Properties=/jsf/noHelpYet.html -JSFComponent11_Properties.WindowTitle=Properties JSFComponent11_Properties.Title=Component @@ -286,119 +239,75 @@ JSFComponents_AddComponent.Title=Component JSFComponents_AddComponent.Message= -JSFComponents_Properties=/jsf/noHelpYet.html -JSFComponents_Properties.WindowTitle=Properties JSFComponents_Properties.Title=Components -JSFComponents11=/jsf/noHelpYet.html - -JSFComponents11_AddComponent=/jsf/noHelpYet.html JSFComponents11_AddComponent.WindowTitle=Add Component JSFComponents11_AddComponent.Title=Component JSFComponents11_AddComponent.Message= -JSFComponents11_Properties=/jsf/noHelpYet.html -JSFComponents11_Properties.WindowTitle=Properties JSFComponents11_Properties.Title=Components -JSFConverter=/jsf/noHelpYet.html - -JSFConverter_CreateAttribute=/jsf/noHelpYet.html JSFConverter_CreateAttribute.WindowTitle=Add Attribute JSFConverter_CreateAttribute.Title=Attribute JSFConverter_CreateAttribute.Message= -JSFConverter_CreateProperty=/jsf/noHelpYet.html JSFConverter_CreateProperty.WindowTitle=Add Property JSFConverter_CreateProperty.Title=Property JSFConverter_CreateProperty.Message= -JSFConverter_Properties=/jsf/noHelpYet.html -JSFConverter_Properties.WindowTitle=Properties JSFConverter_Properties.Title=Converter -JSFConverters=/jsf/noHelpYet.html - -JSFConverters_WithId=/jsf/noHelpYet.html JSFConverters_WithId.WindowTitle=Add Converter JSFConverters_WithId.Title=Converter JSFConverters_WithId.Message= -JSFConverters_ForClass=/jsf/noHelpYet.html JSFConverters_ForClass.WindowTitle=Add Converter JSFConverters_ForClass.Title=Converter JSFConverters_ForClass.Message= -JSFConverters_Properties=/jsf/noHelpYet.html -JSFConverters_Properties.WindowTitle=Properties JSFConverters_Properties.Title=Converters -JSFFactory=/jsf/noHelpYet.html - -JSFFactory_Edit=/jsf/noHelpYet.html JSFFactory_Edit.WindowTitle=Edit JSFFactory_Edit.Title=Factory JSFFactory_Edit.Message= -JSFFactory_Properties=/jsf/noHelpYet.html -JSFFactory_Properties.WindowTitle=Properties JSFFactory_Properties.Title=Factory -JSFLifecycle=/jsf/noHelpYet.html - -JSFLifecycle_CreatePhaseListener=/jsf/noHelpYet.html JSFLifecycle_CreatePhaseListener.WindowTitle=Add Phase Listener JSFLifecycle_CreatePhaseListener.Title=Phase Listener JSFLifecycle_CreatePhaseListener.Message= -JSFLifecycle_Properties=/jsf/noHelpYet.html -JSFLifecycle_Properties.WindowTitle=Properties JSFLifecycle_Properties.Title=Lifecycle -JSFListEntries=/jsf/noHelpYet.html - -JSFListEntries_AddEntry_0=/jsf/noHelpYet.html JSFListEntries_AddEntry_0.WindowTitle=New Entry JSFListEntries_AddEntry_0.Title=List Entry JSFListEntries_AddEntry_0.Message= -JSFListEntry=/jsf/noHelpYet.html - -JSFListEntry_Properties_0=/jsf/noHelpYet.html JSFListEntry_Properties_0.WindowTitle=Properties JSFListEntry_Properties_0.Title=List Entry JSFListEntry_Properties_0.Message= -JSFLocaleConfig=/jsf/noHelpYet.html - -JSFLocaleConfig_AddSupportedLocale=/jsf/noHelpYet.html JSFLocaleConfig_AddSupportedLocale.WindowTitle=Add Supported Locale JSFLocaleConfig_AddSupportedLocale.Title=Supported Locale JSFLocaleConfig_AddSupportedLocale.Message= -JSFLocaleConfig_Edit=/jsf/noHelpYet.html JSFLocaleConfig_Edit.WindowTitle=Edit JSFLocaleConfig_Edit.Title=Locale Config JSFLocaleConfig_Edit.Message= -JSFLocaleConfig_Properties=/jsf/noHelpYet.html -JSFLocaleConfig_Properties.WindowTitle=Properties JSFLocaleConfig_Properties.Title=Locale Config -JSFManagedBean=/jsf/noHelpYet.html - AddJSFManagedBeanWizard.managed-bean-scope=Scope AddJSFManagedBeanWizard.managed-bean-name=Name AddJSFManagedBeanWizard.managed-bean-class=Class -JSFManagedBean_CreateProperty_0=/jsf/noHelpYet.html JSFManagedBean_CreateProperty_0.WindowTitle=Add Property JSFManagedBean_CreateProperty_0.Title=Property JSFManagedBean_CreateProperty_0.Message= @@ -406,14 +315,9 @@ AddJSFManagedPropertyWizard.value-kind=Value Kind AddJSFManagedPropertyWizard.add_java_property=Add Java property -JSFManagedBean_Properties=/jsf/noHelpYet.html -JSFManagedBean_Properties.WindowTitle=Properties JSFManagedBean_Properties.Title=Managed Bean -JSFManagedBeans=/jsf/noHelpYet.html - -JSFManagedBeans_AddManagedBean_0=/jsf/noHelpYet.html JSFManagedBeans_AddManagedBean_0.WindowTitle=New Managed Bean JSFManagedBeans_AddManagedBean_0.Title=Managed Bean JSFManagedBeans_AddManagedBean_0.Message= @@ -421,388 +325,222 @@ JSFManagedBeans_AddManagedBean_1.Title=Managed Properties JSFManagedBeans_AddManagedBean_1.Message=Select properties you want to add to the managed-bean -JSFManagedBeans_Properties=/jsf/noHelpYet.html -JSFManagedBeans_Properties.WindowTitle=Properties JSFManagedBeans_Properties.Title=Managed Beans -JSFManagedProperty=/jsf/noHelpYet.html - -JSFManagedProperty_AddValue_0=/jsf/noHelpYet.html JSFManagedProperty_AddValue_0.WindowTitle=New Value JSFManagedProperty_AddValue_0.Title=Managed Property JSFManagedProperty_AddValue_0.Message= -JSFManagedProperty_AddListEntry_0=/jsf/noHelpYet.html JSFManagedProperty_AddListEntry_0.WindowTitle=New List Entry JSFManagedProperty_AddListEntry_0.Title=Managed Property JSFManagedProperty_AddListEntry_0.Message= -JSFManagedProperty_AddMapEntry_0=/jsf/noHelpYet.html JSFManagedProperty_AddMapEntry_0.WindowTitle=New Map Entry JSFManagedProperty_AddMapEntry_0.Title=Managed Property JSFManagedProperty_AddMapEntry_0.Message= -JSFManagedProperty_Properties=/jsf/noHelpYet.html -JSFManagedProperty_Properties.WindowTitle=Properties JSFManagedProperty_Properties.Title=Managed Property JSFManagedProperty_ChangeValueKind.Message=Changing the value kind will remove the data your created previously.\nDo you want to proceed? -JSFMapEntries=/jsf/noHelpYet.html - -JSFMapEntries_AddEntry_0=/jsf/noHelpYet.html JSFMapEntries_AddEntry_0.WindowTitle=New Entry JSFMapEntries_AddEntry_0.Title=Map Entry JSFMapEntries_AddEntry_0.Message= -JSFMapEntries_Properties=/jsf/noHelpYet.html - -JSFMapEntry=/jsf/noHelpYet.html - -JSFMapEntry_Properties_0=/jsf/noHelpYet.html JSFMapEntry_Properties_0.WindowTitle=Properties JSFMapEntry_Properties_0.Title=Map Entry JSFMapEntry_Properties_0.Message= -JSFMessageBundle=/jsf/noHelpYet.html - -JSFMessageBundle_Properties=/jsf/noHelpYet.html -JSFMessageBundle_Properties.WindowTitle=Properties JSFMessageBundle_Properties.Title=Message Bundle -JSFResourceBundle=/jsf/noHelpYet.html - -JSFResourceBundle_Properties=/jsf/noHelpYet.html -JSFResourceBundle_Properties.WindowTitle=Properties JSFResourceBundle_Properties.Title=Resource Bundle -JSFELResolver=/jsf/noHelpYet.html - -JSFELResolver_Properties=/jsf/noHelpYet.html -JSFELResolver_Properties.WindowTitle=Properties JSFELResolver_Properties.Title=EL Resolver -JSFPropertyResolver=/jsf/noHelpYet.html - -JSFPropertyResolver_Properties=/jsf/noHelpYet.html -JSFPropertyResolver_Properties.WindowTitle=Properties JSFPropertyResolver_Properties.Title=Property Resolver -JSFVariableResolver=/jsf/noHelpYet.html - -JSFVariableResolver_Properties=/jsf/noHelpYet.html -JSFVariableResolver_Properties.WindowTitle=Properties JSFVariableResolver_Properties.Title=Variable Resolver - -JSFNavigationCase=/jsf/noHelpYet.html - -JSFNavigationCase_Properties=/jsf/noHelpYet.html -JSFNavigationCase_Properties.WindowTitle=Properties JSFNavigationCase_Properties.Title=Navigation Case -JSFNavigationRule=/jsf/noHelpYet.html - -JSFNavigationRule_CreateCase=/jsf/noHelpYet.html JSFNavigationRule_CreateCase.WindowTitle=Add Case JSFNavigationRule_CreateCase.Title=Navigation Case JSFNavigationRule_CreateCase.Message= -JSFNavigationRule_Properties=/jsf/noHelpYet.html -JSFNavigationRule_Properties.WindowTitle=Properties JSFNavigationRule_Properties.Title=Navigation Rule -JSFNavigationRules=/jsf/noHelpYet.html - -JSFNavigationRules_AddRule=/jsf/noHelpYet.html JSFNavigationRules_AddRule.WindowTitle=Add Rule JSFNavigationRules_AddRule.Title=Navigation Rule JSFNavigationRules_AddRule.Message= -JSFNavigationRules_Properties=/jsf/noHelpYet.html -JSFNavigationRules_Properties.WindowTitle=Properties JSFNavigationRules_Properties.Title=Navigation Rules - -JSFPhaseListener=/jsf/noHelpYet.html - -JSFPhaseListener_Properties=/jsf/noHelpYet.html -JSFPhaseListener_Properties.WindowTitle=Properties JSFPhaseListener_Properties.Title=Phase Listener -JSFProcess=/jsf/noHelpYet.html - JSFAddViewWizard.create_file=Create File on Disk -JSFProcess_AddRule_0=/jsf/noHelpYet.html JSFProcess_AddRule_0.WindowTitle=New View JSFProcess_AddRule_0.Title=JSF Process View JSFProcess_AddRule_0.Message= -JSFProcess_CreateComment=/jsf/noHelpYet.html JSFProcess_CreateComment.WindowTitle=Add Comment JSFProcess_CreateComment.Title=View Comment JSFProcess_CreateComment.Message= -JSFProcess_Properties=/jsf/noHelpYet.html -JSFProcess_Properties.WindowTitle=Properties JSFProcess_Properties.Title=JSF Process -JSFProcess_SelectItem=/jsf/jsfconf_diagram_other.html JSFProcess_SelectItem.WindowTitle=Select Element Wizard JSFProcess_SelectItem.Title=Select Element JSFProcess_SelectItem.Message=Please Select Element -JSFProcessComment=/jsf/noHelpYet.html - -JSFProcessComment_Edit=/jsf/noHelpYet.html JSFProcessComment_Edit.WindowTitle=Edit JSFProcessComment_Edit.Title=View Comment JSFProcessComment_Edit.Message= -JSFProcessComment_Properties=/jsf/noHelpYet.html -JSFProcessComment_Properties.WindowTitle=Properties JSFProcessComment_Properties.Title=View Comment -JSFProcessGroup=/jsf/noHelpYet.html - -JSFProcessGroup_CreateCase=/jsf/noHelpYet.html JSFProcessGroup_CreateCase.WindowTitle=Create Case JSFProcessGroup_CreateCase.Title=Navigation Case JSFProcessGroup_CreateCase.Message= -JSFProcessGroup_CreateComment=/jsf/noHelpYet.html JSFProcessGroup_CreateComment.WindowTitle=Add Comment JSFProcessGroup_CreateComment.Title=View Comment JSFProcessGroup_CreateComment.Message= -JSFProcessGroup_Rename_0=/jsf/noHelpYet.html JSFProcessGroup_Rename_0.WindowTitle=Rename JSFProcessGroup_Rename_0.Title=JSF Process View JSFProcessGroup_Rename_0.Message= -JSFProcessGroup_Properties=/jsf/noHelpYet.html -JSFProcessGroup_Properties.WindowTitle=Properties JSFProcessGroup_Properties.Title=View -JSFProcessItem=/jsf/noHelpYet.html - -JSFProcessItem_CreateCase=/jsf/noHelpYet.html JSFProcessItem_CreateCase.WindowTitle=Add Case JSFProcessItem_CreateCase.Title=Navigation Case JSFProcessItem_CreateCase.Message= -JSFProcessItem_Rename_0=/jsf/noHelpYet.html JSFProcessItem_Rename_0.WindowTitle=Rename JSFProcessItem_Rename_0.Title= JSFProcessItem_Rename_0.Message= -JSFProcessItem_Properties=/jsf/noHelpYet.html -JSFProcessItem_Properties.WindowTitle=Properties JSFProcessItem_Properties.Title=Navigation Rule - -JSFProcessItemOutput=/jsf/noHelpYet.html - -JSFProcessItemOutput_Properties=/jsf/noHelpYet.html -JSFProcessItemOutput_Properties.WindowTitle=Properties JSFProcessItemOutput_Properties.Title=Navigation Case -JSFProperty=/jsf/noHelpYet.html - -JSFProperty_Properties=/jsf/noHelpYet.html -JSFProperty_Properties.WindowTitle=Properties JSFProperty_Properties.Title=Property -JSFReferencedBean=/jsf/noHelpYet.html - -JSFReferencedBean_Properties=/jsf/noHelpYet.html -JSFReferencedBean_Properties.WindowTitle=Properties JSFReferencedBean_Properties.Title=Referenced Bean -JSFReferencedBeans=/jsf/noHelpYet.html - -JSFReferencedBeans_AddReferencedBean=/jsf/noHelpYet.html JSFReferencedBeans_AddReferencedBean.WindowTitle=Add Referenced Bean JSFReferencedBeans_AddReferencedBean.Title=Referenced Bean JSFReferencedBeans_AddReferencedBean.Message= -JSFReferencedBeans_Properties=/jsf/noHelpYet.html -JSFReferencedBeans_Properties.WindowTitle=Properties JSFReferencedBeans_Properties.Title=Referenced Beans -JSFRenderKit=/jsf/noHelpYet.html - -JSFRenderKit_CreateRenderer=/jsf/noHelpYet.html JSFRenderKit_CreateRenderer.WindowTitle=Add Renderer JSFRenderKit_CreateRenderer.Title=Renderer JSFRenderKit_CreateRenderer.Message= -JSFRenderKit_Properties=/jsf/noHelpYet.html -JSFRenderKit_Properties.WindowTitle=Properties JSFRenderKit_Properties.Title=Render Kit -JSFRenderKit11=/jsf/noHelpYet.html - -JSFRenderKit11_CreateRenderer=/jsf/noHelpYet.html JSFRenderKit11_CreateRenderer.WindowTitle=Add Renderer JSFRenderKit11_CreateRenderer.Title=Renderer JSFRenderKit11_CreateRenderer.Message= -JSFRenderKit11_Properties=/jsf/noHelpYet.html -JSFRenderKit11_Properties.WindowTitle=Properties JSFRenderKit11_Properties.Title=Render Kit JSFRenderKit12_CreateRenderer.WindowTitle=Add Renderer JSFRenderKit12_CreateRenderer.Title=Renderer -JSFRenderKit12_Properties.WindowTitle=Properties JSFRenderKit12_Properties.Title=Render Kit -JSFRenderKits=/jsf/noHelpYet.html - -JSFRenderKits_AddRenderKit=/jsf/noHelpYet.html JSFRenderKits_AddRenderKit.WindowTitle=Add Render Kit JSFRenderKits_AddRenderKit.Title=Render Kit JSFRenderKits_AddRenderKit.Message= -JSFRenderKits_Properties=/jsf/noHelpYet.html -JSFRenderKits_Properties.WindowTitle=Properties JSFRenderKits_Properties.Title=Render Kits -JSFRenderKits11=/jsf/noHelpYet.html - -JSFRenderKits11_AddRenderKit=/jsf/noHelpYet.html JSFRenderKits11_AddRenderKit.WindowTitle=Add Render Kit JSFRenderKits11_AddRenderKit.Title=Render Kit JSFRenderKits11_AddRenderKit.Message= -JSFRenderKits11_Properties=/jsf/noHelpYet.html -JSFRenderKits11_Properties.WindowTitle=Properties JSFRenderKits11_Properties.Title=Render Kits JSFRenderKits12_AddRenderKit.WindowTitle=Add Render Kit JSFRenderKits12_AddRenderKit.Title=Render Kit -JSFRenderKits12_Properties.WindowTitle=Properties JSFRenderKits12_Properties.Title=Render Kits -JSFRenderer=/jsf/noHelpYet.html - -JSFRenderer_CreateAttribute=/jsf/noHelpYet.html JSFRenderer_CreateAttribute.WindowTitle=Add Attribute JSFRenderer_CreateAttribute.Title=Attribute JSFRenderer_CreateAttribute.Message= -JSFRenderer_CreateSupportedComponentType=/jsf/noHelpYet.html JSFRenderer_CreateSupportedComponentType.WindowTitle=Add Supported Component Type JSFRenderer_CreateSupportedComponentType.Title=Supported Component Type JSFRenderer_CreateSupportedComponentType.Message= -JSFRenderer_CreateSupportedComponentClass=/jsf/noHelpYet.html JSFRenderer_CreateSupportedComponentClass.WindowTitle=Add Supported Component Class JSFRenderer_CreateSupportedComponentClass.Title=Supported Component Class JSFRenderer_CreateSupportedComponentClass.Message= -JSFRenderer_Properties=/jsf/noHelpYet.html -JSFRenderer_Properties.WindowTitle=Properties JSFRenderer_Properties.Title=Renderer -JSFRenderer11=/jsf/noHelpYet.html - -JSFRenderer11_CreateAttribute=/jsf/noHelpYet.html JSFRenderer11_CreateAttribute.WindowTitle=Add Attribute JSFRenderer11_CreateAttribute.Title=Attribute JSFRenderer11_CreateAttribute.Message= -JSFRenderer11_CreateFacet=/jsf/noHelpYet.html JSFRenderer11_CreateFacet.WindowTitle=Add Facet JSFRenderer11_CreateFacet.Title=Facet JSFRenderer11_CreateFacet.Message= -JSFRenderer11_Properties=/jsf/noHelpYet.html -JSFRenderer11_Properties.WindowTitle=Properties JSFRenderer11_Properties.Title=Renderer -JSFSupportedComponentClass=/jsf/noHelpYet.html - -JSFSupportedComponentClass_Properties=/jsf/noHelpYet.html -JSFSupportedComponentClass_Properties.WindowTitle=Properties JSFSupportedComponentClass_Properties.Title=Supported Component Class -JSFSupportedComponentType=/jsf/noHelpYet.html - -JSFSupportedComponentType_Properties=/jsf/noHelpYet.html -JSFSupportedComponentType_Properties.WindowTitle=Properties JSFSupportedComponentType_Properties.Title=Supported Component Type -JSFSupportedLocale=/jsf/noHelpYet.html - -JSFSupportedLocale_Edit=/jsf/noHelpYet.html JSFSupportedLocale_Edit.WindowTitle=Edit JSFSupportedLocale_Edit.Title=Supported Locale JSFSupportedLocale_Edit.Message= -JSFSupportedLocale_Properties=/jsf/noHelpYet.html -JSFSupportedLocale_Properties.WindowTitle=Properties JSFSupportedLocale_Properties.Title=Supported Locale -JSFValidator=/jsf/noHelpYet.html - -JSFValidator_CreateAttribute=/jsf/noHelpYet.html JSFValidator_CreateAttribute.WindowTitle=Add Attribute JSFValidator_CreateAttribute.Title=Attribute JSFValidator_CreateAttribute.Message= -JSFValidator_CreateProperty=/jsf/noHelpYet.html JSFValidator_CreateProperty.WindowTitle=Add Property JSFValidator_CreateProperty.Title=Property JSFValidator_CreateProperty.Message= -JSFValidator_Properties=/jsf/noHelpYet.html -JSFValidator_Properties.WindowTitle=Properties JSFValidator_Properties.Title=Validator -JSFValidators=/jsf/noHelpYet.html - -JSFValidators_AddValidator=/jsf/noHelpYet.html JSFValidators_AddValidator.WindowTitle=Add Validator JSFValidators_AddValidator.Title=Validator JSFValidators_AddValidator.Message= -JSFValidators_Properties=/jsf/noHelpYet.html -JSFValidators_Properties.WindowTitle=Properties JSFValidators_Properties.Title=Validators -JSFFacet11=/jsf/noHelpYet.html - -JSFFacet11_Properties=/jsf/noHelpYet.html -JSFFacet11_Properties.WindowTitle=Properties JSFFacet11_Properties.Title=Facet -WebJSFModule=/jsf/noHelpYet.html - -WebJSFModule_OpenProject=/jsf/noHelpYet.html WebJSFModule_OpenProject.WindowTitle=Open Project WebJSFModule_OpenProject.Title=JSF Project WebJSFModule_OpenProject.Message= @@ -812,17 +550,13 @@ JstWeb_Properties=/jsf/noHelpYet.html -FileFolder_CreateFacesConfig=/jsf/noHelpYet.html FileFolder_CreateFacesConfig.WindowTitle=New Faces Config FileFolder_CreateFacesConfig.Title=Faces Config FileFolder_CreateFacesConfig.Message= -FileFolder_CreateFacesConfig_0=/jsf/noHelpYet.html FileFolder_CreateFacesConfig_0.WindowTitle=New Faces Config FileFolder_CreateFacesConfig_0.Title=Faces Config FileFolder_CreateFacesConfig_0.Message= -FileFolder_Properties=/jsf/noHelpYet.html -FileFolder_Properties.WindowTitle=Properties FileFolder_Properties.Title=Folder FileSystemFolder_CreateFacesConfig_0=/jsf/noHelpYet.html @@ -830,48 +564,23 @@ FileSystemFolder_CreateFacesConfig_0.Title=Faces Config FileSystemFolder_CreateFacesConfig_0.Message= -FileSystemFolder_Properties=/jsf/noHelpYet.html -FileSystemFolder_Properties.WindowTitle=Properties FileSystemFolder_Properties.Title=Folder -FileSystemJar_Properties=/jsf/noHelpYet.html - -JarFolder_Properties=/jsf/noHelpYet.html - - -JSFProjectConfiguration=/jsf/noHelpYet.html - -JSFProjectConfiguration_Properties=/jsf/noHelpYet.html -JSFProjectConfiguration_Properties.WindowTitle=Properties JSFProjectConfiguration_Properties.Title=Configuration -JSFProjectResourceBundles=/jsf/noHelpYet.html - -JSFProjectResourceBundles_Properties=/jsf/noHelpYet.html -JSFProjectResourceBundles_Properties.WindowTitle=Properties JSFProjectResourceBundles_Properties.Title=Resource Bundles -JSFProjectTagLibs=/jsf/noHelpYet.html - -JSFProjectTagLibs_Properties=/jsf/noHelpYet.html -JSFProjectTagLibs_Properties.WindowTitle=Properties JSFProjectTagLibs_Properties.Title=Tag Libraries -JSFProjectTagLibs_CreateFileTLD=/model/noHelpYet.html JSFProjectTagLibs_CreateFileTLD.WindowTitle=New TLD File JSFProjectTagLibs_CreateFileTLD.Title=Tag Library Definition File -JSFProjectTagLibs_CreateFileTLD20=/model/noHelpYet.html JSFProjectTagLibs_CreateFileTLD20.WindowTitle=New TLD File 2.0 JSFProjectTagLibs_CreateFileTLD20.Title=Tag Library Definition File -JSFProjectsRoot=/jsf/noHelpYet.html - -JSFProjectsRoot_Properties=/jsf/noHelpYet.html -JSFProjectsRoot_Properties.WindowTitle=Properties JSFProjectsRoot_Properties.Title=JSF Project SharableJSFEditor.doNotCreateEmptyRule=Do not create a navigation rule for a view that has no navigation case @@ -920,6 +629,4 @@ JSFValidatorExtension_CreateTag.WindowTitle=Add Tag JSFValidatorExtension_CreateTag.Title=Tag - -JSFConfigExtensions_Properties.WindowTitle=Properties JSFConfigExtensions_Properties.Title=Extensions

17 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2008