From 9eadbf16c0442d63979e2c2c2edcb5c93082a69b Mon Sep 17 00:00:00 2001
From: Sebastian Krings <sebastian@krin.gs>
Date: Wed, 2 Jan 2013 14:35:44 +0100
Subject: [PATCH] renamed unitPragma to unitPragmaAttribute to avoid name clash
with internal data types
---
de.prob.core/plugin.xml | 4 ++--
de.prob.ui/plugin.xml | 24 +++++++++----------
....java => InferredUnitPragmaAttribute.java} | 7 +++---
...itPragma.java => UnitPragmaAttribute.java} | 6 ++---
4 files changed, 21 insertions(+), 20 deletions(-)
rename de.prob.ui/src/de/prob/ui/pragmas/{UnitPragma.java => InferredUnitPragmaAttribute.java} (91%)
rename de.prob.ui/src/de/prob/ui/pragmas/{InferredUnitPragma.java => UnitPragmaAttribute.java} (92%)
diff --git a/de.prob.core/plugin.xml b/de.prob.core/plugin.xml
index 086d193f..c19d9120 100644
--- a/de.prob.core/plugin.xml
+++ b/de.prob.core/plugin.xml
@@ -26,12 +26,12 @@
<extension
point="org.rodinp.core.attributeTypes">
<attributeType
- id="unitPragma"
+ id="unitPragmaAttribute"
kind="string"
name="Content of a unit Pragma to send to ProB">
</attributeType>
<attributeType
- id="inferredUnitPragma"
+ id="inferredUnitPragmaAttribute"
kind="string"
name="Content of a unit Pragma received from ProB">
</attributeType>
diff --git a/de.prob.ui/plugin.xml b/de.prob.ui/plugin.xml
index 0bec42fe..817c0fd5 100644
--- a/de.prob.ui/plugin.xml
+++ b/de.prob.ui/plugin.xml
@@ -1255,40 +1255,40 @@
<extension
point="org.eventb.ui.editorItems">
<textAttribute
- class="de.prob.ui.pragmas.UnitPragma"
+ class="de.prob.ui.pragmas.UnitPragmaAttribute"
expandsHorizontally="true"
- id="de.prob.ui.unitPragma"
+ id="de.prob.ui.unitPragmaAttribute"
isMath="true"
prefix="Physical Unit:"
- style="de.prob.ui.unitPragma"
- typeId="de.prob.core.unitPragma">
+ style="de.prob.ui.unitPragmaAttribute"
+ typeId="de.prob.core.unitPragmaAttribute">
</textAttribute>
<attributeRelation
elementTypeId="org.eventb.core.variable">
<attributeReference
- descriptionId="de.prob.ui.unitPragma">
+ descriptionId="de.prob.ui.unitPragmaAttribute">
</attributeReference>
<attributeReference
- descriptionId="de.prob.ui.inferredUnitPragma">
+ descriptionId="de.prob.ui.inferredUnitPragmaAttribute">
</attributeReference>
</attributeRelation>
<attributeRelation
elementTypeId="org.eventb.core.constant">
<attributeReference
- descriptionId="de.prob.ui.unitPragma">
+ descriptionId="de.prob.ui.unitPragmaAttribute">
</attributeReference>
<attributeReference
- descriptionId="de.prob.ui.inferredUnitPragma">
+ descriptionId="de.prob.ui.inferredUnitPragmaAttribute">
</attributeReference>
</attributeRelation>
<textAttribute
- class="de.prob.ui.pragmas.InferredUnitPragma"
+ class="de.prob.ui.pragmas.InferredUnitPragmaAttribute"
expandsHorizontally="true"
- id="de.prob.ui.inferredUnitPragma"
+ id="de.prob.ui.inferredUnitPragmaAttribute"
isMath="true"
prefix="Inferred Physical Unit:"
- style="de.prob.ui.inferredUnitPragma"
- typeId="de.prob.core.inferredUnitPragma">
+ style="de.prob.ui.inferredUnitPragmaAttribute"
+ typeId="de.prob.core.inferredUnitPragmaAttribute">
</textAttribute>
</extension>
</plugin>
diff --git a/de.prob.ui/src/de/prob/ui/pragmas/UnitPragma.java b/de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragmaAttribute.java
similarity index 91%
rename from de.prob.ui/src/de/prob/ui/pragmas/UnitPragma.java
rename to de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragmaAttribute.java
index b3d86821..c72487a5 100644
--- a/de.prob.ui/src/de/prob/ui/pragmas/UnitPragma.java
+++ b/de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragmaAttribute.java
@@ -18,11 +18,12 @@ import org.rodinp.core.RodinDBException;
import de.prob.core.internal.Activator;
-public class UnitPragma implements IAttributeManipulation {
+public class InferredUnitPragmaAttribute implements IAttributeManipulation {
public static IAttributeType.String ATTRIBUTE = RodinCore
- .getStringAttrType(Activator.PLUGIN_ID + ".unitPragma");
+ .getStringAttrType(Activator.PLUGIN_ID
+ + ".inferredUnitPragmaAttribute");
- public UnitPragma() {
+ public InferredUnitPragmaAttribute() {
// empty constructor
}
diff --git a/de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragma.java b/de.prob.ui/src/de/prob/ui/pragmas/UnitPragmaAttribute.java
similarity index 92%
rename from de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragma.java
rename to de.prob.ui/src/de/prob/ui/pragmas/UnitPragmaAttribute.java
index 2dafdb22..b159c38b 100644
--- a/de.prob.ui/src/de/prob/ui/pragmas/InferredUnitPragma.java
+++ b/de.prob.ui/src/de/prob/ui/pragmas/UnitPragmaAttribute.java
@@ -18,11 +18,11 @@ import org.rodinp.core.RodinDBException;
import de.prob.core.internal.Activator;
-public class InferredUnitPragma implements IAttributeManipulation {
+public class UnitPragmaAttribute implements IAttributeManipulation {
public static IAttributeType.String ATTRIBUTE = RodinCore
- .getStringAttrType(Activator.PLUGIN_ID + ".inferredUnitPragma");
+ .getStringAttrType(Activator.PLUGIN_ID + ".unitPragmaAttribute");
- public InferredUnitPragma() {
+ public UnitPragmaAttribute() {
// empty constructor
}
--
GitLab