October 2007 - jbosstools-commits

JBoss Tools SVN: r4039 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: templates and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: ezheleznyakov Date: 2007-10-05 12:31:26 -0400 (Fri, 05 Oct 2007) New Revision: 4039 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java Removed: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItem.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml Log: http://jira.jboss.com/jira/browse/JBIDE-847 Create templates for <rich:panelMenu/>, <rich:panelMenuGroup/> and <rich:panelMenuItem> components. Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java 2007-10-05 16:19:48 UTC (rev 4038) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java 2007-10-05 16:31:26 UTC (rev 4039) @@ -1,17 +0,0 @@ -package org.jboss.tools.jsf.vpe.richfaces.template; - -import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; -import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -public class RichFacesPanelMenu extends VpeAbstractTemplate { - - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - Document visualDocument) { - // TODO Auto-generated method stub - return null; - } - -} Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java 2007-10-05 16:19:48 UTC (rev 4038) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java 2007-10-05 16:31:26 UTC (rev 4039) @@ -1,16 +0,0 @@ -package org.jboss.tools.jsf.vpe.richfaces.template; - -import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; -import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -public class RichFacesPanelMenuGroup extends VpeAbstractTemplate { - - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - Document visualDocument) { - // TODO Auto-generated method stub - return null; - } -} Copied: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java (from rev 4038, trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java) =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2007-10-05 16:31:26 UTC (rev 4039) @@ -0,0 +1,16 @@ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +public class RichFacesPanelMenuGroupTemplate extends VpeAbstractTemplate { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + Document visualDocument) { + // TODO Auto-generated method stub + return null; + } +} Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItem.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItem.java 2007-10-05 16:19:48 UTC (rev 4038) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItem.java 2007-10-05 16:31:26 UTC (rev 4039) @@ -1,16 +0,0 @@ -package org.jboss.tools.jsf.vpe.richfaces.template; - -import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; -import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - -public class RichFacesPanelMenuItem extends VpeAbstractTemplate { - - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, - Document visualDocument) { - // TODO Auto-generated method stub - return null; - } -} Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2007-10-05 16:31:26 UTC (rev 4039) @@ -0,0 +1,16 @@ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +public class RichFacesPanelMenuItemTemplate extends VpeAbstractTemplate { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + Document visualDocument) { + // TODO Auto-generated method stub + return null; + } +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Copied: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java (from rev 4038, trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java) =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuTemplate.java 2007-10-05 16:31:26 UTC (rev 4039) @@ -0,0 +1,17 @@ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +public class RichFacesPanelMenuTemplate extends VpeAbstractTemplate { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + Document visualDocument) { + // TODO Auto-generated method stub + return null; + } + +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2007-10-05 16:19:48 UTC (rev 4038) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2007-10-05 16:31:26 UTC (rev 4039) @@ -628,4 +628,25 @@ </vpe:template> </vpe:tag> + <vpe:tag name="rich:panelMenuItem" case-sensitive="yes"> + <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPanelMenuItemTemplate"> + <vpe:drag start-enable="yes"/> + <vpe:drop container="yes"/> + </vpe:template> + </vpe:tag> + + <vpe:tag name="rich:panelMenuGroup " case-sensitive="yes"> + <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPanelMenuGroupTemplate"> + <vpe:drag start-enable="yes"/> + <vpe:drop container="yes"/> + </vpe:template> + </vpe:tag> + + <vpe:tag name="rich:panelMenu " case-sensitive="yes"> + <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPanelMenuTemplate"> + <vpe:drag start-enable="yes"/> + <vpe:drop container="yes"/> + </vpe:template> + </vpe:tag> + </vpe:templates> \ No newline at end of file

17 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r4038 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: resources/panelMenuGroup and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ezheleznyakov Date: 2007-10-05 12:19:48 -0400 (Fri, 05 Oct 2007) New Revision: 4038 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/style.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/style.css trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItem.java Log: http://jira.jboss.com/jira/browse/JBIDE-847 Create templates for <rich:panelMenu/>, <rich:panelMenuGroup/> and <rich:panelMenuItem> components. Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/style.css =================================================================== Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuGroup/style.css ___________________________________________________________________ Name: svn:mime-type + text/css Name: svn:eol-style + native Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/style.css =================================================================== Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/panelMenuItem/style.css ___________________________________________________________________ Name: svn:mime-type + text/css Name: svn:eol-style + native Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java 2007-10-05 16:19:48 UTC (rev 4038) @@ -0,0 +1,17 @@ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +public class RichFacesPanelMenu extends VpeAbstractTemplate { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + Document visualDocument) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenu.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java 2007-10-05 16:19:48 UTC (rev 4038) @@ -0,0 +1,16 @@ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +public class RichFacesPanelMenuGroup extends VpeAbstractTemplate { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + Document visualDocument) { + // TODO Auto-generated method stub + return null; + } +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroup.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItem.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItem.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItem.java 2007-10-05 16:19:48 UTC (rev 4038) @@ -0,0 +1,16 @@ +package org.jboss.tools.jsf.vpe.richfaces.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +public class RichFacesPanelMenuItem extends VpeAbstractTemplate { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + Document visualDocument) { + // TODO Auto-generated method stub + return null; + } +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItem.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native

17 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r4037 - trunk/documentation/qa.

by jbosstools-commits＠lists.jboss.org

Author: anis Date: 2007-10-05 12:11:00 -0400 (Fri, 05 Oct 2007) New Revision: 4037 Added: trunk/documentation/qa/RHDSsmoketests.doc Removed: trunk/documentation/qa/RHDS smoke tests.doc Log: Renamed remotely Deleted: trunk/documentation/qa/RHDS smoke tests.doc =================================================================== (Binary files differ) Copied: trunk/documentation/qa/RHDSsmoketests.doc (from rev 4036, trunk/documentation/qa/RHDS smoke tests.doc) =================================================================== (Binary files differ)

17 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r4036 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mdryakhlenkov Date: 2007-10-05 11:16:32 -0400 (Fri, 05 Oct 2007) New Revision: 4036 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/popup/ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenFileActionUtils.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/VisualEditorPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ActionOrmTree.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenActionDelegate.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenMappingActionDelegate.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenSourceActionDelegate.java Log: JBIDE-983: Objects on diagram must have context menu Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/VisualEditorPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/VisualEditorPlugin.java 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/VisualEditorPlugin.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -10,6 +10,10 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.veditor; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.*; import org.eclipse.jface.resource.ImageDescriptor; import org.jboss.tools.hibernate.ui.view.BaseUIPlugin; @@ -42,4 +46,10 @@ public static ImageDescriptor getImageDescriptor(String path) { return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path); } + + public static IWorkbenchPage getPage(){ + IWorkbench workbench = PlatformUI.getWorkbench(); + IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); + return window.getActivePage(); + } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -10,26 +10,43 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.veditor.editors; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.gef.DefaultEditDomain; import org.eclipse.gef.GraphicalViewer; import org.eclipse.gef.dnd.TemplateTransferDropTargetListener; -import org.eclipse.gef.editparts.ScalableFreeformRootEditPart; import org.eclipse.gef.requests.CreationFactory; import org.eclipse.gef.requests.SimpleFactory; +import org.eclipse.gef.ui.actions.ActionRegistry; import org.eclipse.gef.ui.actions.WorkbenchPartAction; import org.eclipse.gef.ui.parts.GraphicalEditor; import org.eclipse.gef.ui.parts.TreeViewer; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.util.TransferDropTargetListener; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.mapping.DependantValue; +import org.hibernate.mapping.Property; import org.hibernate.mapping.RootClass; +import org.hibernate.mapping.Table; +import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenMappingAction; +import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenSourceAction; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ModelElement; import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape; import org.jboss.tools.hibernate.ui.veditor.editors.parts.GEFRootEditPart; +import org.jboss.tools.hibernate.ui.veditor.editors.parts.OrmEditPart; import org.jboss.tools.hibernate.ui.veditor.editors.parts.OrmEditPartFactory; +import org.jboss.tools.hibernate.ui.veditor.editors.popup.PopupMenuProvider; import org.jboss.tools.hibernate.ui.view.views.ObjectEditorInput; public class VisualEditor extends GraphicalEditor { @@ -54,6 +71,10 @@ viewer.setRootEditPart(new GEFRootEditPart()); viewer.addDropTargetListener(createTransferDropTargetListener()); viewer.setContents(ormDiagram); + + PopupMenuProvider provider = new PopupMenuProvider(viewer, getActionRegistry()); + viewer.setContextMenu(provider); + getSite().registerContextMenu("FlowDiagramContextmenu", provider, viewer); } protected void createActions() { @@ -71,6 +92,15 @@ super.createActions(); getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.PRINT.getId(), getActionRegistry().getAction(ActionFactory.PRINT.getId())); + + ActionRegistry registry = getActionRegistry(); + IAction action; + + action = new OpenMappingAction(this); + registry.registerAction(action); + + action = new OpenSourceAction(this); + registry.registerAction(action); } private TransferDropTargetListener createTransferDropTargetListener() { @@ -117,4 +147,26 @@ return super.getAdapter(type); } + + public Set getSelectedElements() { + Set ret = new HashSet(); + List selectedEditParts = getGraphicalViewer().getSelectedEditParts(); + Iterator iterator = selectedEditParts.iterator(); + while (iterator.hasNext()) { + Object elem = iterator.next(); + if (elem instanceof OrmEditPart) { + Object model = ((OrmEditPart)elem).getModel(); + ModelElement shape = (Shape)model; + while (!(shape instanceof OrmShape)) { + shape = shape.getParent(); + } + ret.add(((OrmShape)shape).getOrmElement()); + } + } + return ret; + } + + public OrmDiagram getViewerContents() { + return ormDiagram; + } } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenMappingAction.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -0,0 +1,79 @@ +package org.jboss.tools.hibernate.ui.veditor.editors.actions; + +import java.util.Iterator; +import java.util.Set; + +import org.dom4j.Document; +import org.eclipse.core.resources.IResource; +import org.eclipse.gef.ui.actions.SelectionAction; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.PartInitException; +import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.mapping.RootClass; +import org.hibernate.mapping.Table; +import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin; +import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; +import org.jboss.tools.hibernate.ui.view.views.ObjectEditorInput; +import org.jboss.tools.hibernate.ui.view.views.OpenFileActionUtils; + +public class OpenMappingAction extends SelectionAction { + public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.mapping"; + + public OpenMappingAction(IWorkbenchPart part) { + super(part); + setId(ACTION_ID); + setText("Open Mapping File"); + } + + public void run() { + ObjectEditorInput objectEditorInput = (ObjectEditorInput)((VisualEditor)getWorkbenchPart()).getEditorInput(); + ConsoleConfiguration consoleConfiguration = objectEditorInput.getConfiguration(); + java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile(); + Document doc = OpenFileActionUtils.getDocument(consoleConfiguration, configXMLFile); + IJavaProject proj = objectEditorInput.getJavaProject(); + + VisualEditor part = (VisualEditor)getWorkbenchPart(); + Set selectedElements = part.getSelectedElements(); + + Iterator iterator = selectedElements.iterator(); + while (iterator.hasNext()) { + Object selectedElement = iterator.next(); + + IResource resource = null; + if (selectedElement instanceof RootClass) { + RootClass rootClass = (RootClass)selectedElement; + + resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, doc, configXMLFile, rootClass); + + if (resource == null) { + String fullyQualifiedName = rootClass.getClassName(); + try { + resource = proj.findType(fullyQualifiedName).getResource(); + } catch (JavaModelException e) { + VisualEditorPlugin.getDefault().logInfo("Can't find mapping file", e); + } + } + } else if (selectedElement instanceof Table) { + Table table = (Table)selectedElement; + + resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, doc, configXMLFile, table); + } + + if (resource != null) { + try { + OpenFileActionUtils.openEditor(VisualEditorPlugin.getPage(), resource); + } catch (PartInitException e) { + VisualEditorPlugin.getDefault().logInfo("Can't open mapping file", e); + } + } + } + } + + protected boolean calculateEnabled() { + VisualEditor part = (VisualEditor)getWorkbenchPart(); + return part.getSelectedElements().size() > 0; + } +} Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/actions/OpenSourceAction.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -0,0 +1,71 @@ +package org.jboss.tools.hibernate.ui.veditor.editors.actions; + +import java.util.Iterator; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.gef.ui.actions.SelectionAction; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.PartInitException; +import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.mapping.RootClass; +import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin; +import org.jboss.tools.hibernate.ui.veditor.editors.VisualEditor; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; +import org.jboss.tools.hibernate.ui.view.ViewPlugin; +import org.jboss.tools.hibernate.ui.view.views.ObjectEditorInput; +import org.jboss.tools.hibernate.ui.view.views.OpenFileActionUtils; + +public class OpenSourceAction extends SelectionAction { + public static String ACTION_ID = "org.jboss.tools.hibernate.ui.veditor.editors.actions.open.source"; + + public OpenSourceAction(IWorkbenchPart part) { + super(part); + setId(ACTION_ID); + setText("Open Source File"); + } + + public void run() { + ObjectEditorInput objectEditorInput = (ObjectEditorInput)((VisualEditor)getWorkbenchPart()).getEditorInput(); + ConsoleConfiguration consoleConfiguration = objectEditorInput.getConfiguration(); + IJavaProject proj = objectEditorInput.getJavaProject(); + + VisualEditor part = (VisualEditor)getWorkbenchPart(); + Set selectedElements = part.getSelectedElements(); + + Iterator iterator = selectedElements.iterator(); + while (iterator.hasNext()) { + RootClass rootClass = (RootClass) iterator.next(); + + IResource resource = null; + String fullyQualifiedName = rootClass.getClassName(); + try { + resource = proj.findType(fullyQualifiedName).getResource(); + } catch (JavaModelException e) { + VisualEditorPlugin.getDefault().logError("Can't find source file.", e); + } + + if (resource instanceof IFile){ + try { + OpenFileActionUtils.openEditor(ViewPlugin.getPage(), (IFile) resource); + } catch (PartInitException e) { + VisualEditorPlugin.getDefault().logError("Can't open source file.", e); + } + } + } + } + + protected boolean calculateEnabled() { + VisualEditor part = (VisualEditor)getWorkbenchPart(); + Set selectedElements = part.getSelectedElements(); + Iterator iterator = selectedElements.iterator(); + while (iterator.hasNext()) { + Object elem = iterator.next(); + if (elem instanceof RootClass) return true; + } + return false; + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -124,8 +124,6 @@ childrenLocations[i] = ((RootClass)ormElement).getEntityName() + "@"; } else if (ormElement instanceof Table) { childrenLocations[i] = HibernateUtils.getTableName((Table)ormElement)+"@"; -// } else if (ormElement instanceof Component) { -// childrenLocations[i] = ((Component)ormElement).getComponentClassName()+"@"; } childrenLocations[i] += shape.getLocation().x + ";" + shape.getLocation().y+";" + shape.isHiden(); } @@ -707,5 +705,12 @@ public boolean getState(Properties properties, Shape shape){ return getState(properties, getKey(shape)+".state"); } - + + public IJavaProject getJavaProject() { + return javaProject; + } + + public ConsoleConfiguration getConsoleConfiguration() { + return consoleConfiguration; + } } \ No newline at end of file Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/popup/PopupMenuProvider.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -0,0 +1,76 @@ +package org.jboss.tools.hibernate.ui.veditor.editors.popup; + +import org.eclipse.draw2d.geometry.Point; +import org.eclipse.gef.ContextMenuProvider; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartViewer; +import org.eclipse.gef.ui.actions.ActionRegistry; +import org.eclipse.gef.ui.actions.GEFActionConstants; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.StructuredSelection; +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.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; +import org.eclipse.ui.IWorkbenchActionConstants; +import org.eclipse.ui.actions.ActionFactory; +import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenMappingAction; +import org.jboss.tools.hibernate.ui.veditor.editors.actions.OpenSourceAction; + +public class PopupMenuProvider extends ContextMenuProvider { + private ActionRegistry actionRegistry; + + public PopupMenuProvider(EditPartViewer viewer, ActionRegistry actionRegistry) { + super(viewer); + this.actionRegistry = actionRegistry; + } + + public void buildContextMenu(IMenuManager menu) { + menu.add(new Separator(GEFActionConstants.MB_ADDITIONS)); + + IAction action = getActionRegistry().getAction(OpenSourceAction.ACTION_ID); + appendToGroup(GEFActionConstants.MB_ADDITIONS, action); + createMenuItem(getMenu(), action); + + action = getActionRegistry().getAction(OpenMappingAction.ACTION_ID); + appendToGroup(GEFActionConstants.MB_ADDITIONS, action); + createMenuItem(getMenu(), action); + } + + public void createMenuItem(Menu menu, IAction action) { + boolean enabled = action.isEnabled(); + boolean hidden = false; + if (hidden) + return; + MenuItem item = new MenuItem(menu, SWT.CASCADE); + String displayName = action.getText(); + item.addSelectionListener(new AL(action)); + item.setText(displayName); + item.setEnabled(enabled); + } + + class AL implements SelectionListener { + IAction action; + + public AL(IAction action) { + this.action = action; + } + + public void widgetSelected(SelectionEvent e) { + action.run(); + } + + public void widgetDefaultSelected(SelectionEvent e) { + } + } + + public ActionRegistry getActionRegistry() { + return actionRegistry; + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/META-INF/MANIFEST.MF 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/META-INF/MANIFEST.MF 2007-10-05 15:16:32 UTC (rev 4036) @@ -21,6 +21,6 @@ org.eclipse.ui.editors, org.eclipse.jface.text, org.hibernate.eclipse, - org.hibernate.eclipse.console, - org.eclipse.debug.core + org.eclipse.debug.core, + org.hibernate.eclipse.console Eclipse-LazyStart: true Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/ViewPlugin.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -18,6 +18,8 @@ import java.util.Properties; import java.util.ResourceBundle; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; @@ -25,21 +27,20 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; import org.osgi.framework.BundleContext; /** * The main plugin class to be used in the desktop. */ public class ViewPlugin extends BaseUIPlugin { - //The shared instance. private static ViewPlugin plugin; - //Resource bundle. private ResourceBundle resourceBundle; public static final ResourceBundle BUNDLE_IMAGE = ResourceBundle.getBundle(ViewPlugin.class.getPackage().getName() + ".image"); - // add Tau 28.04.2005 for trace public static boolean TRACE = false; public static boolean TRACE_VIEW = false; public static boolean TRACE_WIZARD = false; @@ -47,9 +48,6 @@ public static final String PLUGIN_ID = "org.jboss.tools.hibernate.view"; public static final String autoMappingSettingPrefPage = "autoMappingSettingPrefPage"; - /** - * The constructor. - */ public ViewPlugin() { super(); plugin = this; @@ -72,31 +70,18 @@ } } - /** - * This method is called upon plug-in activation - */ public void start(BundleContext context) throws Exception { super.start(context); } - /** - * This method is called when the plug-in is stopped - */ public void stop(BundleContext context) throws Exception { super.stop(context); } - /** - * Returns the shared instance. - */ public static ViewPlugin getDefault() { return plugin; } - /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ public static String getResourceString(String key) { ResourceBundle bundle = ViewPlugin.getDefault().getResourceBundle(); try { @@ -106,14 +91,10 @@ } } - /** - * Returns the plugin's resource bundle, - */ public ResourceBundle getResourceBundle() { return resourceBundle; } - // add tau 05.04.2005 public static Shell getActiveWorkbenchShell() { IWorkbenchWindow window = getActiveWorkbenchWindow(); if (window != null) { @@ -122,19 +103,16 @@ return null; } - // add tau 05.04.2005 public static IWorkbenchWindow getActiveWorkbenchWindow() { return getDefault().getWorkbench().getActiveWorkbenchWindow(); } - // add tau 19.04.2005 public static IWorkbenchPage getPage(){ IWorkbench workbench = PlatformUI.getWorkbench(); IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); return window.getActivePage(); } - // add Tau 28.04.2005 for trace static { String value = Platform.getDebugOption(PLUGIN_ID + "/debug"); @@ -148,7 +126,6 @@ } - // add tau 22.12.2005 public static void loadPreferenceStoreProperties(Properties properties, String key){ IPreferenceStore preferenceStore = ViewPlugin.getDefault().getPreferenceStore(); String value = preferenceStore.getString(key); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ActionOrmTree.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ActionOrmTree.java 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ActionOrmTree.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -31,15 +31,7 @@ public void run() { try { -// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("!TRY ActionOrmTree.run() lock(=" + OrmCore.lock + ").acquire(), Depth=" + OrmCore.lock.getDepth()); -// ((OrmContentProvider)viewer.getContentProvider()).lockMenu = true; // add tau 06.12.2005 -// OrmCore.lock.acquire(); // add tau 05.12.2005 -// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("!RUN ActionOrmTree.run() lock(=" + OrmCore.lock + ").acquire(), Depth=" + OrmCore.lock.getDepth()); -// -// OrmCore.getDefault().setLockResourceChangeListener(true); - this.rush(); - } finally { // OrmCore.lock.release(); // ((OrmContentProvider)viewer.getContentProvider()).lockMenu = false; // add tau 06.12.2005 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenActionDelegate.java 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenActionDelegate.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -10,29 +10,10 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.view.views; -import java.util.HashMap; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfiguration; -import org.eclipse.debug.core.ILaunchConfigurationType; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.ide.IDE; -import org.eclipse.ui.internal.ObjectPluginAction; -import org.hibernate.cfg.Configuration; -import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.eclipse.console.EclipseConsoleConfigurationPreferences; -import org.hibernate.eclipse.console.EclipseLaunchConsoleConfigurationPreferences; -import org.hibernate.eclipse.console.utils.ProjectUtils; -import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants; -import org.jboss.tools.hibernate.ui.view.ViewPlugin; public abstract class OpenActionDelegate implements IObjectActionDelegate { @@ -41,48 +22,4 @@ public void selectionChanged(IAction action, ISelection selection) { } - - protected IJavaProject findJavaProject(ConsoleConfiguration consoleConfiguration) { - IJavaProject proj = null; - if (consoleConfiguration != null) { - ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); - ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.hibernate.eclipse.launch.ConsoleConfigurationLaunchConfigurationType" ); - ILaunchConfiguration[] launchConfigurations; - try { - launchConfigurations = launchManager.getLaunchConfigurations( launchConfigurationType ); - for (int i = 0; i < launchConfigurations.length; i++) { // can't believe there is no look up by name API - ILaunchConfiguration launchConfiguration = launchConfigurations[i]; - if(launchConfiguration.getName().equals(consoleConfiguration.getName())) { - proj = ProjectUtils.findJavaProject(launchConfiguration.getAttribute(IConsoleConfigurationLaunchConstants.PROJECT_NAME, "")); - } - } - } catch (CoreException e1) { - ViewPlugin.getDefault().logError("Can't find java project.", e1); - } - } - return proj; - } -// protected IJavaProject findJavaProject(ConsoleConfiguration consoleConfiguration) { -// IJavaProject proj = null; -// if (consoleConfiguration != null) { -// ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); -// -// ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.hibernate.eclipse.launch.ConsoleConfigurationLaunchConfigurationType" ); -// ILaunchConfiguration[] launchConfigurations = null; -// try { -// launchConfigurations = launchManager.getLaunchConfigurations(launchConfigurationType); -// } catch (Exception e) { -// } -// for (int i = 0; i < launchConfigurations.length; i++) { -// -// } -// -// String projectName = ((EclipseConsoleConfigurationPreferences)consoleConfiguration.getPreferences()).getProjectName(); -// if (projectName != null) { -// proj = ProjectUtils.findJavaProject(projectName); -// } -// } -// return proj; -// } - } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -12,36 +12,25 @@ import java.util.HashMap; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfiguration; -import org.eclipse.debug.core.ILaunchConfigurationType; -import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.TreeSelection; -import org.eclipse.ui.IObjectActionDelegate; -import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.ide.IDE; import org.eclipse.ui.internal.ObjectPluginAction; -import org.hibernate.cfg.Configuration; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.eclipse.console.utils.ProjectUtils; -import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants; import org.jboss.tools.hibernate.ui.view.ViewPlugin; public class OpenDiagramActionDelegate extends OpenActionDelegate { + private HashMap hashMap = new HashMap(); public void run(IAction action) { - HashMap hashMap = new HashMap(); ObjectPluginAction objectPluginAction = (ObjectPluginAction)action; Object rootClass = ((TreeSelection)objectPluginAction.getSelection()).getFirstElement(); ObjectEditorInput input = (ObjectEditorInput)hashMap.get(rootClass); ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(((TreeSelection)objectPluginAction.getSelection()).getPaths()[0]).getSegment(0); - IJavaProject proj = findJavaProject(consoleConfiguration); + IJavaProject proj = OpenFileActionUtils.findJavaProject(consoleConfiguration); if(input == null) { input = new ObjectEditorInput(consoleConfiguration, rootClass, proj); Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenFileActionUtils.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenFileActionUtils.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenFileActionUtils.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -0,0 +1,252 @@ +package org.jboss.tools.hibernate.ui.view.views; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.dom4j.Attribute; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.Element; +import org.dom4j.Node; +import org.dom4j.Visitor; +import org.dom4j.VisitorSupport; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.Path; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchConfigurationType; +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.ide.IDE; +import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.eclipse.console.utils.ProjectUtils; +import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants; +import org.hibernate.mapping.RootClass; +import org.hibernate.mapping.Table; +import org.hibernate.util.StringHelper; +import org.hibernate.util.XMLHelper; +import org.jboss.tools.hibernate.ui.view.ViewPlugin; +import org.xml.sax.InputSource; + +public class OpenFileActionUtils { + private static XMLHelper helper = new XMLHelper(); + + public static void openEditor(IWorkbenchPage page, IResource resource) throws PartInitException { + IDE.openEditor(page, (IFile) resource); + } + + public static IJavaProject findJavaProject(ConsoleConfiguration consoleConfiguration) { + IJavaProject proj = null; + if (consoleConfiguration != null) { + ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); + ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.hibernate.eclipse.launch.ConsoleConfigurationLaunchConfigurationType" ); + ILaunchConfiguration[] launchConfigurations; + try { + launchConfigurations = launchManager.getLaunchConfigurations( launchConfigurationType ); + for (int i = 0; i < launchConfigurations.length; i++) { // can't believe there is no look up by name API + ILaunchConfiguration launchConfiguration = launchConfigurations[i]; + if(launchConfiguration.getName().equals(consoleConfiguration.getName())) { + proj = ProjectUtils.findJavaProject(launchConfiguration.getAttribute(IConsoleConfigurationLaunchConstants.PROJECT_NAME, "")); + } + } + } catch (CoreException e1) { + ViewPlugin.getDefault().logError("Can't find java project.", e1); + } + } + return proj; + } + + private static boolean elementInResource(ConsoleConfiguration consoleConfiguration, IResource resource, Object element) { + if (element instanceof RootClass) { + return classInResource(consoleConfiguration, resource, (RootClass)element); + } else if (element instanceof Table) { + return tableInResource(consoleConfiguration, resource, (Table)element); + } else { + return false; + } + } + + public static boolean classInResource(ConsoleConfiguration consoleConfiguration, IResource resource, RootClass rootClass) { + Document doc = getDocument(consoleConfiguration, resource.getLocation().toFile()); + Element hmNode = doc.getRootElement(); + + Iterator rootChildren = hmNode.elementIterator(); + while ( rootChildren.hasNext() ) { + Element element = (Element) rootChildren.next(); + String elementName = element.getName(); + + if ( "class".equals( elementName ) ) { + Attribute classAttr = element.attribute( "name" ); + if (classAttr != null) { + if (classAttr.getValue().equals(rootClass.getClassName())) { + return true; + } else { + Attribute packNode = hmNode.attribute( "package" ); + String packageName = null; + if ( packNode != null ) { + packageName = packNode.getValue(); + String className = packageName + "." + classAttr.getValue(); + if (className.equals(rootClass.getClassName())) { + return true; + } + } + } + } + } + } + return false; + } + + public static boolean tableInResource(ConsoleConfiguration consoleConfiguration, IResource resource, Table table) { + Document doc = getDocument(consoleConfiguration, resource.getLocation().toFile()); + + if (getElements(doc, "table", HibernateUtils.getTableName(table)).hasNext()) { + return true; + } + + Iterator classes = getElements(doc, "class"); + while (classes.hasNext()) { + Element element = (Element) classes.next(); + Attribute classNameAttr = element.attribute( "name" ); + String physicalTableName = consoleConfiguration.getConfiguration().getNamingStrategy().classToTableName(classNameAttr.getValue()); + if (table.getName().equals(physicalTableName)) { + return true; + } + } + + return false; + } + + private static Iterator getElements(Document doc, String elementName) { + return getElements(doc, elementName, null, null); + } + + private static Iterator getElements(Document doc, String attrName, String attrValue) { + return getElements(doc, null, attrName, attrValue); + } + + private static Iterator getElements(Document doc, String elementName, String attrName, String attrValue) { + LVS visitor = new LVS(elementName, attrName, attrValue); + doc.accept( visitor ); + return visitor.iterator(); + } + + static class LVS extends VisitorSupport { + private String nodeName; + private String attrName; + private String attrValue; + private List ret = new ArrayList(); + + public LVS(String nodeName, String attrName, String attrValue) { + super(); + this.nodeName = nodeName; + this.attrName = attrName; + this.attrValue = attrValue; + } + + public void visit(Element element) { + if (nodeName == null) { + if (attrName != null && attrValue != null) { + if (attrIsCorrect(element, attrName, attrValue)) { + ret.add(element); + } + } + } else { + if (nodeName.equals(element.getName())) { + if (attrName != null) { + if (attrIsCorrect(element, attrName, attrValue)) { + ret.add(element); + } + } else { + ret.add(element); + } + } + } + + } + + private boolean attrIsCorrect(Element element, String attrName, String attrValue) { + Attribute attr = element.attribute(attrName); + if (attr != null && attrValue.equals(attr.getValue())) { + return attrValue.equals(attr.getValue()); + } + return false; + } + + public Iterator iterator() { + return ret.iterator(); + } + } + + public static Document getDocument(ConsoleConfiguration consoleConfiguration, java.io.File configXMLFile) { + Document doc = null; + if (consoleConfiguration != null && configXMLFile != null) { + InputStream stream = null; + try { + stream = new FileInputStream( configXMLFile ); + } catch (FileNotFoundException e) { + ViewPlugin.getDefault().logError("Configuration file not found", e); + } + try { + List errors = new ArrayList(); + doc = helper.createSAXReader( configXMLFile.getPath(), errors, consoleConfiguration.getConfiguration().getEntityResolver() ) + .read( new InputSource( stream ) ); + if ( errors.size() != 0 ) { + ViewPlugin.getDefault().logError("invalid configuration"); + } + } + catch (DocumentException e) { + ViewPlugin.getDefault().logError("Could not parse configuration", e); + } + finally { + try { + stream.close(); + } + catch (IOException ioe) { + ViewPlugin.getDefault().logError("could not close input stream for", ioe); + } + } + } + return doc; + } + + public static IResource getResource(ConsoleConfiguration consoleConfiguration, IJavaProject proj, Document doc, java.io.File configXMLFile, Object element) { + IResource resource = null; + if (consoleConfiguration != null && proj != null && doc != null) { + Element sfNode = doc.getRootElement().element( "session-factory" ); + Iterator elements = sfNode.elementIterator(); + while ( elements.hasNext() ) { + Element subelement = (Element) elements.next(); + String subelementName = subelement.getName(); + if ( "mapping".equals( subelementName ) ) { + Attribute file = subelement.attribute( "resource" ); + if (file != null) { + resource = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(configXMLFile.getParent()).append(file.getValue())); + if (elementInResource(consoleConfiguration, resource, element)) return resource; + } + } + } + java.io.File[] files = consoleConfiguration.getPreferences().getMappingFiles(); + for (int i = 0; i < files.length; i++) { + java.io.File file = files[i]; + if (file != null) { + resource = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(file.getPath())); + if (OpenFileActionUtils.elementInResource(consoleConfiguration, resource, element)) return resource; + } + } + } + return null; + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenMappingActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenMappingActionDelegate.java 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenMappingActionDelegate.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -58,129 +58,31 @@ public class OpenMappingActionDelegate extends OpenActionDelegate { private static XMLHelper helper = new XMLHelper(); - private HashMap map = new HashMap(); public void run(IAction action) { ObjectPluginAction objectPluginAction = (ObjectPluginAction)action; RootClass rootClass = (RootClass)((TreeSelection)objectPluginAction.getSelection()).getFirstElement(); ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(((TreeSelection)objectPluginAction.getSelection()).getPaths()[0]).getSegment(0); - IJavaProject proj = findJavaProject(consoleConfiguration); + IJavaProject proj = OpenFileActionUtils.findJavaProject(consoleConfiguration); java.io.File configXMLFile = consoleConfiguration.getPreferences().getConfigXMLFile(); - Document doc = getDocument(consoleConfiguration, configXMLFile); - IResource resource = getResource(consoleConfiguration, proj, doc, configXMLFile, rootClass); + Document doc = OpenFileActionUtils.getDocument(consoleConfiguration, configXMLFile); + IResource resource = OpenFileActionUtils.getResource(consoleConfiguration, proj, doc, configXMLFile, rootClass); if (resource == null) { String fullyQualifiedName = rootClass.getClassName(); try { resource = proj.findType(fullyQualifiedName).getResource(); - } catch (JavaModelException e1) { - e1.printStackTrace(); + } catch (JavaModelException e) { + ViewPlugin.getDefault().logError("Can't find mapping file.", e); } } if (resource != null && resource instanceof IFile){ try { - IDE.openEditor(ViewPlugin.getPage(), (IFile) resource); + OpenFileActionUtils.openEditor(ViewPlugin.getPage(), (IFile) resource); } catch (PartInitException e) { ViewPlugin.getDefault().logError("Can't open mapping or source file.", e); } } } - - private boolean classInResource(ConsoleConfiguration consoleConfiguration, IResource resource, RootClass rootClass) { - Document doc = getDocument(consoleConfiguration, resource.getLocation().toFile()); - Element hmNode = doc.getRootElement(); - - Iterator rootChildren = hmNode.elementIterator(); - while ( rootChildren.hasNext() ) { - Element element = (Element) rootChildren.next(); - String elementName = element.getName(); - - if ( "class".equals( elementName ) ) { - Attribute classAttr = element.attribute( "name" ); - if (classAttr != null) { - if (classAttr.getValue().equals(rootClass.getClassName())) { - if (map.get(rootClass.getClassName()) == null) map.put(rootClass.getClassName(), resource); - return true; - } else { - Attribute packNode = hmNode.attribute( "package" ); - String packageName = null; - if ( packNode != null ) { - packageName = packNode.getValue(); - String className = packageName + "." + classAttr.getValue(); - if (className.equals(rootClass.getClassName())) { - if (map.get(rootClass.getClassName()) == null) map.put(rootClass.getClassName(), resource); - return true; - } - } - } - } - } - } - return false; - } - - private IResource getResource(ConsoleConfiguration consoleConfiguration, IJavaProject proj, Document doc, java.io.File configXMLFile, RootClass rootClass) { - if (map.get(rootClass.getClassName()) != null) { - return (IResource)map.get(rootClass.getClassName()); - } else { - IResource resource = null; - if (consoleConfiguration != null && proj != null && doc != null) { - Element sfNode = doc.getRootElement().element( "session-factory" ); - Iterator elements = sfNode.elementIterator(); - while ( elements.hasNext() ) { - Element subelement = (Element) elements.next(); - String subelementName = subelement.getName(); - if ( "mapping".equals( subelementName ) ) { - Attribute file = subelement.attribute( "resource" ); - if (file != null) { - resource = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(configXMLFile.getParent()).append(file.getValue())); - if (classInResource(consoleConfiguration, resource, rootClass)) return resource; - } - } - } - java.io.File[] files = consoleConfiguration.getPreferences().getMappingFiles(); - for (int i = 0; i < files.length; i++) { - java.io.File file = files[i]; - if (file != null) { - resource = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(file.getPath())); - if (classInResource(consoleConfiguration, resource, rootClass)) return resource; - } - } - } - return null; - } - } - - private Document getDocument(ConsoleConfiguration consoleConfiguration, java.io.File configXMLFile) { - Document doc = null; - if (consoleConfiguration != null && configXMLFile != null) { - InputStream stream = null; - try { - stream = new FileInputStream( configXMLFile ); - } catch (FileNotFoundException e) { - ViewPlugin.getDefault().logError("Configuration file not found", e); - } - try { - List errors = new ArrayList(); - doc = helper.createSAXReader( configXMLFile.getPath(), errors, consoleConfiguration.getConfiguration().getEntityResolver() ) - .read( new InputSource( stream ) ); - if ( errors.size() != 0 ) { - ViewPlugin.getDefault().logError("invalid configuration"); - } - } - catch (DocumentException e) { - ViewPlugin.getDefault().logError("Could not parse configuration", e); - } - finally { - try { - stream.close(); - } - catch (IOException ioe) { - ViewPlugin.getDefault().logError("could not close input stream for", ioe); - } - } - } - return doc; - } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenSourceActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenSourceActionDelegate.java 2007-10-05 15:15:44 UTC (rev 4035) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenSourceActionDelegate.java 2007-10-05 15:16:32 UTC (rev 4036) @@ -10,51 +10,17 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.view.views; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - -import org.dom4j.Attribute; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.Element; -import org.eclipse.core.internal.resources.File; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfiguration; -import org.eclipse.debug.core.ILaunchConfigurationType; -import org.eclipse.debug.core.ILaunchManager; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.TreeSelection; -import org.eclipse.ui.IObjectActionDelegate; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; -import org.eclipse.ui.ide.IDE; import org.eclipse.ui.internal.ObjectPluginAction; -import org.hibernate.HibernateException; -import org.hibernate.MappingException; -import org.hibernate.cfg.Configuration; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.eclipse.console.EclipseConsoleConfigurationPreferences; -import org.hibernate.eclipse.console.utils.ProjectUtils; -import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants; import org.hibernate.mapping.RootClass; -import org.hibernate.util.XMLHelper; import org.jboss.tools.hibernate.ui.view.ViewPlugin; -import org.xml.sax.InputSource; public class OpenSourceActionDelegate extends OpenActionDelegate { @@ -62,19 +28,19 @@ ObjectPluginAction objectPluginAction = (ObjectPluginAction)action; RootClass rootClass = (RootClass)((TreeSelection)objectPluginAction.getSelection()).getFirstElement(); ConsoleConfiguration consoleConfiguration = (ConsoleConfiguration)(((TreeSelection)objectPluginAction.getSelection()).getPaths()[0]).getSegment(0); - IJavaProject proj = findJavaProject(consoleConfiguration); + IJavaProject proj = OpenFileActionUtils.findJavaProject(consoleConfiguration); IResource resource = null; String fullyQualifiedName = rootClass.getClassName(); try { resource = proj.findType(fullyQualifiedName).getResource(); - } catch (JavaModelException e1) { - e1.printStackTrace(); + } catch (JavaModelException e) { + ViewPlugin.getDefault().logError("Can't find source file.", e); } if (resource instanceof IFile){ try { - IDE.openEditor(ViewPlugin.getPage(), (IFile) resource); + OpenFileActionUtils.openEditor(ViewPlugin.getPage(), (IFile) resource); } catch (PartInitException e) { ViewPlugin.getDefault().logError("Can't open source file.", e); }

17 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r4035 - in trunk/seam/plugins/org.jboss.tools.seam.xml: schemas and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2007-10-05 11:15:44 -0400 (Fri, 05 Oct 2007) New Revision: 4035 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.0.xsd trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentConstants.java Log: JBIDE-1029 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta 2007-10-05 15:15:29 UTC (rev 4034) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-components.meta 2007-10-05 15:15:44 UTC (rev 4035) @@ -815,8 +815,9 @@ XMLSUBPATH="components" name="FileSeamComponents20"> <XChildrenEntities> <XChildEntity name="SeamComponent"/> - <XChildEntity name="SeamFactory"/> - <XChildEntity name="SeamEvent"/> + <XChildEntity name="SeamFactory20"/> + <XChildEntity name="SeamEvent20"/> + <XChildEntity name="SeamImport"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -911,17 +912,23 @@ ICON="action.new.struts.webapp.res_ref" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Factory..." kind="action" name="AddFactory"> - <EntityData EntityName="SeamFactory"> + <EntityData EntityName="SeamFactory20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="value" Mandatory="no"/> </EntityData> </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" WizardClassName="%Default%" displayName="Event..." kind="action" name="AddEvent"> - <EntityData EntityName="SeamEvent"> + <EntityData EntityName="SeamEvent20"> <AttributeData AttributeName="type"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Import..." kind="action" name="AddImport"> + <EntityData EntityName="SeamImport"> + <AttributeData AttributeName="import"/> + </EntityData> + </XActionItem> </XActionItem> <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" @@ -969,17 +976,23 @@ ICON="action.new.struts.webapp.res_ref" PROPERTIES="validator.add=true" WizardClassName="%Default%" displayName="Factory..." kind="action" name="AddFactory"> - <EntityData EntityName="SeamFactory"> + <EntityData EntityName="SeamFactory20"> <AttributeData AttributeName="name"/> <AttributeData AttributeName="value" Mandatory="no"/> </EntityData> </XActionItem> <XActionItem HandlerClassName="%Create%" ICON="action.empty" WizardClassName="%Default%" displayName="Event..." kind="action" name="AddEvent"> - <EntityData EntityName="SeamEvent"> + <EntityData EntityName="SeamEvent20"> <AttributeData AttributeName="type"/> </EntityData> </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Import..." kind="action" name="AddImport"> + <EntityData EntityName="SeamImport"> + <AttributeData AttributeName="import"/> + </EntityData> + </XActionItem> </XActionItem> <XActionItem ICON="action.empty" kind="list" name="Properties"> <XActionItem HandlerClassName="%Properties%" ICON="action.empty" @@ -1035,6 +1048,49 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="action" name="SeamAction20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.event" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="action" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="execute" xmlname="execute"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData;children=%Ordered%" XMLSUBPATH="component" name="SeamComponent"> <XChildrenEntities> @@ -1207,6 +1263,60 @@ </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="event" name="SeamEvent20"> + <XChildrenEntities> + <XChildEntity name="SeamAction20"/> + </XChildrenEntities> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.event" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="event" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="type" xmlname="type"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + WizardClassName="%Default%" displayName="Action..." kind="action" name="AddAction"> + <EntityData EntityName="SeamAction20"> + <AttributeData AttributeName="execute"/> + </EntityData> + </XActionItem> + </XActionItem> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%" + ICON="action.paste" displayName="Paste" kind="action" name="Paste"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" XMLSUBPATH="factory" name="SeamFactory"> <XChildrenEntities/> <XEntityRenderer> @@ -1278,6 +1388,98 @@ </XActionItem> <XDependencies/> </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="factory" name="SeamFactory20"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.factory" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="factory" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="name,value,scope,method,auto-create,comment" + entity="SeamFactory" name="factory"/> + <XModelAttribute PROPERTIES="category=advanced" default="false" + name="startup" xmlname="startup"> + <Constraint loader="ListString"> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.SeamXMLFormLayoutData" + XMLSUBPATH="import" name="SeamImport"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.event" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="import" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;save=always;category=general" + name="import" xmlname="#text"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> <XModelEntity ImplementingClass="%Custom%" XMLSUBPATH="value" name="SeamListEntry"> <XChildrenEntities/> <XEntityRenderer> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.0.xsd =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.0.xsd 2007-10-05 15:15:29 UTC (rev 4034) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/schemas/components-2.0.xsd 2007-10-05 15:15:44 UTC (rev 4035) @@ -1,151 +1,162 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/components" - xmlns:components="http://jboss.com/products/seam/components"> - <xs:element name="components"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:component"/> - <xs:element ref="components:factory"/> - <xs:element ref="components:event"/> - <xs:any namespace="##other" processContents="strict"/> - </xs:choice> - </xs:complexType> - </xs:element> - <xs:element name="component"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="components:property"/> - </xs:sequence> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="components:attlist.ejbcomponent"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.ejbcomponent"> - <xs:attribute name="jndi-name"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.component"> - <xs:attribute name="name"/> - <xs:attribute name="class"/> - <xs:attribute name="scope"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="stateless"/> - <xs:enumeration value="event"/> - <xs:enumeration value="page"/> - <xs:enumeration value="conversation"/> - <xs:enumeration value="session"/> - <xs:enumeration value="business_process"/> - <xs:enumeration value="application"/> - <xs:enumeration value="STATELESS"/> - <xs:enumeration value="EVENT"/> - <xs:enumeration value="PAGE"/> - <xs:enumeration value="CONVERSATION"/> - <xs:enumeration value="SESSION"/> - <xs:enumeration value="BUSINESS_PROCESS"/> - <xs:enumeration value="APPLICATION"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - - <xs:attribute name="precedence"/> - <xs:attribute name="installed" default="true"/> - <xs:attribute name="auto-create" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - <xs:element name="factory"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.factory"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.factory"> - <xs:attribute name="name" use="required"/> - <xs:attribute name="method"/> - <xs:attribute name="value"/> - <xs:attribute name="scope"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="stateless"/> - <xs:enumeration value="event"/> - <xs:enumeration value="page"/> - <xs:enumeration value="conversation"/> - <xs:enumeration value="session"/> - <xs:enumeration value="business_process"/> - <xs:enumeration value="application"/> - <xs:enumeration value="STATELESS"/> - <xs:enumeration value="EVENT"/> - <xs:enumeration value="PAGE"/> - <xs:enumeration value="CONVERSATION"/> - <xs:enumeration value="SESSION"/> - <xs:enumeration value="BUSINESS_PROCESS"/> - <xs:enumeration value="APPLICATION"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="auto-create" default="false"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - <xs:element name="property"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:key"/> - <xs:element ref="components:value"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.property"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.property"> - <xs:attribute name="name" use="required"/> - </xs:attributeGroup> - <xs:element name="key" type="xs:string"/> - <xs:element name="value" type="xs:string"/> - - <xs:complexType name="multiValuedProperty"> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:value"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="mapProperty"> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:key"/> - <xs:element ref="components:value"/> - </xs:sequence> - </xs:complexType> - - <xs:element name="event"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="components:action"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.event"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.event"> - <xs:attribute name="type" use="required"/> - </xs:attributeGroup> - - <xs:element name="action"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.action"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.action"> - <xs:attribute name="expression" use="required"/> - </xs:attributeGroup> - -</xs:schema> +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" + targetNamespace="http://jboss.com/products/seam/components" + xmlns:components="http://jboss.com/products/seam/components"> + <xs:element name="components"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:component"/> + <xs:element ref="components:factory"/> + <xs:element ref="components:event"/> + <xs:element ref="components:import"/> + <xs:any namespace="##other" processContents="strict"/> + </xs:choice> + </xs:complexType> + </xs:element> + <xs:element name="component"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="components:property"/> + </xs:sequence> + <xs:attributeGroup ref="components:attlist.component"/> + <xs:attributeGroup ref="components:attlist.ejbcomponent"/> + </xs:complexType> + </xs:element> + + <xs:element name="import" type="xs:string"/> + + <xs:attributeGroup name="attlist.ejbcomponent"> + <xs:attribute name="jndi-name"/> + </xs:attributeGroup> + + <xs:attributeGroup name="attlist.component"> + <xs:attribute name="name"/> + <xs:attribute name="class"/> + <xs:attribute name="scope"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="stateless"/> + <xs:enumeration value="event"/> + <xs:enumeration value="page"/> + <xs:enumeration value="conversation"/> + <xs:enumeration value="session"/> + <xs:enumeration value="business_process"/> + <xs:enumeration value="application"/> + <xs:enumeration value="STATELESS"/> + <xs:enumeration value="EVENT"/> + <xs:enumeration value="PAGE"/> + <xs:enumeration value="CONVERSATION"/> + <xs:enumeration value="SESSION"/> + <xs:enumeration value="BUSINESS_PROCESS"/> + <xs:enumeration value="APPLICATION"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + + <xs:attribute name="precedence"/> + <xs:attribute name="installed" default="true"/> + <xs:attribute name="auto-create" default="false"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + <xs:element name="factory"> + <xs:complexType> + <xs:attributeGroup ref="components:attlist.factory"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.factory"> + <xs:attribute name="name" use="required"/> + <xs:attribute name="method"/> + <xs:attribute name="value"/> + <xs:attribute name="scope"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="stateless"/> + <xs:enumeration value="event"/> + <xs:enumeration value="page"/> + <xs:enumeration value="conversation"/> + <xs:enumeration value="session"/> + <xs:enumeration value="business_process"/> + <xs:enumeration value="application"/> + <xs:enumeration value="STATELESS"/> + <xs:enumeration value="EVENT"/> + <xs:enumeration value="PAGE"/> + <xs:enumeration value="CONVERSATION"/> + <xs:enumeration value="SESSION"/> + <xs:enumeration value="BUSINESS_PROCESS"/> + <xs:enumeration value="APPLICATION"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="auto-create"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="startup"> + <xs:simpleType> + <xs:restriction base="xs:token"> + <xs:enumeration value="true"/> + <xs:enumeration value="false"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:attributeGroup> + <xs:element name="property"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:key"/> + <xs:element ref="components:value"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.property"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.property"> + <xs:attribute name="name" use="required"/> + </xs:attributeGroup> + <xs:element name="key" type="xs:string"/> + <xs:element name="value" type="xs:string"/> + + <xs:complexType name="multiValuedProperty"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:value"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="mapProperty"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:key"/> + <xs:element ref="components:value"/> + </xs:sequence> + </xs:complexType> + + <xs:element name="event"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="components:action"/> + </xs:choice> + <xs:attributeGroup ref="components:attlist.event"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.event"> + <xs:attribute name="type" use="required"/> + </xs:attributeGroup> + + <xs:element name="action"> + <xs:complexType> + <xs:attributeGroup ref="components:attlist.action"/> + </xs:complexType> + </xs:element> + <xs:attributeGroup name="attlist.action"> + <xs:attribute name="execute" use="required"/> + </xs:attributeGroup> + +</xs:schema> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentConstants.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentConstants.java 2007-10-05 15:15:29 UTC (rev 4034) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/SeamComponentConstants.java 2007-10-05 15:15:44 UTC (rev 4035) @@ -14,14 +14,16 @@ public String PUBLIC_ID_11 = "-//JBoss/Seam Component Configuration DTD 1.1//EN"; //$NON-NLS-1$ public String SYSTEM_ID_11 = "http://jboss.com/products/seam/components-1.1.dtd"; //$NON-NLS-1$ + public String SUFF_20 = "20"; //$NON-NLS-1$ public String ENT_SEAM_COMPONENTS = "FileSeamComponents"; //$NON-NLS-1$ public String ENT_SEAM_COMPONENTS_11 = ENT_SEAM_COMPONENTS + "11"; //$NON-NLS-1$ public String ENT_SEAM_COMPONENTS_12 = ENT_SEAM_COMPONENTS + "12"; //$NON-NLS-1$ - public String ENT_SEAM_COMPONENT_12 = "FileSeamComponent" + "12"; //$NON-NLS-1$ //$NON-NLS-2$ - public String ENT_SEAM_COMPONENTS_20 = ENT_SEAM_COMPONENTS + "20"; //$NON-NLS-1$ - public String ENT_SEAM_COMPONENT_20 = "FileSeamComponent" + "20"; //$NON-NLS-1$ //$NON-NLS-2$ + public String ENT_SEAM_COMPONENT_12 = "FileSeamComponent" + "12"; //$NON-NLS-1$ //$NON-NLS-2$ + public String ENT_SEAM_COMPONENTS_20 = ENT_SEAM_COMPONENTS + SUFF_20; + public String ENT_SEAM_COMPONENT_20 = "FileSeamComponent" + SUFF_20; //$NON-NLS-1$ public String ENT_SEAM_COMPONENT = "SeamComponent"; //$NON-NLS-1$ - public String ENT_SEAM_FACTORY = "SeamFactory"; //$NON-NLS-1$ + public String ENT_SEAM_FACTORY = "SeamFactory"; //$NON-NLS-1$ + public String ENT_SEAM_FACTORY_20 = ENT_SEAM_FACTORY + SUFF_20; public String ENT_SEAM_PROPERTY = "SeamProperty"; //$NON-NLS-1$ public String ENT_SEAM_PROPERTY_LIST = "SeamPropertyList"; //$NON-NLS-1$ @@ -32,11 +34,16 @@ public String ENT_SEAM_EVENT = "SeamEvent"; //$NON-NLS-1$ public String ENT_SEAM_ACTION = "SeamAction"; //$NON-NLS-1$ - + public String ENT_SEAM_EVENT_20 = ENT_SEAM_EVENT + SUFF_20; + public String ENT_SEAM_ACTION_20 = ENT_SEAM_ACTION + SUFF_20; + + public String ENT_SEAM_IMPORT = "SeamImport"; //$NON-NLS-1$ + public String ATTR_NAME = "name"; //$NON-NLS-1$ public String ATTR_KEY = "key"; //$NON-NLS-1$ public String ATTR_VALUE = "value"; //$NON-NLS-1$ public String ATTR_TYPE = "type"; //$NON-NLS-1$ public String ATTR_EXPR = "expression"; //$NON-NLS-1$ + public String ATTR_EXEC = "execute"; //$NON-NLS-1$ }

17 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r4034 - trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2007-10-05 11:15:29 -0400 (Fri, 05 Oct 2007) New Revision: 4034 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamEventFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java Log: JBIDE-1029 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java 2007-10-05 15:04:11 UTC (rev 4033) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamComponentsFileFormLayoutData.java 2007-10-05 15:15:29 UTC (rev 4034) @@ -12,65 +12,77 @@ import org.jboss.tools.common.model.ui.forms.*; import org.jboss.tools.seam.xml.components.model.SeamComponentConstants; -import org.jboss.tools.seam.xml.ui.SeamXMLUIMessages; public class SeamComponentsFileFormLayoutData implements SeamComponentConstants { static IFormData SEAM_COMPONENT_LIST_DEFINITION = new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_COMPONENTS"), //$NON-NLS-1$ + "Components", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 40), new FormAttributeData("class", 60)}, //$NON-NLS-1$ new String[]{ENT_SEAM_COMPONENT}, FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddComponent") //$NON-NLS-1$ ); - static IFormData SEAM_FACTORY_LIST_DEFINITION = new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_FACTORIES"), //$NON-NLS-1$ + static IFormData getFactoryList(String entity) { + return new FormData( + "Factories", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)}, + new String[]{entity}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFactory") //$NON-NLS-1$ + ); + } + + static IFormData getEventList(String entity) { + return new FormData( + "Events", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_TYPE, 100)}, + new String[]{entity}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") //$NON-NLS-1$ + ); + } + + static IFormData SEAM_IMPORT_LIST_DEFINITION = new FormData( + "Imports", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, - new FormAttributeData[]{new FormAttributeData(ATTR_NAME, 100)}, - new String[]{ENT_SEAM_FACTORY}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddFactory") //$NON-NLS-1$ + new FormAttributeData[]{new FormAttributeData("import", 100)}, //$NON-NLS-1$ + new String[]{ENT_SEAM_IMPORT}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddImport") //$NON-NLS-1$ ); - static IFormData SEAM_EVENT_LIST_DEFINITION = new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_EVENTS"), //$NON-NLS-1$ - SeamXMLFormLayoutData.EMPTY_DESCRIPTION, - new FormAttributeData[]{new FormAttributeData(ATTR_TYPE, 100)}, - new String[]{ENT_SEAM_EVENT}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddEvent") //$NON-NLS-1$ - ); - private final static IFormData[] FILE_11_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_11_FILE"), //$NON-NLS-1$ + "Seam Components 1.1 File", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_11) ), SEAM_COMPONENT_LIST_DEFINITION, - SEAM_FACTORY_LIST_DEFINITION, - SEAM_EVENT_LIST_DEFINITION + getFactoryList(ENT_SEAM_FACTORY), + getEventList(ENT_SEAM_EVENT) }; private final static IFormData[] FILE_12_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_12_FILE"), //$NON-NLS-1$ + "Seam Components 1.2 File", SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_12) ), SEAM_COMPONENT_LIST_DEFINITION, - SEAM_FACTORY_LIST_DEFINITION, - SEAM_EVENT_LIST_DEFINITION + getFactoryList(ENT_SEAM_FACTORY), + getEventList(ENT_SEAM_EVENT) }; private final static IFormData[] FILE_20_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_COMPONENTS_FILE_FORM_LAYOUT_DATA_SEAM_COMPONENTS_20_FILE"), //$NON-NLS-1$ + "Seam Components 2.0 File", SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_COMPONENTS_20) ), SEAM_COMPONENT_LIST_DEFINITION, - SEAM_FACTORY_LIST_DEFINITION, - SEAM_EVENT_LIST_DEFINITION + getFactoryList(ENT_SEAM_FACTORY_20), + getEventList(ENT_SEAM_EVENT_20), + SEAM_IMPORT_LIST_DEFINITION }; final static IFormData FILE_12_FORM_DEFINITION = new FormData( Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamEventFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamEventFormLayoutData.java 2007-10-05 15:04:11 UTC (rev 4033) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamEventFormLayoutData.java 2007-10-05 15:15:29 UTC (rev 4034) @@ -15,39 +15,69 @@ import org.jboss.tools.common.model.ui.forms.FormLayoutDataUtil; import org.jboss.tools.common.model.ui.forms.IFormData; import org.jboss.tools.seam.xml.components.model.SeamComponentConstants; -import org.jboss.tools.seam.xml.ui.SeamXMLUIMessages; public class SeamEventFormLayoutData implements SeamComponentConstants { static IFormData SEAM_ACTION_LIST_DEFINITION = new FormData( - SeamXMLUIMessages.getString("SEAM_EVENT_FORM_LAYOUT_DATA_ACTIONS"), //$NON-NLS-1$ - SeamXMLFormLayoutData.EMPTY_DESCRIPTION, - new FormAttributeData[]{new FormAttributeData(ATTR_EXPR, 100)}, - new String[]{ENT_SEAM_ACTION}, - FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAction") //$NON-NLS-1$ - ); + "Actions", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_EXPR, 100)}, + new String[]{ENT_SEAM_ACTION}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAction") //$NON-NLS-1$ + ); + static IFormData SEAM_ACTION_20_LIST_DEFINITION = new FormData( + "Actions", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + new FormAttributeData[]{new FormAttributeData(ATTR_EXEC, 100)}, + new String[]{ENT_SEAM_ACTION_20}, + FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddAction") //$NON-NLS-1$ + ); + private final static IFormData[] SEAM_EVENT_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_EVENT_FORM_LAYOUT_DATA_SEAM_EVENT"), //$NON-NLS-1$ + "Seam Event", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_EVENT) ), SEAM_ACTION_LIST_DEFINITION }; + private final static IFormData[] SEAM_EVENT_20_DEFINITIONS = new IFormData[] { + new FormData( + "Seam Event", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_EVENT_20) + ), + SEAM_ACTION_20_LIST_DEFINITION + }; + private final static IFormData[] SEAM_ACTION_DEFINITIONS = new IFormData[] { new FormData( - SeamXMLUIMessages.getString("SEAM_EVENT_FORM_LAYOUT_DATA_SEAM_ACTION"), //$NON-NLS-1$ + "Seam Action", //$NON-NLS-1$ SeamXMLFormLayoutData.EMPTY_DESCRIPTION, FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_ACTION) ) }; + private final static IFormData[] SEAM_ACTION_20_DEFINITIONS = new IFormData[] { + new FormData( + "Seam Action", //$NON-NLS-1$ + SeamXMLFormLayoutData.EMPTY_DESCRIPTION, + FormLayoutDataUtil.createGeneralFormAttributeData(ENT_SEAM_ACTION_20) + ) + }; + final static IFormData SEAM_EVENT_FORM_DEFINITION = new FormData( ENT_SEAM_EVENT, new String[]{null}, SEAM_EVENT_DEFINITIONS); final static IFormData SEAM_ACTION_FORM_DEFINITION = new FormData( ENT_SEAM_ACTION, new String[]{null}, SEAM_ACTION_DEFINITIONS); + final static IFormData SEAM_EVENT_20_FORM_DEFINITION = new FormData( + ENT_SEAM_EVENT_20, new String[]{null}, SEAM_EVENT_20_DEFINITIONS); + + final static IFormData SEAM_ACTION_20_FORM_DEFINITION = new FormData( + ENT_SEAM_ACTION_20, new String[]{null}, SEAM_ACTION_20_DEFINITIONS); + } Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2007-10-05 15:04:11 UTC (rev 4033) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/SeamXMLFormLayoutData.java 2007-10-05 15:15:29 UTC (rev 4034) @@ -32,7 +32,9 @@ SeamPropertyFormLayoutData.SEAM_PROPERTY_MAP_FORM_DEFINITION, SeamFactoryFormLayoutData.SEAM_FACTORY_FORM_DEFINITION, SeamEventFormLayoutData.SEAM_EVENT_FORM_DEFINITION, - SeamEventFormLayoutData.SEAM_ACTION_FORM_DEFINITION, + SeamEventFormLayoutData.SEAM_ACTION_FORM_DEFINITION, + SeamEventFormLayoutData.SEAM_EVENT_20_FORM_DEFINITION, + SeamEventFormLayoutData.SEAM_ACTION_20_FORM_DEFINITION, };

17 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r4032 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2007-10-05 10:57:33 -0400 (Fri, 05 Oct 2007) New Revision: 4032 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java Log: http://jira.jboss.com/jira/browse/JBIDE-1034 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java 2007-10-05 14:44:37 UTC (rev 4031) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java 2007-10-05 14:57:33 UTC (rev 4032) @@ -25,7 +25,7 @@ public static final boolean visualAddPseudoElement = false; - public static final boolean visualContextMenuDumpSource = true; + public static final boolean visualContextMenuDumpSource = false; public static final boolean visualContextMenuDumpMapping = false; public static final boolean visualContextMenuTest = false;

17 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r4031 - branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates.

by jbosstools-commits＠lists.jboss.org

Author: ezheleznyakov Date: 2007-10-05 10:44:37 -0400 (Fri, 05 Oct 2007) New Revision: 4031 Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml Log: http://jira.jboss.com/jira/browse/JBIDE-847 Create templates for <a4j:push/> and <a4j:portlet/> components. Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml =================================================================== --- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2007-10-05 14:44:18 UTC (rev 4030) +++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2007-10-05 14:44:37 UTC (rev 4031) @@ -314,5 +314,15 @@ <vpe:template children="yes" modify="no"> </vpe:template> </vpe:tag> + + <vpe:tag name="a4j:portlet" case-sensitive="yes"> + <vpe:template children="yes" modify="no"> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:push" case-sensitive="yes"> + <vpe:template children="yes" modify="no"> + </vpe:template> + </vpe:tag> </vpe:templates> \ No newline at end of file

17 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r4030 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates.

by jbosstools-commits＠lists.jboss.org

Author: ezheleznyakov Date: 2007-10-05 10:44:18 -0400 (Fri, 05 Oct 2007) New Revision: 4030 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml Log: http://jira.jboss.com/jira/browse/JBIDE-847 Create templates for <a4j:push/> and <a4j:portlet/> components. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2007-10-05 14:35:19 UTC (rev 4029) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2007-10-05 14:44:18 UTC (rev 4030) @@ -314,5 +314,15 @@ <vpe:template children="yes" modify="no"> </vpe:template> </vpe:tag> + + <vpe:tag name="a4j:portlet" case-sensitive="yes"> + <vpe:template children="yes" modify="no"> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:push" case-sensitive="yes"> + <vpe:template children="yes" modify="no"> + </vpe:template> + </vpe:tag> </vpe:templates> \ No newline at end of file

17 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r4029 - branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates.

by jbosstools-commits＠lists.jboss.org

Author: ezheleznyakov Date: 2007-10-05 10:35:19 -0400 (Fri, 05 Oct 2007) New Revision: 4029 Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml Log: http://jira.jboss.com/jira/browse/JBIDE-847 Create templates for <rich:dragListener/> and <rich:dropListener/> components. Modified: branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml =================================================================== --- branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2007-10-05 14:34:56 UTC (rev 4028) +++ branches/jbosstools_xulrunner/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2007-10-05 14:35:19 UTC (rev 4029) @@ -638,5 +638,19 @@ <vpe:pseudoContent defaultText="yes" /> </vpe:template> </vpe:tag> + + <vpe:tag name="rich:dragListener" case-sensitive="yes"> + <vpe:template children="no" modify="yes"> + <span style="display:none"> + </span> + </vpe:template> + </vpe:tag> + + <vpe:tag name="rich:dropListener" case-sensitive="yes"> + <vpe:template children="no" modify="yes"> + <span style="display:none"> + </span> + </vpe:template> + </vpe:tag> </vpe:templates> \ No newline at end of file

17 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2007