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 [9/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.a...
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/SendSendCompartmentEditPart.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/edit/parts/SendSendCompartmentEditPart.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/edit/parts/SendSendCompartmentEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/SendSendCompartmentEditPart.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.edit.parts;
import org.apache.commons.scxml.modeling.diagram.edit.policies.SendSendCompartmentCanonicalEditPolicy;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ServiceTemplateEditPart.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/edit/parts/ServiceTemplateEditPart.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/edit/parts/ServiceTemplateEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ServiceTemplateEditPart.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.edit.parts;
import org.apache.commons.scxml.modeling.diagram.edit.policies.ServiceTemplateCanonicalEditPolicy;
@@ -30,7 +14,7 @@ public class ServiceTemplateEditPart ext
/**
* @generated
*/
- public final static String MODEL_ID = "Scxml"; //$NON-NLS-1$
+ public final static String MODEL_ID = "Modeling"; //$NON-NLS-1$
/**
* @generated
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/State2EditPart.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/edit/parts/State2EditPart.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/edit/parts/State2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/State2EditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.edit.parts;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
import org.apache.commons.scxml.modeling.diagram.edit.policies.State2ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.RoundedRectangle;
import org.eclipse.draw2d.StackLayout;
@@ -88,7 +72,7 @@ public class State2EditPart extends Shap
protected EditPolicy createChildEditPolicy(EditPart child) {
if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
if (child instanceof ITextAwareEditPart) {
- return new ScxmlTextSelectionEditPolicy();
+ return new ModelingTextSelectionEditPolicy();
}
}
return super.createChildEditPolicy(child);
@@ -215,7 +199,7 @@ public class State2EditPart extends Shap
* @generated
*/
public EditPart getPrimaryChildEditPart() {
- return getChildBySemanticHint(ScxmlVisualIDRegistry
+ return getChildBySemanticHint(ModelingVisualIDRegistry
.getType(StateId2EditPart.VISUAL_ID));
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/State3EditPart.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/edit/parts/State3EditPart.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/edit/parts/State3EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/State3EditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.edit.parts;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
import org.apache.commons.scxml.modeling.diagram.edit.policies.State3ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.RoundedRectangle;
import org.eclipse.draw2d.StackLayout;
@@ -88,7 +72,7 @@ public class State3EditPart extends Shap
protected EditPolicy createChildEditPolicy(EditPart child) {
if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
if (child instanceof ITextAwareEditPart) {
- return new ScxmlTextSelectionEditPolicy();
+ return new ModelingTextSelectionEditPolicy();
}
}
return super.createChildEditPolicy(child);
@@ -215,7 +199,7 @@ public class State3EditPart extends Shap
* @generated
*/
public EditPart getPrimaryChildEditPart() {
- return getChildBySemanticHint(ScxmlVisualIDRegistry
+ return getChildBySemanticHint(ModelingVisualIDRegistry
.getType(StateId3EditPart.VISUAL_ID));
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateEditPart.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/edit/parts/StateEditPart.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/edit/parts/StateEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateEditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.edit.parts;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
import org.apache.commons.scxml.modeling.diagram.edit.policies.StateItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.RoundedRectangle;
import org.eclipse.draw2d.StackLayout;
@@ -88,7 +72,7 @@ public class StateEditPart extends Shape
protected EditPolicy createChildEditPolicy(EditPart child) {
if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
if (child instanceof ITextAwareEditPart) {
- return new ScxmlTextSelectionEditPolicy();
+ return new ModelingTextSelectionEditPolicy();
}
}
return super.createChildEditPolicy(child);
@@ -215,7 +199,7 @@ public class StateEditPart extends Shape
* @generated
*/
public EditPart getPrimaryChildEditPart() {
- return getChildBySemanticHint(ScxmlVisualIDRegistry
+ return getChildBySemanticHint(ModelingVisualIDRegistry
.getType(StateIdEditPart.VISUAL_ID));
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateId2EditPart.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/edit/parts/StateId2EditPart.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/edit/parts/StateId2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateId2EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -214,7 +198,7 @@ public class StateId2EditPart extends Co
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -240,8 +224,8 @@ public class StateId2EditPart extends Co
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -321,8 +305,8 @@ public class StateId2EditPart extends Co
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.State_2038, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.State_2038, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -335,7 +319,7 @@ public class StateId2EditPart extends Co
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -429,8 +413,8 @@ public class StateId2EditPart extends Co
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateId3EditPart.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/edit/parts/StateId3EditPart.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/edit/parts/StateId3EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateId3EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -214,7 +198,7 @@ public class StateId3EditPart extends Co
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -240,8 +224,8 @@ public class StateId3EditPart extends Co
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -321,8 +305,8 @@ public class StateId3EditPart extends Co
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.State_2046, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.State_2046, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -335,7 +319,7 @@ public class StateId3EditPart extends Co
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -429,8 +413,8 @@ public class StateId3EditPart extends Co
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateIdEditPart.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/edit/parts/StateIdEditPart.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/edit/parts/StateIdEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateIdEditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -214,7 +198,7 @@ public class StateIdEditPart extends Com
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -240,8 +224,8 @@ public class StateIdEditPart extends Com
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -321,8 +305,8 @@ public class StateIdEditPart extends Com
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.State_1001, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.State_1001, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -335,7 +319,7 @@ public class StateIdEditPart extends Com
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -429,8 +413,8 @@ public class StateIdEditPart extends Com
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateStateCompartment2EditPart.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/edit/parts/StateStateCompartment2EditPart.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/edit/parts/StateStateCompartment2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateStateCompartment2EditPart.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.edit.parts;
import org.apache.commons.scxml.modeling.diagram.edit.policies.StateStateCompartment2CanonicalEditPolicy;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateStateCompartment3EditPart.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/edit/parts/StateStateCompartment3EditPart.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/edit/parts/StateStateCompartment3EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateStateCompartment3EditPart.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.edit.parts;
import org.apache.commons.scxml.modeling.diagram.edit.policies.StateStateCompartment3CanonicalEditPolicy;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateStateCompartmentEditPart.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/edit/parts/StateStateCompartmentEditPart.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/edit/parts/StateStateCompartmentEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/StateStateCompartmentEditPart.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.edit.parts;
import org.apache.commons.scxml.modeling.diagram.edit.policies.StateStateCompartmentCanonicalEditPolicy;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/TranslationEditPart.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/edit/parts/TranslationEditPart.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/edit/parts/TranslationEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/TranslationEditPart.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.edit.parts;
import org.apache.commons.scxml.modeling.diagram.edit.policies.TranslationItemSemanticEditPolicy;
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/TranslationEventEditPart.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/edit/parts/TranslationEventEditPart.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/edit/parts/TranslationEventEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/TranslationEventEditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.ConnectionLocator;
import org.eclipse.draw2d.IFigure;
@@ -98,7 +82,7 @@ public class TranslationEventEditPart ex
*/
static {
registerSnapBackPosition(
- ScxmlVisualIDRegistry
+ ModelingVisualIDRegistry
.getType(org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEventEditPart.VISUAL_ID),
new Point(0, 40));
}
@@ -210,7 +194,7 @@ public class TranslationEventEditPart ex
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -236,8 +220,8 @@ public class TranslationEventEditPart ex
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -317,8 +301,8 @@ public class TranslationEventEditPart ex
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.Translation_3001, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.Translation_3001, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -331,7 +315,7 @@ public class TranslationEventEditPart ex
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -425,8 +409,8 @@ public class TranslationEventEditPart ex
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Validate2EditPart.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/edit/parts/Validate2EditPart.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/edit/parts/Validate2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Validate2EditPart.java Tue May 18 15:13:13 2010
@@ -1,23 +1,7 @@
-/*
- * 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.edit.parts;
import org.apache.commons.scxml.modeling.diagram.edit.policies.Validate2ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.draw2d.FlowLayout;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.RectangleFigure;
@@ -217,7 +201,7 @@ public class Validate2EditPart extends S
* @generated
*/
public EditPart getPrimaryChildEditPart() {
- return getChildBySemanticHint(ScxmlVisualIDRegistry
+ return getChildBySemanticHint(ModelingVisualIDRegistry
.getType(ValidateSchema2EditPart.VISUAL_ID));
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ValidateEditPart.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/edit/parts/ValidateEditPart.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/edit/parts/ValidateEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ValidateEditPart.java Tue May 18 15:13:13 2010
@@ -1,23 +1,7 @@
-/*
- * 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.edit.parts;
import org.apache.commons.scxml.modeling.diagram.edit.policies.ValidateItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
import org.eclipse.draw2d.FlowLayout;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.RectangleFigure;
@@ -217,7 +201,7 @@ public class ValidateEditPart extends Sh
* @generated
*/
public EditPart getPrimaryChildEditPart() {
- return getChildBySemanticHint(ScxmlVisualIDRegistry
+ return getChildBySemanticHint(ModelingVisualIDRegistry
.getType(ValidateSchemaEditPart.VISUAL_ID));
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ValidateSchema2EditPart.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/edit/parts/ValidateSchema2EditPart.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/edit/parts/ValidateSchema2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ValidateSchema2EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -214,7 +198,7 @@ public class ValidateSchema2EditPart ext
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -240,8 +224,8 @@ public class ValidateSchema2EditPart ext
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -321,8 +305,8 @@ public class ValidateSchema2EditPart ext
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.Validate_2021, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.Validate_2021, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -335,7 +319,7 @@ public class ValidateSchema2EditPart ext
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -429,8 +413,8 @@ public class ValidateSchema2EditPart ext
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ValidateSchemaEditPart.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/edit/parts/ValidateSchemaEditPart.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/edit/parts/ValidateSchemaEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ValidateSchemaEditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -214,7 +198,7 @@ public class ValidateSchemaEditPart exte
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -240,8 +224,8 @@ public class ValidateSchemaEditPart exte
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -321,8 +305,8 @@ public class ValidateSchemaEditPart exte
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.Validate_2008, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.Validate_2008, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -335,7 +319,7 @@ public class ValidateSchemaEditPart exte
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -429,8 +413,8 @@ public class ValidateSchemaEditPart exte
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel10EditPart.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/edit/parts/WrappingLabel10EditPart.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/edit/parts/WrappingLabel10EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel10EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel10EditPart ext
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -242,8 +226,8 @@ public class WrappingLabel10EditPart ext
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -323,8 +307,8 @@ public class WrappingLabel10EditPart ext
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.OnEntry_2036, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.OnEntry_2036, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -337,7 +321,7 @@ public class WrappingLabel10EditPart ext
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel10EditPart ext
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel11EditPart.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/edit/parts/WrappingLabel11EditPart.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/edit/parts/WrappingLabel11EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel11EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel11EditPart ext
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -242,8 +226,8 @@ public class WrappingLabel11EditPart ext
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -323,8 +307,8 @@ public class WrappingLabel11EditPart ext
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.OnExit_2037, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.OnExit_2037, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -337,7 +321,7 @@ public class WrappingLabel11EditPart ext
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel11EditPart ext
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel12EditPart.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/edit/parts/WrappingLabel12EditPart.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/edit/parts/WrappingLabel12EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel12EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel12EditPart ext
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -242,8 +226,8 @@ public class WrappingLabel12EditPart ext
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -323,8 +307,8 @@ public class WrappingLabel12EditPart ext
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.Donedata_2041, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.Donedata_2041, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -337,7 +321,7 @@ public class WrappingLabel12EditPart ext
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel12EditPart ext
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel13EditPart.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/edit/parts/WrappingLabel13EditPart.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/edit/parts/WrappingLabel13EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel13EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel13EditPart ext
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -242,8 +226,8 @@ public class WrappingLabel13EditPart ext
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -323,8 +307,8 @@ public class WrappingLabel13EditPart ext
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.OnEntry_2044, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.OnEntry_2044, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -337,7 +321,7 @@ public class WrappingLabel13EditPart ext
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel13EditPart ext
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel14EditPart.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/edit/parts/WrappingLabel14EditPart.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/edit/parts/WrappingLabel14EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel14EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel14EditPart ext
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -242,8 +226,8 @@ public class WrappingLabel14EditPart ext
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -323,8 +307,8 @@ public class WrappingLabel14EditPart ext
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.OnExit_2045, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.OnExit_2045, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -337,7 +321,7 @@ public class WrappingLabel14EditPart ext
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel14EditPart ext
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel2EditPart.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/edit/parts/WrappingLabel2EditPart.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/edit/parts/WrappingLabel2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel2EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel2EditPart exte
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -242,8 +226,8 @@ public class WrappingLabel2EditPart exte
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -323,8 +307,8 @@ public class WrappingLabel2EditPart exte
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.Script_1003, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.Script_1003, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -337,7 +321,7 @@ public class WrappingLabel2EditPart exte
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel2EditPart exte
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel3EditPart.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/edit/parts/WrappingLabel3EditPart.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/edit/parts/WrappingLabel3EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/WrappingLabel3EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.edit.parts;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
@@ -216,7 +200,7 @@ public class WrappingLabel3EditPart exte
if (parserElement == null) {
return null;
}
- return ScxmlElementTypes.getImage(parserElement.eClass());
+ return ModelingElementTypes.getImage(parserElement.eClass());
}
/**
@@ -242,8 +226,8 @@ public class WrappingLabel3EditPart exte
public void setLabelText(String text) {
setLabelTextHelper(getFigure(), text);
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}
@@ -323,8 +307,8 @@ public class WrappingLabel3EditPart exte
public IParser getParser() {
if (parser == null) {
String parserHint = ((View) getModel()).getType();
- IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
- ScxmlElementTypes.OnEntry_2001, getParserElement(),
+ IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+ ModelingElementTypes.OnEntry_2001, getParserElement(),
parserHint);
parser = ParserService.getInstance().getParser(hintAdapter);
}
@@ -337,7 +321,7 @@ public class WrappingLabel3EditPart exte
protected DirectEditManager getManager() {
if (manager == null) {
setManager(new TextDirectEditManager(this, TextDirectEditManager
- .getTextCellEditorClass(this), ScxmlEditPartFactory
+ .getTextCellEditorClass(this), ModelingEditPartFactory
.getTextCellEditorLocator(this)));
}
return manager;
@@ -431,8 +415,8 @@ public class WrappingLabel3EditPart exte
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
- if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
- ((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+ if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+ ((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
}
}