You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gu...@apache.org on 2010/05/18 17:13:31 UTC
svn commit: r945691 [24/39] - in
/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src:
main/java/org.apache.commons.scxml.diagram/
main/java/org.apache.commons.scxml.diagram/META-INF/
main/java/org.apache.commons.scxml.diagram/icons/obj16/ main/java/org....
Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingPropertySection.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingPropertySection.java?rev=945691&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingPropertySection.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingPropertySection.java Tue May 18 15:13:13 2010
@@ -0,0 +1,117 @@
+package org.apache.commons.scxml.modeling.diagram.sheet;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.ui.provider.PropertySource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.properties.sections.AdvancedPropertySection;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.views.properties.IPropertySource;
+import org.eclipse.ui.views.properties.IPropertySourceProvider;
+
+/**
+ * @generated
+ */
+public class ModelingPropertySection extends AdvancedPropertySection implements
+ IPropertySourceProvider {
+
+ /**
+ * @generated
+ */
+ public IPropertySource getPropertySource(Object object) {
+ if (object instanceof IPropertySource) {
+ return (IPropertySource) object;
+ }
+ AdapterFactory af = getAdapterFactory(object);
+ if (af != null) {
+ IItemPropertySource ips = (IItemPropertySource) af.adapt(object,
+ IItemPropertySource.class);
+ if (ips != null) {
+ return new PropertySource(object, ips);
+ }
+ }
+ if (object instanceof IAdaptable) {
+ return (IPropertySource) ((IAdaptable) object)
+ .getAdapter(IPropertySource.class);
+ }
+ return null;
+ }
+
+ /**
+ * @generated
+ */
+ protected IPropertySourceProvider getPropertySourceProvider() {
+ return this;
+ }
+
+ /**
+ * Modify/unwrap selection.
+ * @generated
+ */
+ protected Object transformSelection(Object selected) {
+
+ if (selected instanceof EditPart) {
+ Object model = ((EditPart) selected).getModel();
+ return model instanceof View ? ((View) model).getElement() : null;
+ }
+ if (selected instanceof View) {
+ return ((View) selected).getElement();
+ }
+ if (selected instanceof IAdaptable) {
+ View view = (View) ((IAdaptable) selected).getAdapter(View.class);
+ if (view != null) {
+ return view.getElement();
+ }
+ }
+ return selected;
+ }
+
+ /**
+ * @generated
+ */
+ public void setInput(IWorkbenchPart part, ISelection selection) {
+ if (selection.isEmpty()
+ || false == selection instanceof StructuredSelection) {
+ super.setInput(part, selection);
+ return;
+ }
+ final StructuredSelection structuredSelection = ((StructuredSelection) selection);
+ ArrayList transformedSelection = new ArrayList(structuredSelection
+ .size());
+ for (Iterator it = structuredSelection.iterator(); it.hasNext();) {
+ Object r = transformSelection(it.next());
+ if (r != null) {
+ transformedSelection.add(r);
+ }
+ }
+ super.setInput(part, new StructuredSelection(transformedSelection));
+ }
+
+ /**
+ * @generated
+ */
+ protected AdapterFactory getAdapterFactory(Object object) {
+ if (getEditingDomain() instanceof AdapterFactoryEditingDomain) {
+ return ((AdapterFactoryEditingDomain) getEditingDomain())
+ .getAdapterFactory();
+ }
+ TransactionalEditingDomain editingDomain = TransactionUtil
+ .getEditingDomain(object);
+ if (editingDomain != null) {
+ return ((AdapterFactoryEditingDomain) editingDomain)
+ .getAdapterFactory();
+ }
+ return null;
+ }
+
+}
Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingPropertySection.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingSheetLabelProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingSheetLabelProvider.java?rev=945691&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingSheetLabelProvider.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingSheetLabelProvider.java Tue May 18 15:13:13 2010
@@ -0,0 +1,80 @@
+package org.apache.commons.scxml.modeling.diagram.sheet;
+
+import org.apache.commons.scxml.modeling.diagram.navigator.ModelingNavigatorGroup;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingDiagramEditorPlugin;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.DecoratingLabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @generated
+ */
+public class ModelingSheetLabelProvider extends DecoratingLabelProvider {
+
+ /**
+ * @generated
+ */
+ public ModelingSheetLabelProvider() {
+ super(new AdapterFactoryLabelProvider(ModelingDiagramEditorPlugin
+ .getInstance().getItemProvidersAdapterFactory()), null);
+ }
+
+ /**
+ * @generated
+ */
+ public String getText(Object element) {
+ Object selected = unwrap(element);
+ if (selected instanceof ModelingNavigatorGroup) {
+ return ((ModelingNavigatorGroup) selected).getGroupName();
+ }
+ return super.getText(selected);
+ }
+
+ /**
+ * @generated
+ */
+ public Image getImage(Object element) {
+ return super.getImage(unwrap(element));
+ }
+
+ /**
+ * @generated
+ */
+ private Object unwrap(Object element) {
+ if (element instanceof IStructuredSelection) {
+ return unwrap(((IStructuredSelection) element).getFirstElement());
+ }
+ if (element instanceof EditPart) {
+ return unwrapEditPart((EditPart) element);
+ }
+ if (element instanceof IAdaptable) {
+ View view = (View) ((IAdaptable) element).getAdapter(View.class);
+ if (view != null) {
+ return unwrapView(view);
+ }
+ }
+ return element;
+ }
+
+ /**
+ * @generated
+ */
+ private Object unwrapEditPart(EditPart p) {
+ if (p.getModel() instanceof View) {
+ return unwrapView((View) p.getModel());
+ }
+ return p.getModel();
+ }
+
+ /**
+ * @generated
+ */
+ private Object unwrapView(View view) {
+ return view.getElement() == null ? view : view.getElement();
+ }
+
+}
Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/sheet/ModelingSheetLabelProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Anchor2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Anchor2ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Anchor2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Anchor2ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -21,7 +5,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorType2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -51,7 +35,7 @@ public class Anchor2ViewFactory extends
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(Anchor2EditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -62,8 +46,12 @@ public class Anchor2ViewFactory extends
if (eObject != null) {
eObjectAdapter = new EObjectAdapter(eObject);
}
- getViewService().createNode(eObjectAdapter, view,
- ScxmlVisualIDRegistry.getType(AnchorType2EditPart.VISUAL_ID),
- ViewUtil.APPEND, true, getPreferencesHint());
+ getViewService()
+ .createNode(
+ eObjectAdapter,
+ view,
+ ModelingVisualIDRegistry
+ .getType(AnchorType2EditPart.VISUAL_ID),
+ ViewUtil.APPEND, true, getPreferencesHint());
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorType2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorType2ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorType2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorType2ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorTypeViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorTypeViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorTypeViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorTypeViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AnchorViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -21,7 +5,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorEditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorTypeEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -51,7 +35,7 @@ public class AnchorViewFactory extends A
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(AnchorEditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -63,7 +47,7 @@ public class AnchorViewFactory extends A
eObjectAdapter = new EObjectAdapter(eObject);
}
getViewService().createNode(eObjectAdapter, view,
- ScxmlVisualIDRegistry.getType(AnchorTypeEditPart.VISUAL_ID),
+ ModelingVisualIDRegistry.getType(AnchorTypeEditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -22,7 +6,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataid2EditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignExpr2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -52,7 +36,7 @@ public class Assign2ViewFactory extends
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(Assign2EditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -63,11 +47,18 @@ public class Assign2ViewFactory extends
if (eObject != null) {
eObjectAdapter = new EObjectAdapter(eObject);
}
- getViewService().createNode(eObjectAdapter, view,
- ScxmlVisualIDRegistry.getType(AssignDataid2EditPart.VISUAL_ID),
- ViewUtil.APPEND, true, getPreferencesHint());
- getViewService().createNode(eObjectAdapter, view,
- ScxmlVisualIDRegistry.getType(AssignExpr2EditPart.VISUAL_ID),
+ getViewService().createNode(
+ eObjectAdapter,
+ view,
+ ModelingVisualIDRegistry
+ .getType(AssignDataid2EditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
+ getViewService()
+ .createNode(
+ eObjectAdapter,
+ view,
+ ModelingVisualIDRegistry
+ .getType(AssignExpr2EditPart.VISUAL_ID),
+ ViewUtil.APPEND, true, getPreferencesHint());
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid2ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid2ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataidViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataidViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataidViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataidViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExpr2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExpr2ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExpr2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExpr2ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExprViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExprViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExprViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignExprViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -22,7 +6,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataidEditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignEditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignExprEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -52,7 +36,7 @@ public class AssignViewFactory extends A
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(AssignEditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -63,11 +47,14 @@ public class AssignViewFactory extends A
if (eObject != null) {
eObjectAdapter = new EObjectAdapter(eObject);
}
- getViewService().createNode(eObjectAdapter, view,
- ScxmlVisualIDRegistry.getType(AssignDataidEditPart.VISUAL_ID),
+ getViewService().createNode(
+ eObjectAdapter,
+ view,
+ ModelingVisualIDRegistry
+ .getType(AssignDataidEditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
getViewService().createNode(eObjectAdapter, view,
- ScxmlVisualIDRegistry.getType(AssignExprEditPart.VISUAL_ID),
+ ModelingVisualIDRegistry.getType(AssignExprEditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel2ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel2ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -21,7 +5,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelSendid2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -51,7 +35,7 @@ public class Cancel2ViewFactory extends
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(Cancel2EditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -62,8 +46,11 @@ public class Cancel2ViewFactory extends
if (eObject != null) {
eObjectAdapter = new EObjectAdapter(eObject);
}
- getViewService().createNode(eObjectAdapter, view,
- ScxmlVisualIDRegistry.getType(CancelSendid2EditPart.VISUAL_ID),
+ getViewService().createNode(
+ eObjectAdapter,
+ view,
+ ModelingVisualIDRegistry
+ .getType(CancelSendid2EditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid2ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid2ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendidViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendidViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendidViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendidViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -21,7 +5,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelEditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelSendidEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -51,7 +35,7 @@ public class CancelViewFactory extends A
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(CancelEditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -62,8 +46,11 @@ public class CancelViewFactory extends A
if (eObject != null) {
eObjectAdapter = new EObjectAdapter(eObject);
}
- getViewService().createNode(eObjectAdapter, view,
- ScxmlVisualIDRegistry.getType(CancelSendidEditPart.VISUAL_ID),
+ getViewService().createNode(
+ eObjectAdapter,
+ view,
+ ModelingVisualIDRegistry
+ .getType(CancelSendidEditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content2ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content2ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -21,7 +5,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -51,7 +35,7 @@ public class Content2ViewFactory extends
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(Content2EditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -65,7 +49,7 @@ public class Content2ViewFactory extends
getViewService().createNode(
eObjectAdapter,
view,
- ScxmlVisualIDRegistry
+ ModelingVisualIDRegistry
.getType(ContentContentCompartment2EditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content3ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content3ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content3ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content3ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -21,7 +5,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.Content3EditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment3EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -51,7 +35,7 @@ public class Content3ViewFactory extends
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(Content3EditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -65,7 +49,7 @@ public class Content3ViewFactory extends
getViewService().createNode(
eObjectAdapter,
view,
- ScxmlVisualIDRegistry
+ ModelingVisualIDRegistry
.getType(ContentContentCompartment3EditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content4ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content4ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content4ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content4ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -21,7 +5,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.Content4EditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment4EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -51,7 +35,7 @@ public class Content4ViewFactory extends
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(Content4EditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -65,7 +49,7 @@ public class Content4ViewFactory extends
getViewService().createNode(
eObjectAdapter,
view,
- ScxmlVisualIDRegistry
+ ModelingVisualIDRegistry
.getType(ContentContentCompartment4EditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content5ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content5ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content5ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content5ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -21,7 +5,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.Content5EditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment5EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -51,7 +35,7 @@ public class Content5ViewFactory extends
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(Content5EditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -65,7 +49,7 @@ public class Content5ViewFactory extends
getViewService().createNode(
eObjectAdapter,
view,
- ScxmlVisualIDRegistry
+ ModelingVisualIDRegistry
.getType(ContentContentCompartment5EditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment2ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment2ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment2ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment2ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
import org.eclipse.gmf.runtime.notation.DrawerStyle;
@@ -51,7 +35,7 @@ public class ContentContentCompartment2V
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(ContentContentCompartment2EditPart.VISUAL_ID);
view.setType(semanticHint);
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment3ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment3ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment3ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment3ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment3EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
import org.eclipse.gmf.runtime.notation.DrawerStyle;
@@ -51,7 +35,7 @@ public class ContentContentCompartment3V
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(ContentContentCompartment3EditPart.VISUAL_ID);
view.setType(semanticHint);
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment4ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment4ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment4ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment4ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment4EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
import org.eclipse.gmf.runtime.notation.DrawerStyle;
@@ -51,7 +35,7 @@ public class ContentContentCompartment4V
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(ContentContentCompartment4EditPart.VISUAL_ID);
view.setType(semanticHint);
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment5ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment5ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment5ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment5ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment5EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
import org.eclipse.gmf.runtime.notation.DrawerStyle;
@@ -51,7 +35,7 @@ public class ContentContentCompartment5V
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(ContentContentCompartment5EditPart.VISUAL_ID);
view.setType(semanticHint);
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartmentViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartmentViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartmentViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartmentViewFactory.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
import org.eclipse.gmf.runtime.notation.DrawerStyle;
@@ -51,7 +35,7 @@ public class ContentContentCompartmentVi
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(ContentContentCompartmentEditPart.VISUAL_ID);
view.setType(semanticHint);
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -21,7 +5,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartmentEditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -51,7 +35,7 @@ public class ContentViewFactory extends
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(ContentEditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -65,7 +49,7 @@ public class ContentViewFactory extends
getViewService().createNode(
eObjectAdapter,
view,
- ScxmlVisualIDRegistry
+ ModelingVisualIDRegistry
.getType(ContentContentCompartmentEditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataDataCompartmentViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataDataCompartmentViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataDataCompartmentViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataDataCompartmentViewFactory.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.DataDataCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
import org.eclipse.gmf.runtime.notation.DrawerStyle;
@@ -52,7 +36,7 @@ public class DataDataCompartmentViewFact
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(DataDataCompartmentEditPart.VISUAL_ID);
view.setType(semanticHint);
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataIdViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataIdViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataIdViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataIdViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelDataModelCompartmentViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelDataModelCompartmentViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelDataModelCompartmentViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelDataModelCompartmentViewFactory.java Tue May 18 15:13:13 2010
@@ -1,26 +1,10 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelDataModelCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
import org.eclipse.gmf.runtime.notation.DrawerStyle;
@@ -53,7 +37,7 @@ public class DataModelDataModelCompartme
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(DataModelDataModelCompartmentEditPart.VISUAL_ID);
view.setType(semanticHint);
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelSchemaViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelSchemaViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelSchemaViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelSchemaViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -23,7 +7,7 @@ import org.apache.commons.scxml.modeling
import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelEditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelSchemaEditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EObject;
@@ -55,13 +39,13 @@ public class DataModelViewFactory extend
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(DataModelEditPart.VISUAL_ID);
view.setType(semanticHint);
}
super.decorateView(containerView, view, semanticAdapter, semanticHint,
index, persisted);
- if (!ServiceTemplateEditPart.MODEL_ID.equals(ScxmlVisualIDRegistry
+ if (!ServiceTemplateEditPart.MODEL_ID.equals(ModelingVisualIDRegistry
.getModelID(containerView))) {
EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE
.createEAnnotation();
@@ -78,14 +62,14 @@ public class DataModelViewFactory extend
getViewService().createNode(
eObjectAdapter,
view,
- ScxmlVisualIDRegistry
+ ModelingVisualIDRegistry
.getType(DataModelSchemaEditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
getViewService()
.createNode(
eObjectAdapter,
view,
- ScxmlVisualIDRegistry
+ ModelingVisualIDRegistry
.getType(DataModelDataModelCompartmentEditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.commons.scxml.modeling.diagram.view.factories;
import java.util.ArrayList;
@@ -22,7 +6,7 @@ import java.util.List;
import org.apache.commons.scxml.modeling.diagram.edit.parts.DataDataCompartmentEditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.DataEditPart;
import org.apache.commons.scxml.modeling.diagram.edit.parts.DataIdEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
@@ -52,7 +36,7 @@ public class DataViewFactory extends Abs
IAdaptable semanticAdapter, String semanticHint, int index,
boolean persisted) {
if (semanticHint == null) {
- semanticHint = ScxmlVisualIDRegistry
+ semanticHint = ModelingVisualIDRegistry
.getType(DataEditPart.VISUAL_ID);
view.setType(semanticHint);
}
@@ -64,12 +48,12 @@ public class DataViewFactory extends Abs
eObjectAdapter = new EObjectAdapter(eObject);
}
getViewService().createNode(eObjectAdapter, view,
- ScxmlVisualIDRegistry.getType(DataIdEditPart.VISUAL_ID),
+ ModelingVisualIDRegistry.getType(DataIdEditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
getViewService().createNode(
eObjectAdapter,
view,
- ScxmlVisualIDRegistry
+ ModelingVisualIDRegistry
.getType(DataDataCompartmentEditPart.VISUAL_ID),
ViewUtil.APPEND, true, getPreferencesHint());
}