IGaService#ignoreAll renamed to resetAll()
diff --git a/plugins/org.eclipse.graphiti/.settings/.api_filters b/plugins/org.eclipse.graphiti/.settings/.api_filters
index 7f24e1b..dc66983 100644
--- a/plugins/org.eclipse.graphiti/.settings/.api_filters
+++ b/plugins/org.eclipse.graphiti/.settings/.api_filters
@@ -1,98 +1,106 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.graphiti" version="2">
- <resource path="src/org/eclipse/graphiti/dt/AbstractDiagramTypeProvider.java" type="org.eclipse.graphiti.dt.AbstractDiagramTypeProvider">
- <filter id="338792546">
- <message_arguments>
- <message_argument value="org.eclipse.graphiti.dt.AbstractDiagramTypeProvider"/>
- <message_argument value="getCurrentToolBahaviorIndex()"/>
- </message_arguments>
- </filter>
- <filter id="338792546">
- <message_arguments>
- <message_argument value="org.eclipse.graphiti.dt.AbstractDiagramTypeProvider"/>
- <message_argument value="setCurrentToolBahaviorIndex(int)"/>
- </message_arguments>
- </filter>
- <filter id="1143996420">
- <message_arguments>
- <message_argument value="getCurrentToolBehaviorIndex()"/>
- </message_arguments>
- </filter>
- <filter id="1143996420">
- <message_arguments>
- <message_argument value="setCurrentToolBehaviorIndex(int)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/graphiti/dt/IDiagramTypeProvider.java" type="org.eclipse.graphiti.dt.IDiagramTypeProvider">
- <filter id="405901410">
- <message_arguments>
- <message_argument value="org.eclipse.graphiti.dt.IDiagramTypeProvider"/>
- <message_argument value="getCurrentToolBahaviorIndex()"/>
- </message_arguments>
- </filter>
- <filter id="405901410">
- <message_arguments>
- <message_argument value="org.eclipse.graphiti.dt.IDiagramTypeProvider"/>
- <message_argument value="setCurrentToolBahaviorIndex(int)"/>
- </message_arguments>
- </filter>
- <filter id="1209008130">
- <message_arguments>
- <message_argument value="1.0"/>
- <message_argument value="0.8"/>
- <message_argument value="getCurrentToolBehaviorIndex()"/>
- </message_arguments>
- </filter>
- <filter id="1211105284">
- <message_arguments>
- <message_argument value="getCurrentToolBehaviorIndex()"/>
- </message_arguments>
- </filter>
- <filter id="1211105284">
- <message_arguments>
- <message_argument value="setCurrentToolBehaviorIndex(int)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/graphiti/features/context/impl/DeleteContext.java" type="org.eclipse.graphiti.features.context.impl.DeleteContext">
- <filter id="576720909">
- <message_arguments>
- <message_argument value="PictogramElementContext"/>
- <message_argument value="DeleteContext"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/graphiti/features/context/impl/DirectEditingContext.java" type="org.eclipse.graphiti.features.context.impl.DirectEditingContext">
- <filter id="576720909">
- <message_arguments>
- <message_argument value="DetailedPictogramElementContext"/>
- <message_argument value="DirectEditingContext"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/graphiti/features/context/impl/LayoutContext.java" type="org.eclipse.graphiti.features.context.impl.LayoutContext">
- <filter id="576720909">
- <message_arguments>
- <message_argument value="PictogramElementContext"/>
- <message_argument value="LayoutContext"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/graphiti/features/context/impl/RemoveContext.java" type="org.eclipse.graphiti.features.context.impl.RemoveContext">
- <filter id="576720909">
- <message_arguments>
- <message_argument value="PictogramElementContext"/>
- <message_argument value="RemoveContext"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/graphiti/features/context/impl/UpdateContext.java" type="org.eclipse.graphiti.features.context.impl.UpdateContext">
- <filter id="576720909">
- <message_arguments>
- <message_argument value="PictogramElementContext"/>
- <message_argument value="UpdateContext"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.graphiti" version="2">
+ <resource path="src/org/eclipse/graphiti/dt/AbstractDiagramTypeProvider.java" type="org.eclipse.graphiti.dt.AbstractDiagramTypeProvider">
+ <filter id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.dt.AbstractDiagramTypeProvider"/>
+ <message_argument value="getCurrentToolBahaviorIndex()"/>
+ </message_arguments>
+ </filter>
+ <filter id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.dt.AbstractDiagramTypeProvider"/>
+ <message_argument value="setCurrentToolBahaviorIndex(int)"/>
+ </message_arguments>
+ </filter>
+ <filter id="1143996420">
+ <message_arguments>
+ <message_argument value="getCurrentToolBehaviorIndex()"/>
+ </message_arguments>
+ </filter>
+ <filter id="1143996420">
+ <message_arguments>
+ <message_argument value="setCurrentToolBehaviorIndex(int)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/graphiti/dt/IDiagramTypeProvider.java" type="org.eclipse.graphiti.dt.IDiagramTypeProvider">
+ <filter id="405901410">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.dt.IDiagramTypeProvider"/>
+ <message_argument value="getCurrentToolBahaviorIndex()"/>
+ </message_arguments>
+ </filter>
+ <filter id="405901410">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.dt.IDiagramTypeProvider"/>
+ <message_argument value="setCurrentToolBahaviorIndex(int)"/>
+ </message_arguments>
+ </filter>
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.0"/>
+ <message_argument value="0.8"/>
+ <message_argument value="getCurrentToolBehaviorIndex()"/>
+ </message_arguments>
+ </filter>
+ <filter id="1211105284">
+ <message_arguments>
+ <message_argument value="getCurrentToolBehaviorIndex()"/>
+ </message_arguments>
+ </filter>
+ <filter id="1211105284">
+ <message_arguments>
+ <message_argument value="setCurrentToolBehaviorIndex(int)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/graphiti/features/context/impl/DeleteContext.java" type="org.eclipse.graphiti.features.context.impl.DeleteContext">
+ <filter id="576720909">
+ <message_arguments>
+ <message_argument value="PictogramElementContext"/>
+ <message_argument value="DeleteContext"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/graphiti/features/context/impl/DirectEditingContext.java" type="org.eclipse.graphiti.features.context.impl.DirectEditingContext">
+ <filter id="576720909">
+ <message_arguments>
+ <message_argument value="DetailedPictogramElementContext"/>
+ <message_argument value="DirectEditingContext"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/graphiti/features/context/impl/LayoutContext.java" type="org.eclipse.graphiti.features.context.impl.LayoutContext">
+ <filter id="576720909">
+ <message_arguments>
+ <message_argument value="PictogramElementContext"/>
+ <message_argument value="LayoutContext"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/graphiti/features/context/impl/RemoveContext.java" type="org.eclipse.graphiti.features.context.impl.RemoveContext">
+ <filter id="576720909">
+ <message_arguments>
+ <message_argument value="PictogramElementContext"/>
+ <message_argument value="RemoveContext"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/graphiti/features/context/impl/UpdateContext.java" type="org.eclipse.graphiti.features.context.impl.UpdateContext">
+ <filter id="576720909">
+ <message_arguments>
+ <message_argument value="PictogramElementContext"/>
+ <message_argument value="UpdateContext"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/graphiti/services/IGaService.java" type="org.eclipse.graphiti.services.IGaService">
+ <filter id="405901410">
+ <message_arguments>
+ <message_argument value="org.eclipse.graphiti.services.IGaService"/>
+ <message_argument value="ignoreAll(AbstractStyle)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/GaServiceImpl.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/GaServiceImpl.java
index 09e7c29..b6cc371 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/GaServiceImpl.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/internal/services/impl/GaServiceImpl.java
@@ -1253,11 +1253,11 @@
* (non-Javadoc)
*
* @see
- * org.eclipse.graphiti.services.IGaService#ignoreAll(org.eclipse.graphiti
+ * org.eclipse.graphiti.services.IGaService#ResetAll(org.eclipse.graphiti
* .mm.pictograms.AbstractStyle)
*/
@Override
- public void ignoreAll(AbstractStyle abstractStyle) {
+ public void resetAll(AbstractStyle abstractStyle) {
abstractStyle.setBackground(null);
abstractStyle.setFilled(null);
abstractStyle.setForeground(null);
diff --git a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/services/IGaService.java b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/services/IGaService.java
index deffbdb..5dbe52b 100644
--- a/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/services/IGaService.java
+++ b/plugins/org.eclipse.graphiti/src/org/eclipse/graphiti/services/IGaService.java
@@ -222,8 +222,10 @@
*
* @param abstractStyle
* The abstract style (style or graphics algorithm)
+ *
+ * @since 0.9
*/
- public void ignoreAll(AbstractStyle abstractStyle);
+ public void resetAll(AbstractStyle abstractStyle);
/**
* Checks if is filled.
diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFOtherTests.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFOtherTests.java
index 80de65e..a34382f 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFOtherTests.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFOtherTests.java
@@ -656,7 +656,7 @@
MultiText multiText2 = gaService.createMultiText(shape1, "GaUtil");
gaService.createText(shape1);
gaService.createText(shape1, "GaUtil");
- gaService.ignoreAll(multiText1);
+ gaService.resetAll(multiText1);
gaService.findStyle(diagram, "s");
gaService.createStyle(diagram, "s");
gaService.findStyle(diagram, "s");
diff --git a/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/cases/GaServiceTest.java b/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/cases/GaServiceTest.java
index b1a29b2..88c1170 100644
--- a/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/cases/GaServiceTest.java
+++ b/tests/org.eclipse.graphiti.tests/src/org/eclipse/graphiti/tests/cases/GaServiceTest.java
@@ -588,7 +588,7 @@
style.setBackground(gas.manageColor(d, IColorConstant.BLACK));
style.setForeground(gas.manageColor(d, IColorConstant.BLUE));
- gas.ignoreAll(style);
+ gas.resetAll(style);
assertNull(style.getBackground());
assertNull(style.getForeground());
diff --git a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/style/IgnoreAllFeature.java b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/style/IgnoreAllFeature.java
index ee50b76..acf63d7 100644
--- a/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/style/IgnoreAllFeature.java
+++ b/tests/org.eclipse.graphiti.testtool.sketch/src/org/eclipse/graphiti/testtool/sketch/features/style/IgnoreAllFeature.java
@@ -44,7 +44,7 @@
for (int i = 0; i < pes.length; i++) {
PictogramElement pe = pes[i];
GraphicsAlgorithm ga = pe.getGraphicsAlgorithm();
- Graphiti.getGaService().ignoreAll(ga);
+ Graphiti.getGaService().resetAll(ga);
}
}