[jbosstools-commits] JBoss Tools SVN: r31103 - in workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui: META-INF and 2 other directories.

Author: bfitzpat Date: 2011-05-05 10:32:39 -0400 (Thu, 05 May 2011) New Revision: 31103 Removed: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/.apt_generated/org/jboss/tools/esb/ Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/META-INF/MANIFEST.MF workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponent.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponentService.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponentServiceReference.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComposite.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IImplementationBean.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IInterfaceJava.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ISOAPBinding.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IService.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ITransformJava.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ITransformSmooks.java workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ui/SwitchyardGraphicalEditor.java Log: JBIDE-8714 - Updated editor to fix compile errors introduced by recent Sapphire framework updates. Editor is in a non-working state due for the moment, but am working through those issues. Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/META-INF/MANIFEST.MF =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/META-INF/MANIFEST.MF 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/META-INF/MANIFEST.MF 2011-05-05 14:32:39 UTC (rev 31103) @@ -18,7 +18,8 @@ org.eclipse.ui.views, org.eclipse.help, org.eclipse.ui.views.properties.tabbed, - org.eclipse.ui.ide + org.eclipse.ui.ide, + org.eclipse.sapphire.workspace Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: JBoss.org Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponent.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponent.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponent.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -8,7 +8,7 @@ import org.eclipse.sapphire.modeling.ValueProperty; import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding; import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding; @@ -28,7 +28,7 @@ @XmlBinding( path = "@name" ) @Label( standard = "&Name" ) - @NonNullValue + @Required ValueProperty PROP_NAME = new ValueProperty( TYPE, "Name" ); Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponentService.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponentService.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponentService.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -8,7 +8,7 @@ import org.eclipse.sapphire.modeling.ValueProperty; import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding; import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding; @@ -25,7 +25,7 @@ @XmlBinding( path = "@name" ) @Label( standard = "&Name" ) - @NonNullValue + @Required ValueProperty PROP_NAME = new ValueProperty( TYPE, "Name" ); Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponentServiceReference.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponentServiceReference.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComponentServiceReference.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -8,7 +8,7 @@ import org.eclipse.sapphire.modeling.ValueProperty; import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding; import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding; @@ -25,7 +25,7 @@ @XmlBinding( path = "@name" ) @Label( standard = "&Name" ) - @NonNullValue + @Required ValueProperty PROP_NAME = new ValueProperty( TYPE, "Name" ); Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComposite.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComposite.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IComposite.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -8,7 +8,7 @@ import org.eclipse.sapphire.modeling.ValueProperty; import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding; import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding; @@ -23,7 +23,7 @@ @XmlBinding( path = "@name" ) @Label( standard = "&Name" ) - @NonNullValue + @Required ValueProperty PROP_NAME = new ValueProperty( TYPE, "Name" ); @@ -34,7 +34,7 @@ @XmlBinding( path = "@targetNamespace" ) @Label( standard = "&Target Namespace" ) - @NonNullValue + @Required ValueProperty PROP_TARGET_NAMESPACE = new ValueProperty( TYPE, "TargetNamespace" ); Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IImplementationBean.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IImplementationBean.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IImplementationBean.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -7,7 +7,7 @@ import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; import org.eclipse.sapphire.modeling.annotations.MustExist; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.java.JavaTypeConstraint; import org.eclipse.sapphire.java.JavaTypeKind; @@ -24,7 +24,7 @@ @XmlBinding( path = "@class" ) @Label( standard = "&class" ) - @NonNullValue + @Required // ValueProperty PROP_IMPL_BEAN_CLASS = new ValueProperty( TYPE, "ImplBeanClass" ); // Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IInterfaceJava.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IInterfaceJava.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IInterfaceJava.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -7,7 +7,7 @@ import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; import org.eclipse.sapphire.modeling.annotations.MustExist; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.java.JavaTypeConstraint; import org.eclipse.sapphire.java.JavaTypeKind; @@ -24,7 +24,7 @@ @XmlBinding( path = "@interface" ) @Label( standard = "&Interface" ) - @NonNullValue + @Required // ValueProperty PROP_JAVA_INTERFACE = new ValueProperty( TYPE, "JavaInterface" ); // Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ISOAPBinding.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ISOAPBinding.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ISOAPBinding.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -1,23 +1,22 @@ package org.jboss.tools.esb.switchyard; -import org.eclipse.core.runtime.IPath; import org.eclipse.sapphire.modeling.IModelElement; import org.eclipse.sapphire.modeling.ModelElementType; +import org.eclipse.sapphire.modeling.Path; import org.eclipse.sapphire.modeling.Value; import org.eclipse.sapphire.modeling.ValueProperty; -import org.eclipse.sapphire.modeling.annotations.BasePathsProvider; import org.eclipse.sapphire.modeling.annotations.DefaultValue; import org.eclipse.sapphire.modeling.annotations.FileSystemResourceType; import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; import org.eclipse.sapphire.modeling.annotations.LongString; import org.eclipse.sapphire.modeling.annotations.MustExist; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.modeling.annotations.ValidFileExtensions; import org.eclipse.sapphire.modeling.annotations.ValidFileSystemResourceType; import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding; -import org.eclipse.sapphire.ui.def.internal.ProjectRootBasePathsProvider; +import org.eclipse.sapphire.workspace.ProjectRelativePath; @GenerateImpl @@ -28,8 +27,8 @@ // *** serverPort *** @XmlBinding( path = "port" ) @Label( standard = "&Port" ) - @NonNullValue - + @Required + ValueProperty PROP_PORT = new ValueProperty( TYPE, "Port" ); Value<String> getPort(); @@ -39,25 +38,20 @@ @XmlBinding( path = "wsdl" ) @Label( standard = "&WSDL" ) - @NonNullValue + @Required - @Type( base = IPath.class ) - @BasePathsProvider( ProjectRootBasePathsProvider.class ) + @Type( base = Path.class ) + @ProjectRelativePath + @MustExist @ValidFileSystemResourceType( FileSystemResourceType.FILE ) @ValidFileExtensions( "wsdl" ) - @MustExist ValueProperty PROP_WSDL = new ValueProperty( TYPE, "WSDL" ); - Value<IPath> getWsdl(); + Value<Path> getWsdl(); void setWsdl( String value ); - void setWsdl( IPath value ); + void setWsdl( Path value ); -// ValueProperty PROP_WSDL = new ValueProperty( TYPE, "WSDL" ); -// -// Value<String> getWsdl(); -// void setWsdl( String value ); - // *** secure *** @Type( base = Boolean.class) Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IService.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IService.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/IService.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -8,7 +8,7 @@ import org.eclipse.sapphire.modeling.ValueProperty; import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding; import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding; @@ -25,7 +25,7 @@ @XmlBinding( path = "@name" ) @Label( standard = "&Name" ) - @NonNullValue + @Required ValueProperty PROP_NAME = new ValueProperty( TYPE, "Name" ); @@ -36,7 +36,7 @@ @XmlBinding( path = "@promote" ) @Label( standard = "&Promote" ) - @NonNullValue + @Required ValueProperty PROP_PROMOTE = new ValueProperty( TYPE, "Promote" ); Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ITransformJava.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ITransformJava.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ITransformJava.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -7,7 +7,7 @@ import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; import org.eclipse.sapphire.modeling.annotations.MustExist; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.java.JavaTypeConstraint; import org.eclipse.sapphire.java.JavaTypeKind; @@ -24,7 +24,7 @@ @XmlBinding( path = "@from" ) @Label( standard = "&from" ) - @NonNullValue + @Required ValueProperty PROP_TRANSFORM_JAVA_FROM = new ValueProperty( TYPE, "TransformJavaFrom" ); @@ -35,7 +35,7 @@ @XmlBinding( path = "@to" ) @Label( standard = "&To" ) - @NonNullValue + @Required ValueProperty PROP_TRANSFORM_JAVA_TO = new ValueProperty( TYPE, "TransformJavaTo" ); @@ -46,7 +46,7 @@ @XmlBinding( path = "@class" ) @Label( standard = "&class" ) - @NonNullValue + @Required // ValueProperty PROP_TRANSFORM_JAVA_CLASS = new ValueProperty( TYPE, "TransformJavaClass" ); // Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ITransformSmooks.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ITransformSmooks.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ITransformSmooks.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -1,22 +1,21 @@ package org.jboss.tools.esb.switchyard; -import org.eclipse.core.runtime.IPath; import org.eclipse.sapphire.modeling.IModelElement; import org.eclipse.sapphire.modeling.ModelElementType; +import org.eclipse.sapphire.modeling.Path; import org.eclipse.sapphire.modeling.Value; import org.eclipse.sapphire.modeling.ValueProperty; -import org.eclipse.sapphire.modeling.annotations.BasePathsProvider; import org.eclipse.sapphire.modeling.annotations.FileSystemResourceType; import org.eclipse.sapphire.modeling.annotations.GenerateImpl; import org.eclipse.sapphire.modeling.annotations.Label; import org.eclipse.sapphire.modeling.annotations.MustExist; -import org.eclipse.sapphire.modeling.annotations.NonNullValue; +import org.eclipse.sapphire.modeling.annotations.Required; import org.eclipse.sapphire.modeling.annotations.Type; import org.eclipse.sapphire.modeling.annotations.ValidFileExtensions; import org.eclipse.sapphire.modeling.annotations.ValidFileSystemResourceType; import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding; import org.eclipse.sapphire.modeling.xml.annotations.XmlNamespace; -import org.eclipse.sapphire.ui.def.internal.ProjectRootBasePathsProvider; +import org.eclipse.sapphire.workspace.ProjectRelativePath; @GenerateImpl @XmlNamespace( uri = "urn:switchyard-config:test-smooks:1.0", prefix = "smooks" ) @@ -29,7 +28,7 @@ @XmlBinding( path = "@from" ) @Label( standard = "&From" ) - @NonNullValue + @Required ValueProperty PROP_TRANSFORM_SMOOKS_FROM = new ValueProperty( TYPE, "TransformSmooksFrom" ); @@ -40,7 +39,7 @@ @XmlBinding( path = "@to" ) @Label( standard = "&To" ) - @NonNullValue + @Required ValueProperty PROP_TRANSFORM_SMOOKS_TO = new ValueProperty( TYPE, "TransformSmooksTo" ); @@ -51,17 +50,17 @@ @XmlBinding( path = "smooks:config" ) @Label( standard = "&Smooks Config" ) - @NonNullValue - @Type( base = IPath.class ) - @BasePathsProvider( ProjectRootBasePathsProvider.class ) + @ProjectRelativePath + @Required + @Type( base = Path.class ) @ValidFileSystemResourceType( FileSystemResourceType.FILE ) @ValidFileExtensions( "xml" ) @MustExist ValueProperty PROP_TRANSFORM_SMOOKS_CONFIG = new ValueProperty( TYPE, "TransformSmooksConfig" ); - Value<IPath> getTransformSmooksConfig(); + Value<Path> getTransformSmooksConfig(); void setTransformSmooksConfig( String value ); - void setTransformSmooksConfig( IPath value ); + void setTransformSmooksConfig( Path value ); } Modified: workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ui/SwitchyardGraphicalEditor.java =================================================================== --- workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ui/SwitchyardGraphicalEditor.java 2011-05-05 14:31:15 UTC (rev 31102) +++ workspace/bfitzpat/org.jboss.tools.esb.switchyard.ui/src/org/jboss/tools/esb/switchyard/ui/SwitchyardGraphicalEditor.java 2011-05-05 14:32:39 UTC (rev 31103) @@ -7,7 +7,7 @@ import org.eclipse.sapphire.modeling.IModelElement; import org.eclipse.sapphire.modeling.xml.RootXmlResource; import org.eclipse.sapphire.ui.SapphireEditor; -import org.eclipse.sapphire.ui.editor.views.masterdetails.MasterDetailsPage; +import org.eclipse.sapphire.ui.form.editors.masterdetails.MasterDetailsEditorPage; import org.eclipse.sapphire.ui.internal.SapphireUiFrameworkPlugin; import org.eclipse.sapphire.ui.swt.graphiti.editor.SapphireDiagramEditor; import org.eclipse.sapphire.ui.swt.graphiti.editor.SapphireDiagramEditorFactory; @@ -23,7 +23,7 @@ private ISwitchyard modelSwitchyard; private StructuredTextEditor switchyardSourceEditor; private SapphireDiagramEditor switchyardDiagramEditor; - private MasterDetailsPage switchyardFormPage; + private MasterDetailsEditorPage switchyardFormPage; private final static int FORM_PAGE = 0; private final static int DIAGRAM_PAGE = 1; @@ -70,7 +70,7 @@ { addPage(DIAGRAM_PAGE, switchyardDiagramEditor, diagramEditorInput); setPageText( DIAGRAM_PAGE, "Diagram" ); - setPageId(this.pages.get(DIAGRAM_PAGE), "Diagram"); + setPageId(this.pages.get(DIAGRAM_PAGE), "Diagram", this.switchyardDiagramEditor.getPart()); } } @@ -78,10 +78,10 @@ protected void createFormPages() throws PartInitException { IPath path = new Path( "org.jboss.tools.esb.switchyard.ui/sdefs/switchyard-0.4.sdef/main" ); - this.switchyardFormPage = new MasterDetailsPage(this, this.modelSwitchyard, path); + this.switchyardFormPage = new MasterDetailsEditorPage(this, this.modelSwitchyard, path); addPage(FORM_PAGE, this.switchyardFormPage); setPageText(FORM_PAGE, "Overview"); - setPageId(this.pages.get(FORM_PAGE), "Overview"); + setPageId(this.pages.get(FORM_PAGE), "Overview", this.switchyardDiagramEditor.getPart()); } @Override