Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/.project (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/.project)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/build.properties (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/build.properties)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/eclipse_papyrus_helios.xml (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/eclipse_papyrus_helios.xml)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/epl-v10.html (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/epl-v10.html)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/epp.product (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/epp.product)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/feature.properties (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/feature.properties)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/feature.xml (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/feature.xml)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/license.html (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/license.html)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/p2.inf (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/p2.inf)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus.feature/plugin_customization.ini (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/plugin_customization.ini)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/.project (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/.project)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/META-INF/MANIFEST.MF (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/about.html (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/about.html)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/about.ini (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/about.ini)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/about.mappings (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/about.mappings)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/about.properties (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/about.properties)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/buckminster.cspex (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/buckminster.cspex)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/build.properties (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/build.properties)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/eclipse.gif (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse.gif)bin1052 -> 1052 bytes
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/eclipse.png (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse.png)bin654 -> 654 bytes
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/eclipse32.gif (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse32.gif)bin1706 -> 1706 bytes
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/eclipse32.png (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse32.png)bin4594 -> 4594 bytes
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/eclipse48.gif (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse48.gif)bin2371 -> 2371 bytes
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/eclipse48.png (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse48.png)bin3099 -> 3099 bytes
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/eclipse_lg.gif (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse_lg.gif)bin12710 -> 12710 bytes
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/intro-eclipse.png (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/intro-eclipse.png)bin13739 -> 13739 bytes
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/plugin.xml (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.epp.package.papyrus/plugin_customization.ini (renamed from extraplugins/rcp/org.eclipse.epp.package.papyrus/plugin_customization.ini)0
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/.classpath (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/.project (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/META-INF/MANIFEST.MF (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/build.properties (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/icons/full/logoMoDiscoMini.gif (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/icons/full/logoMoDiscoMini.gif)bin1078 -> 1078 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/plugin.xml (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/Activator.java (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/Activator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/CreateModiscoBrowserHandler.java (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/CreateModiscoBrowserHandler.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditor.java (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditor.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditorFactory.java (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditorFactory.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion-feature/.project (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion-feature/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion-feature/build.properties (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion-feature/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion-feature/eclipse_update_120.jpg (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion-feature/eclipse_update_120.jpg)bin21695 -> 21695 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion-feature/epl-v10.html (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion-feature/epl-v10.html)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion-feature/feature.properties (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion-feature/feature.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion-feature/feature.xml (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion-feature/feature.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion-feature/license.html (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion-feature/license.html)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/.classpath (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/.project (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/build.properties (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/customsrc/org/eclipse/papyrus/conversion/di2/DiConstants.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/customsrc/org/eclipse/papyrus/conversion/di2/DiConstants.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/model/OLDdi2.genmodel (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/OLDdi2.genmodel)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/model/UML.ecore (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/UML.ecore)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/model/di2-master.ecore (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2-master.ecore)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/model/di2.ecore (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.ecore)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/model/di2.genmodel (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.genmodel)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/model/di2withoutUMLEcore.ecore (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2withoutUMLEcore.ecore)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/model/note.txt (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/note.txt)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/plugin.properties (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/plugin.xml (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/CoreSemanticModelBridge.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/CoreSemanticModelBridge.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Factory.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Factory.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Package.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Package.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Diagram.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Diagram.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramElement.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramElement.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramLink.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramLink.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Ellipse.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Ellipse.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphConnector.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphConnector.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphEdge.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphEdge.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphElement.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphElement.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphNode.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphNode.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphicPrimitive.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphicPrimitive.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Image.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Image.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/LeafElement.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/LeafElement.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/PapyrusKeyEnumeration.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/PapyrusKeyEnumeration.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Polilyne.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Polilyne.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Property.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Property.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Reference.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Reference.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SemanticModelBridge.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SemanticModelBridge.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SimpleSemanticModelElement.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SimpleSemanticModelElement.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/TextElement.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/TextElement.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Uml1SemanticModelBridge.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Uml1SemanticModelBridge.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/CoreSemanticModelBridgeImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/CoreSemanticModelBridgeImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2FactoryImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2FactoryImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramElementImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramElementImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramLinkImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramLinkImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/EllipseImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/EllipseImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphConnectorImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphConnectorImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphEdgeImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphEdgeImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphElementImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphElementImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphNodeImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphNodeImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphicPrimitiveImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphicPrimitiveImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ImageImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ImageImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/LeafElementImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/LeafElementImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PolilyneImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PolilyneImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PropertyImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PropertyImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ReferenceImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ReferenceImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SemanticModelBridgeImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SemanticModelBridgeImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SimpleSemanticModelElementImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SimpleSemanticModelElementImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/TextElementImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/TextElementImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Uml1SemanticModelBridgeImpl.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Uml1SemanticModelBridgeImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2AdapterFactory.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2AdapterFactory.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2Switch.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2Switch.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/.classpath (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/.project (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdgeVisualIDs.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdgeVisualIDs.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdges.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdges.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagNodes.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagNodes.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagVisualIDs.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagVisualIDs.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagEdges.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagEdges.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagNodes.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagNodes.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagVisualIDs.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagVisualIDs.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/DiTransformations.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/DiTransformations.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Diagram.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Diagram.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ElementType.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ElementType.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/GeneralMappingsandHelpers.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/GeneralMappingsandHelpers.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/NotationQueries.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/NotationQueries.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagNodes.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagNodes.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagVisualIDs.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagVisualIDs.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagEdges.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagEdges.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagNodes.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagNodes.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagVisualIDs.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagVisualIDs.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Transfo.qvto (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Transfo.qvto)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/build.properties (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/TutorialConversion.html (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/TutorialConversion.html)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-di2action.png (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-di2action.png)bin23573 -> 23573 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-project.png (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-project.png)bin3998 -> 3998 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-result.png (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-result.png)bin5420 -> 5420 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-mdt.png (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-mdt.png)bin20800 -> 20800 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-p1.12.png (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-p1.12.png)bin20127 -> 20127 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-mdt.png (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-mdt.png)bin20393 -> 20393 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-p1.12.png (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-p1.12.png)bin20119 -> 20119 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-mdt.png (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-mdt.png)bin27481 -> 27481 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-p1.12.png (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-p1.12.png)bin33830 -> 33830 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/plugin.properties (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/plugin.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/plugin.xml (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/Activator.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/Activator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/blackboxes/UtilitiesLibrary.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/blackboxes/UtilitiesLibrary.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/Di2toDiAction.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/Di2toDiAction.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/PapyrusNamespace.java (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/PapyrusNamespace.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/toc.xml (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/toc.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.conversion.di2todi/tocdev.xml (renamed from extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/tocdev.xml)0
-rw-r--r--[-rwxr-xr-x]deprecated/org.eclipse.papyrus.core.queries.configuration.tests/.classpath (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.configuration.tests/.project (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.configuration.tests/about.html (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.configuration.tests/build.properties (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.configuration.tests/plugin.properties (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/plugin.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.configuration.tests/plugin.xml (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.configuration.tests/resource/CoreQueriesConfigurationSet.querySet (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/resource/CoreQueriesConfigurationSet.querySet)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.configuration.tests/resource/Test1.configuration (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/resource/Test1.configuration)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.configuration.tests/resource/TestModel.uml (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/resource/TestModel.uml)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/.classpath (renamed from extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/.project (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.core.resources.prefs (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.core.resources.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.jdt.core.prefs (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/about.html (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/build.properties (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/org.eclipse.papyrus.core.queries.test.launch (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/org.eclipse.papyrus.core.queries.test.launch)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/plugin.properties (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/plugin.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/plugin.xml (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/AndConfiguration.configuration (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/AndConfiguration.configuration)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/CoreQueriesTest.querySet (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/CoreQueriesTest.querySet)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration2.configuration (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration2.configuration)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/IsNamedQueryConfiguration.configuration (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsNamedQueryConfiguration.configuration)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfModel.configuration (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfModel.configuration)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfPackage.configuration (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfPackage.configuration)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/ListElementsInstanceofClassifiersWithNameContainingBasic.configuration (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/ListElementsInstanceofClassifiersWithNameContainingBasic.configuration)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/ListElementsWithNameBasic.configuration (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/ListElementsWithNameBasic.configuration)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/basic.ecore (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/basic.ecore)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/basic.ecorediag (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/basic.ecorediag)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/resources/basic.uml (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/basic.uml)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/Activator.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/Activator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/AbstractQueryUtilTest.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/AbstractQueryUtilTest.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IQueryNames.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IQueryNames.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/Messages.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/Messages.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/messages.properties (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/messages.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_NoParameters.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_NoParameters.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNamed.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNamed.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsStrictInstanceOf.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsStrictInstanceOf.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsWithName.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsWithName.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/.classpath (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/.project (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/META-INF/MANIFEST.MF (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/build.properties (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/icons/ClassDiagram.gif (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/icons/ClassDiagram.gif)bin120 -> 120 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/plugin.xml (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorFactory.java (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorFactory.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorModel.java (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorModel.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/CreateClassDiagramHandler.java (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/CreateClassDiagramHandler.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/UmlClassDiagramForMultiEditor.java (renamed from extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/UmlClassDiagramForMultiEditor.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagramqueryresult/.classpath (renamed from extraplugins/org.eclipse.papyrus.diagramqueryresult/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagramqueryresult/.project (renamed from extraplugins/org.eclipse.papyrus.diagramqueryresult/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagramqueryresult/.settings/org.eclipse.jdt.core.prefs (renamed from extraplugins/org.eclipse.papyrus.diagramqueryresult/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagramqueryresult/META-INF/MANIFEST.MF (renamed from extraplugins/org.eclipse.papyrus.diagramqueryresult/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagramqueryresult/build.properties (renamed from extraplugins/org.eclipse.papyrus.diagramqueryresult/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagramqueryresult/plugin.properties (renamed from extraplugins/org.eclipse.papyrus.diagramqueryresult/plugin.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagramqueryresult/plugin.xml (renamed from extraplugins/org.eclipse.papyrus.diagramqueryresult/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/Activator.java (renamed from extraplugins/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/Activator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/DiagramQueryResultDisplayer.java (renamed from extraplugins/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/DiagramQueryResultDisplayer.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/about.html)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java (renamed from plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/about.html)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gif)bin223 -> 223 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gif)bin129 -> 129 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gif)bin129 -> 129 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gif)bin129 -> 129 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gif)bin129 -> 129 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gif (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gif)bin129 -> 129 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.classpath (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.project (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/about.html (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/about.html)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/build.properties (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/.classpath (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/.project (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/about.html (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/about.html)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/build.properties (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/plugin.properties (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/plugin.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java (renamed from plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.qvtTransformation/.classpath (renamed from extraplugins/org.eclipse.papyrus.qvtTransformation/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.qvtTransformation/.project (renamed from extraplugins/org.eclipse.papyrus.qvtTransformation/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.qvtTransformation/.settings/org.eclipse.jdt.core.prefs (renamed from extraplugins/org.eclipse.papyrus.qvtTransformation/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--deprecated/org.eclipse.papyrus.qvtTransformation/META-INF/MANIFEST.MF (renamed from extraplugins/org.eclipse.papyrus.qvtTransformation/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.qvtTransformation/build.properties (renamed from extraplugins/org.eclipse.papyrus.qvtTransformation/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.qvtTransformation/icons/icon.gif (renamed from extraplugins/org.eclipse.papyrus.qvtTransformation/icons/icon.gif)bin279 -> 279 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.qvtTransformation/plugin.xml (renamed from extraplugins/org.eclipse.papyrus.qvtTransformation/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java (renamed from extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java (renamed from extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/.classpath (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.classpath)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/.project (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/.project)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/META-INF/MANIFEST.MF (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/META-INF/MANIFEST.MF)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/build.properties (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/build.properties)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/contexts.xml (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/contexts.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/icons/sample.gif (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/icons/sample.gif)bin983 -> 983 bytes
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/plugin.xml (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/plugin.xml)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/Activator.java (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/Activator.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsView.java (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsView.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewModel.java (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewModel.java)0
-rw-r--r--deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewPart.java (renamed from extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewPart.java)0
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.views.cpp/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF3
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CppPanelView.java22
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppAbstractPanel.java22
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/.classpath8
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/.project17
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/META-INF/MANIFEST.MF14
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/about.html22
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/build.properties8
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/lib/Tidy.jarbin177868 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/plugin.properties16
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/plugin.xml15
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/CommonHTMLPlugin.java56
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/DefaultHTMLFormatter.java286
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/DefaultHTMLParser.java212
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/.classpath7
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/.project28
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/.settings/org.eclipse.pde.core.prefs4
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/META-INF/MANIFEST.MF15
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/about.html22
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/build.properties5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/plugin.properties15
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/AbstractPlugin.java529
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/CommonUIPlugin.java71
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/ContextProvider.java37
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/MessageCallback.java59
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/PreferenceStoreWrapper.java532
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/PropertyChangeEventWrapper.java65
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/actions/CComboContributionItem.java164
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/ClipboardUtil.java122
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/CommonPreferences.java60
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/ErrorDialogNoReason.java598
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MenuUtil.java47
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MsgBox.java123
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MsgDialog.java626
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/PerspectiveUtil.java127
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/PreferenceUtil.java173
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/WrappedMessageDialog.java208
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/.classpath7
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/.project28
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/META-INF/MANIFEST.MF10
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/about.html22
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/build.properties6
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/plugin.properties15
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java218
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/.classpath7
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/.project28
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/META-INF/MANIFEST.MF10
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/about.html22
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/build.properties6
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/plugin.properties15
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java218
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/src/org/eclipse/epf/common/win32/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/.classpath7
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/.project28
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/META-INF/MANIFEST.MF21
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/about.html22
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/build.properties7
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/plugin.properties15
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/plugin.xml8
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/schema/htmlFormatter.exsd105
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/schema/htmlParser.exsd105
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/schema/markerAttributeContributer.exsd111
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/schema/objectFactory.exsd102
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/AbstractActivator.java518
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/CommonPlugin.java82
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IActivator.java23
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IContextProvider.java15
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IHTMLFormatter.java39
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IHTMLParser.java25
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IMessageCallback.java26
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPreferenceStoreWrapper.java440
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPropertyChangeEventWrapper.java50
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPropertyChangeListenerWrapper.java23
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/DebugTrace.java104
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/Logger.java134
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ExtensionHelper.java216
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/FileUtil.java1285
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/I18nUtil.java219
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/IMarkerAttributeContributer.java25
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/IObjectFactory.java23
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ImageUtil.java179
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MathUtil.java25
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/NetUtil.java400
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ProfilingUtil.java60
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/RestartableJob.java123
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StrUtil.java676
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StringMatcher.java458
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ThreadUtil.java41
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/Timer.java49
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/WarUtil.java57
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/XMLUtil.java666
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ZipUtil.java106
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/AbstractSAXParser.java216
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/XSLTProcessor.java449
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/.project17
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/build.properties4
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/epl-v10.html304
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/feature.properties141
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/feature.xml82
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/license.html79
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/.classpath16
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/.project28
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/META-INF/MANIFEST.MF22
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/about.html22
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/about.ini18
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/about.mappings7
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/about.properties49
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/application_32.gifbin1706 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/build.properties24
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddCode.gifbin349 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddImage.gifbin576 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddLink.gifbin225 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddOrderedList.gifbin106 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddTable.gifbin348 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddUnorderedList.gifbin103 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Bold.gifbin104 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/ClearContent.gifbin328 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Copy.gifbin364 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Cut.gifbin138 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/FindReplace.gifbin332 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Indent.gifbin135 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Italic.gifbin79 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Outdent.gifbin137 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Paste.gifbin361 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/PastePlainText.gifbin560 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Subscript.gifbin85 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Superscript.gifbin83 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/TidyHTML.gifbin352 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Underline.gifbin88 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddCode.gifbin349 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddImage.gifbin1024 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddLine.gifbin73 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddLink.gifbin942 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddOrderedList.gifbin152 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddTable.gifbin982 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddUnorderedList.gifbin139 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Bold.gifbin132 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/ClearContent.gifbin162 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Copy.gifbin994 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Cut.gifbin913 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/FindReplace.gifbin947 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Indent.gifbin905 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Italic.gifbin123 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyCenter.gifbin67 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyFull.gifbin67 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyLeft.gifbin67 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyRight.gifbin67 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Outdent.gifbin905 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Paste.gifbin1005 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/PastePlainText.gifbin588 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/StrikeThrough.gifbin76 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Subscript.gifbin130 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Superscript.gifbin133 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/TidyHTML.gifbin971 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Underline.gifbin138 -> 0 bytes
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/messages.properties160
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/plugin.properties34
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/blank.htm9
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.css457
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.html20
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.js1490
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.xsl32
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichText.java355
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextEditor.java50
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextToolBar.java72
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Messages.java145
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Resources.properties160
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichText.java1671
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextCommand.java267
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditor.java1555
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditorForm.java59
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextFormToolkit.java91
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextImages.java475
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextListener.java66
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextPlugin.java80
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextResources.java148
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextSelection.java150
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextToolBar.java191
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddCodeAction.java42
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddImageAction.java76
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLineAction.java58
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLinkAction.java74
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddOrderedListAction.java59
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddTableAction.java81
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddUnorderedListAction.java59
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BaseRichTextAction.java83
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BlockTagAction.java81
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BoldAction.java67
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ClearContentAction.java64
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CopyAction.java84
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CutAction.java76
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FindReplaceAction.java388
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontNameAction.java121
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontSizeAction.java106
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontStyleAction.java94
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IBaseRichTextAction.java62
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextAction.java97
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextComboAction.java76
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IndentAction.java59
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ItalicAction.java67
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyCenterAction.java58
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyFullAction.java58
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyLeftAction.java58
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyRightAction.java58
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/OutdentAction.java59
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PasteAction.java247
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PastePlainTextAction.java62
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextAction.java158
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextComboAction.java148
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SubscriptAction.java68
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SuperscriptAction.java69
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/TidyAction.java95
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/TidyActionGroup.java82
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/UnderlineAction.java68
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddCodeDialog.java79
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddImageDialog.java143
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddLinkDialog.java126
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddTableDialog.java220
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/BaseDialog.java91
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/FindReplaceDialog.java337
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/BlockTag.java195
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontName.java150
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontStyle.java197
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Image.java59
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Link.java89
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Table.java196
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/package.html5
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencePage.java183
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferences.java51
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencesInitializer.java45
-rw-r--r--extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/package.html5
-rw-r--r--extraplugins/org.eclipse.papyrus.qvtTransformation/bin/org/eclipse/papyrus/qvttransformation/Activator.classbin1235 -> 0 bytes
-rw-r--r--extraplugins/org.eclipse.papyrus.qvtTransformation/bin/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.classbin1364 -> 0 bytes
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java5
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/OperationUtils.java6
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java6
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java1
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java12
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java6
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java28
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PostCopyListener.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterComments.java)38
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PreCopyListener.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/CopyListener.java)12
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/SyncBehaviorParameters.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java6
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PostTemplateInstantiationListener.java61
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiationListener.java)27
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java65
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AcceleoException.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java2
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ApplyInstanceConfigurators.java40
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java584
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java38
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java50
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java738
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java18
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/Copy.java)73
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java4
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PropagateAllocationToSharedInstances.java58
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java12
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationUtil.java81
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateDerivedInterfaces.java51
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterRuleApplication.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterSignatures.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterTemplate.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java9
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/C_CppLanguageSupport.java5
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java14
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.cpp33
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.h58
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.cpp24
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.h38
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF3
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di33
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation48
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml530
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml10
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindCppIncludeToFirstActual.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppInclude.java)44
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindOperation.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/InstantiateCppIncludeWithItSelf.java (renamed from extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppIncludeWOB.java)35
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java8
-rw-r--r--extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java4
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml218
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation22
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml28
-rw-r--r--extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/utils/RobotmlSelectionTester.java14
-rw-r--r--plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.classpath (renamed from tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/.classpath)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.project)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF)20
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/about.html (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/about.html)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/build.properties)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png)bin12893 -> 12893 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png)bin8668 -> 8668 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png)bin28682 -> 28682 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png)bin13523 -> 13523 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png)bin19650 -> 19650 bytes
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html)0
-rw-r--r--[-rwxr-xr-x]plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki (renamed from plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki)0
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java14
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java182
-rw-r--r--plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF1
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap8
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap8
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap8
-rw-r--r--releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap8
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties2
-rw-r--r--tests/junit/plugins/uml/org.eclipse.papyrus.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF2
726 files changed, 2005 insertions, 27809 deletions
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/.project b/deprecated/org.eclipse.epp.package.papyrus.feature/.project
index 5c7c9b3f00a..5c7c9b3f00a 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/.project
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/.project
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/build.properties b/deprecated/org.eclipse.epp.package.papyrus.feature/build.properties
index 7d2d8724f28..7d2d8724f28 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/build.properties
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/build.properties
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/eclipse_papyrus_helios.xml b/deprecated/org.eclipse.epp.package.papyrus.feature/eclipse_papyrus_helios.xml
index 370e83fbfb4..370e83fbfb4 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/eclipse_papyrus_helios.xml
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/eclipse_papyrus_helios.xml
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/epl-v10.html b/deprecated/org.eclipse.epp.package.papyrus.feature/epl-v10.html
index 2e85bcbd1ac..2e85bcbd1ac 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/epl-v10.html
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/epl-v10.html
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/epp.product b/deprecated/org.eclipse.epp.package.papyrus.feature/epp.product
index d88a8200ff1..d88a8200ff1 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/epp.product
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/epp.product
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/feature.properties b/deprecated/org.eclipse.epp.package.papyrus.feature/feature.properties
index 9c9df421fba..9c9df421fba 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/feature.properties
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/feature.properties
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/feature.xml b/deprecated/org.eclipse.epp.package.papyrus.feature/feature.xml
index 9c267c277eb..9c267c277eb 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/feature.xml
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/feature.xml
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/license.html b/deprecated/org.eclipse.epp.package.papyrus.feature/license.html
index 69305408635..69305408635 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/license.html
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/license.html
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/p2.inf b/deprecated/org.eclipse.epp.package.papyrus.feature/p2.inf
index 47b3c3edda8..47b3c3edda8 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/p2.inf
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/p2.inf
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/plugin_customization.ini b/deprecated/org.eclipse.epp.package.papyrus.feature/plugin_customization.ini
index ecdf68e87a3..ecdf68e87a3 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus.feature/plugin_customization.ini
+++ b/deprecated/org.eclipse.epp.package.papyrus.feature/plugin_customization.ini
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/.project b/deprecated/org.eclipse.epp.package.papyrus/.project
index 232ced80263..232ced80263 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/.project
+++ b/deprecated/org.eclipse.epp.package.papyrus/.project
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/META-INF/MANIFEST.MF b/deprecated/org.eclipse.epp.package.papyrus/META-INF/MANIFEST.MF
index 2931b10f086..2931b10f086 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.epp.package.papyrus/META-INF/MANIFEST.MF
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/about.html b/deprecated/org.eclipse.epp.package.papyrus/about.html
index 97ad4ef97ce..97ad4ef97ce 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/about.html
+++ b/deprecated/org.eclipse.epp.package.papyrus/about.html
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/about.ini b/deprecated/org.eclipse.epp.package.papyrus/about.ini
index 408d6f3f39f..408d6f3f39f 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/about.ini
+++ b/deprecated/org.eclipse.epp.package.papyrus/about.ini
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/about.mappings b/deprecated/org.eclipse.epp.package.papyrus/about.mappings
index 0dfb7355d48..0dfb7355d48 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/about.mappings
+++ b/deprecated/org.eclipse.epp.package.papyrus/about.mappings
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/about.properties b/deprecated/org.eclipse.epp.package.papyrus/about.properties
index 80ef4348e77..80ef4348e77 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/about.properties
+++ b/deprecated/org.eclipse.epp.package.papyrus/about.properties
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/buckminster.cspex b/deprecated/org.eclipse.epp.package.papyrus/buckminster.cspex
index 3e45f2dc6c4..3e45f2dc6c4 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/buckminster.cspex
+++ b/deprecated/org.eclipse.epp.package.papyrus/buckminster.cspex
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/build.properties b/deprecated/org.eclipse.epp.package.papyrus/build.properties
index 4bcf744ecb1..4bcf744ecb1 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/build.properties
+++ b/deprecated/org.eclipse.epp.package.papyrus/build.properties
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse.gif b/deprecated/org.eclipse.epp.package.papyrus/eclipse.gif
index 7d7e32b2c0d..7d7e32b2c0d 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse.gif
+++ b/deprecated/org.eclipse.epp.package.papyrus/eclipse.gif
Binary files differ
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse.png b/deprecated/org.eclipse.epp.package.papyrus/eclipse.png
index 25e3bb5ea62..25e3bb5ea62 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse.png
+++ b/deprecated/org.eclipse.epp.package.papyrus/eclipse.png
Binary files differ
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse32.gif b/deprecated/org.eclipse.epp.package.papyrus/eclipse32.gif
index e6ad7ccd75b..e6ad7ccd75b 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse32.gif
+++ b/deprecated/org.eclipse.epp.package.papyrus/eclipse32.gif
Binary files differ
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse32.png b/deprecated/org.eclipse.epp.package.papyrus/eclipse32.png
index 568fac1d05f..568fac1d05f 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse32.png
+++ b/deprecated/org.eclipse.epp.package.papyrus/eclipse32.png
Binary files differ
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse48.gif b/deprecated/org.eclipse.epp.package.papyrus/eclipse48.gif
index 80a40d68057..80a40d68057 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse48.gif
+++ b/deprecated/org.eclipse.epp.package.papyrus/eclipse48.gif
Binary files differ
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse48.png b/deprecated/org.eclipse.epp.package.papyrus/eclipse48.png
index 1c939c81634..1c939c81634 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse48.png
+++ b/deprecated/org.eclipse.epp.package.papyrus/eclipse48.png
Binary files differ
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse_lg.gif b/deprecated/org.eclipse.epp.package.papyrus/eclipse_lg.gif
index bf8b872e3d5..bf8b872e3d5 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/eclipse_lg.gif
+++ b/deprecated/org.eclipse.epp.package.papyrus/eclipse_lg.gif
Binary files differ
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/intro-eclipse.png b/deprecated/org.eclipse.epp.package.papyrus/intro-eclipse.png
index 015e7fc6ca4..015e7fc6ca4 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/intro-eclipse.png
+++ b/deprecated/org.eclipse.epp.package.papyrus/intro-eclipse.png
Binary files differ
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/plugin.xml b/deprecated/org.eclipse.epp.package.papyrus/plugin.xml
index 35600130c0c..35600130c0c 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/plugin.xml
+++ b/deprecated/org.eclipse.epp.package.papyrus/plugin.xml
diff --git a/extraplugins/rcp/org.eclipse.epp.package.papyrus/plugin_customization.ini b/deprecated/org.eclipse.epp.package.papyrus/plugin_customization.ini
index d482ff007ff..d482ff007ff 100644
--- a/extraplugins/rcp/org.eclipse.epp.package.papyrus/plugin_customization.ini
+++ b/deprecated/org.eclipse.epp.package.papyrus/plugin_customization.ini
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/.classpath b/deprecated/org.eclipse.papyrus.adaptor.modisco/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/.classpath
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/.classpath
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/.project b/deprecated/org.eclipse.papyrus.adaptor.modisco/.project
index 12cd199fb89..12cd199fb89 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/.project
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/.project
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.adaptor.modisco/META-INF/MANIFEST.MF
index 2b559853ded..2b559853ded 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/META-INF/MANIFEST.MF
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/build.properties b/deprecated/org.eclipse.papyrus.adaptor.modisco/build.properties
index 6f20375d6c7..6f20375d6c7 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/build.properties
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/build.properties
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/icons/full/logoMoDiscoMini.gif b/deprecated/org.eclipse.papyrus.adaptor.modisco/icons/full/logoMoDiscoMini.gif
index 19c468b1c61..19c468b1c61 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/icons/full/logoMoDiscoMini.gif
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/icons/full/logoMoDiscoMini.gif
Binary files differ
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/plugin.xml b/deprecated/org.eclipse.papyrus.adaptor.modisco/plugin.xml
index d7529c833c3..d7529c833c3 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/plugin.xml
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/Activator.java b/deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/Activator.java
index 77dee147dc0..77dee147dc0 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/Activator.java
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/Activator.java
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/CreateModiscoBrowserHandler.java b/deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/CreateModiscoBrowserHandler.java
index 8c7d7b56a3f..8c7d7b56a3f 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/CreateModiscoBrowserHandler.java
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/CreateModiscoBrowserHandler.java
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditor.java b/deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditor.java
index 2cc203c331d..2cc203c331d 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditor.java
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditor.java
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditorFactory.java b/deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditorFactory.java
index 4e8aebe7ea9..4e8aebe7ea9 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditorFactory.java
+++ b/deprecated/org.eclipse.papyrus.adaptor.modisco/src/org/eclipse/papyrus/adapters/modisco/ModiscoBrowserEditorFactory.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/.project b/deprecated/org.eclipse.papyrus.conversion-feature/.project
index d2f295e1a2a..d2f295e1a2a 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/.project
+++ b/deprecated/org.eclipse.papyrus.conversion-feature/.project
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/build.properties b/deprecated/org.eclipse.papyrus.conversion-feature/build.properties
index 9c864246773..9c864246773 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/build.properties
+++ b/deprecated/org.eclipse.papyrus.conversion-feature/build.properties
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/eclipse_update_120.jpg b/deprecated/org.eclipse.papyrus.conversion-feature/eclipse_update_120.jpg
index bfdf708ad61..bfdf708ad61 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/eclipse_update_120.jpg
+++ b/deprecated/org.eclipse.papyrus.conversion-feature/eclipse_update_120.jpg
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/epl-v10.html b/deprecated/org.eclipse.papyrus.conversion-feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/epl-v10.html
+++ b/deprecated/org.eclipse.papyrus.conversion-feature/epl-v10.html
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/feature.properties b/deprecated/org.eclipse.papyrus.conversion-feature/feature.properties
index 7e8977d5850..7e8977d5850 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/feature.properties
+++ b/deprecated/org.eclipse.papyrus.conversion-feature/feature.properties
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/feature.xml b/deprecated/org.eclipse.papyrus.conversion-feature/feature.xml
index ad450331f44..ad450331f44 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/feature.xml
+++ b/deprecated/org.eclipse.papyrus.conversion-feature/feature.xml
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/license.html b/deprecated/org.eclipse.papyrus.conversion-feature/license.html
index a9b560f44cd..a9b560f44cd 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion-feature/license.html
+++ b/deprecated/org.eclipse.papyrus.conversion-feature/license.html
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/.classpath b/deprecated/org.eclipse.papyrus.conversion.di2/.classpath
index aad3b0bc0eb..aad3b0bc0eb 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/.classpath
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/.classpath
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/.project b/deprecated/org.eclipse.papyrus.conversion.di2/.project
index fd7cb505981..fd7cb505981 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/.project
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/.project
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF
index 8443b2db054..8443b2db054 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/META-INF/MANIFEST.MF
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/build.properties b/deprecated/org.eclipse.papyrus.conversion.di2/build.properties
index 9945044204e..9945044204e 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/build.properties
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/build.properties
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/customsrc/org/eclipse/papyrus/conversion/di2/DiConstants.java b/deprecated/org.eclipse.papyrus.conversion.di2/customsrc/org/eclipse/papyrus/conversion/di2/DiConstants.java
index c48f281f5b9..c48f281f5b9 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/customsrc/org/eclipse/papyrus/conversion/di2/DiConstants.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/customsrc/org/eclipse/papyrus/conversion/di2/DiConstants.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/OLDdi2.genmodel b/deprecated/org.eclipse.papyrus.conversion.di2/model/OLDdi2.genmodel
index c0b6c84e8c9..c0b6c84e8c9 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/OLDdi2.genmodel
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/model/OLDdi2.genmodel
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/UML.ecore b/deprecated/org.eclipse.papyrus.conversion.di2/model/UML.ecore
index 7206ff84e61..7206ff84e61 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/UML.ecore
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/model/UML.ecore
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2-master.ecore b/deprecated/org.eclipse.papyrus.conversion.di2/model/di2-master.ecore
index 0e2ecdd82a4..0e2ecdd82a4 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2-master.ecore
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/model/di2-master.ecore
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.ecore b/deprecated/org.eclipse.papyrus.conversion.di2/model/di2.ecore
index cebea7ea7c3..cebea7ea7c3 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.ecore
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/model/di2.ecore
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.genmodel b/deprecated/org.eclipse.papyrus.conversion.di2/model/di2.genmodel
index a5b082c3462..a5b082c3462 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2.genmodel
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/model/di2.genmodel
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2withoutUMLEcore.ecore b/deprecated/org.eclipse.papyrus.conversion.di2/model/di2withoutUMLEcore.ecore
index 1dd61696f84..1dd61696f84 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/di2withoutUMLEcore.ecore
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/model/di2withoutUMLEcore.ecore
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/note.txt b/deprecated/org.eclipse.papyrus.conversion.di2/model/note.txt
index 7b2c4715872..7b2c4715872 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/model/note.txt
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/model/note.txt
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.properties b/deprecated/org.eclipse.papyrus.conversion.di2/plugin.properties
index cbf2f0234f4..cbf2f0234f4 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/plugin.properties
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.xml b/deprecated/org.eclipse.papyrus.conversion.di2/plugin.xml
index ca7c3c3889a..ca7c3c3889a 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/plugin.xml
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/CoreSemanticModelBridge.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/CoreSemanticModelBridge.java
index 97a55bc19fb..97a55bc19fb 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/CoreSemanticModelBridge.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/CoreSemanticModelBridge.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Factory.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Factory.java
index 54c5e09e7a0..54c5e09e7a0 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Factory.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Factory.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Package.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Package.java
index a92a4a0fe6c..a92a4a0fe6c 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Package.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Di2Package.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Diagram.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Diagram.java
index e407669b999..e407669b999 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Diagram.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Diagram.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramElement.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramElement.java
index 96ac0a3a71b..96ac0a3a71b 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramElement.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramElement.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramLink.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramLink.java
index ad9325318a6..ad9325318a6 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramLink.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/DiagramLink.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Ellipse.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Ellipse.java
index 201533a1643..201533a1643 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Ellipse.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Ellipse.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphConnector.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphConnector.java
index f2c69450c48..f2c69450c48 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphConnector.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphConnector.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphEdge.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphEdge.java
index c67362796e9..c67362796e9 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphEdge.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphEdge.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphElement.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphElement.java
index 7a53f116396..7a53f116396 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphElement.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphElement.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphNode.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphNode.java
index 15c4722f878..15c4722f878 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphNode.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphNode.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphicPrimitive.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphicPrimitive.java
index 2b3a65939f8..2b3a65939f8 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphicPrimitive.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/GraphicPrimitive.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Image.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Image.java
index 41157e8b0ef..41157e8b0ef 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Image.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Image.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/LeafElement.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/LeafElement.java
index 4b98cb5a984..4b98cb5a984 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/LeafElement.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/LeafElement.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/PapyrusKeyEnumeration.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/PapyrusKeyEnumeration.java
index f7454d77909..f7454d77909 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/PapyrusKeyEnumeration.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/PapyrusKeyEnumeration.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Polilyne.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Polilyne.java
index ea5529820ed..ea5529820ed 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Polilyne.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Polilyne.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Property.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Property.java
index 722cf36092a..722cf36092a 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Property.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Property.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Reference.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Reference.java
index 7a67ed0e5fa..7a67ed0e5fa 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Reference.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Reference.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SemanticModelBridge.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SemanticModelBridge.java
index 01086766fef..01086766fef 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SemanticModelBridge.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SemanticModelBridge.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SimpleSemanticModelElement.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SimpleSemanticModelElement.java
index 0177655afb4..0177655afb4 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SimpleSemanticModelElement.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/SimpleSemanticModelElement.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/TextElement.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/TextElement.java
index 5c95c1f6012..5c95c1f6012 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/TextElement.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/TextElement.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Uml1SemanticModelBridge.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Uml1SemanticModelBridge.java
index 1b167ab6e98..1b167ab6e98 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Uml1SemanticModelBridge.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/Uml1SemanticModelBridge.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/CoreSemanticModelBridgeImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/CoreSemanticModelBridgeImpl.java
index 7225744a610..7225744a610 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/CoreSemanticModelBridgeImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/CoreSemanticModelBridgeImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2FactoryImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2FactoryImpl.java
index 597ea47733e..597ea47733e 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2FactoryImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2FactoryImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java
index 4241fa8b7d0..4241fa8b7d0 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Di2PackageImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramElementImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramElementImpl.java
index c5460ff05e4..c5460ff05e4 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramElementImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramElementImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramImpl.java
index fc01dd11bdd..fc01dd11bdd 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramLinkImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramLinkImpl.java
index c49e62d7627..c49e62d7627 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramLinkImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/DiagramLinkImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/EllipseImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/EllipseImpl.java
index f7bc0a3b71c..f7bc0a3b71c 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/EllipseImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/EllipseImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphConnectorImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphConnectorImpl.java
index 5974aca3472..5974aca3472 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphConnectorImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphConnectorImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphEdgeImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphEdgeImpl.java
index 94ab66b63da..94ab66b63da 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphEdgeImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphEdgeImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphElementImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphElementImpl.java
index 3cbe314b11f..3cbe314b11f 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphElementImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphElementImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphNodeImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphNodeImpl.java
index 93d11a18ecf..93d11a18ecf 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphNodeImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphNodeImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphicPrimitiveImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphicPrimitiveImpl.java
index 3f6c49353ab..3f6c49353ab 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphicPrimitiveImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/GraphicPrimitiveImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ImageImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ImageImpl.java
index 7b2af5b32ae..7b2af5b32ae 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ImageImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ImageImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/LeafElementImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/LeafElementImpl.java
index be2328258cc..be2328258cc 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/LeafElementImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/LeafElementImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PolilyneImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PolilyneImpl.java
index dc6b3e64f2a..dc6b3e64f2a 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PolilyneImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PolilyneImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PropertyImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PropertyImpl.java
index 67a576ad15c..67a576ad15c 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PropertyImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/PropertyImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ReferenceImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ReferenceImpl.java
index 226ceecd230..226ceecd230 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ReferenceImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/ReferenceImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SemanticModelBridgeImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SemanticModelBridgeImpl.java
index ca74d4c0bd7..ca74d4c0bd7 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SemanticModelBridgeImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SemanticModelBridgeImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SimpleSemanticModelElementImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SimpleSemanticModelElementImpl.java
index 82b4ddbe206..82b4ddbe206 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SimpleSemanticModelElementImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/SimpleSemanticModelElementImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/TextElementImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/TextElementImpl.java
index e4f1e5e3b77..e4f1e5e3b77 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/TextElementImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/TextElementImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Uml1SemanticModelBridgeImpl.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Uml1SemanticModelBridgeImpl.java
index 3d621c99157..3d621c99157 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Uml1SemanticModelBridgeImpl.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/impl/Uml1SemanticModelBridgeImpl.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2AdapterFactory.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2AdapterFactory.java
index a93a23f7947..a93a23f7947 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2AdapterFactory.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2AdapterFactory.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2Switch.java b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2Switch.java
index 2f674ca01f2..2f674ca01f2 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2Switch.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2/src/org/eclipse/papyrus/conversion/di2/util/Di2Switch.java
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/.classpath b/deprecated/org.eclipse.papyrus.conversion.di2todi/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/.classpath
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/.classpath
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/.project b/deprecated/org.eclipse.papyrus.conversion.di2todi/.project
index afabadc6203..afabadc6203 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/.project
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/.project
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF
index bad2bb38a43..bad2bb38a43 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/META-INF/MANIFEST.MF
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdgeVisualIDs.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdgeVisualIDs.qvto
index f0837e19292..f0837e19292 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdgeVisualIDs.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdgeVisualIDs.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdges.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdges.qvto
index 046a85c23ba..046a85c23ba 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdges.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassAndProfileDiagEdges.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagNodes.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagNodes.qvto
index 8c7168fa8fd..8c7168fa8fd 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagNodes.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagNodes.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagVisualIDs.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagVisualIDs.qvto
index 9b5def30876..9b5def30876 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagVisualIDs.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ClassDiagVisualIDs.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagEdges.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagEdges.qvto
index 1e20a5438df..1e20a5438df 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagEdges.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagEdges.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagNodes.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagNodes.qvto
index 4ba6c5d3fda..4ba6c5d3fda 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagNodes.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagNodes.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagVisualIDs.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagVisualIDs.qvto
index 3383a9a68e5..3383a9a68e5 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagVisualIDs.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/CompositeDiagVisualIDs.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/DiTransformations.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/DiTransformations.qvto
index 950b5d2c6bd..950b5d2c6bd 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/DiTransformations.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/DiTransformations.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Diagram.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Diagram.qvto
index f88e9680aea..f88e9680aea 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Diagram.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Diagram.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ElementType.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ElementType.qvto
index b54734ce946..b54734ce946 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ElementType.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ElementType.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/GeneralMappingsandHelpers.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/GeneralMappingsandHelpers.qvto
index becc23eefc9..becc23eefc9 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/GeneralMappingsandHelpers.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/GeneralMappingsandHelpers.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/NotationQueries.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/NotationQueries.qvto
index 83f1850a146..83f1850a146 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/NotationQueries.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/NotationQueries.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagNodes.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagNodes.qvto
index 162d0f27d1b..162d0f27d1b 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagNodes.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagNodes.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagVisualIDs.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagVisualIDs.qvto
index 3fa75c813ef..3fa75c813ef 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagVisualIDs.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/ProfileDiagVisualIDs.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagEdges.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagEdges.qvto
index bfbe84eb39b..bfbe84eb39b 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagEdges.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagEdges.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagNodes.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagNodes.qvto
index 60802fb3c3f..60802fb3c3f 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagNodes.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagNodes.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagVisualIDs.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagVisualIDs.qvto
index 2ff2ab2c6fb..2ff2ab2c6fb 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagVisualIDs.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/StateDiagVisualIDs.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Transfo.qvto b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Transfo.qvto
index 52979027ff7..52979027ff7 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Transfo.qvto
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/TransfoQvtoDi2toDi/Transfo.qvto
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/build.properties b/deprecated/org.eclipse.papyrus.conversion.di2todi/build.properties
index 4cc050a6e8a..4cc050a6e8a 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/build.properties
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/build.properties
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/TutorialConversion.html b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/TutorialConversion.html
index 140e077f5c9..140e077f5c9 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/TutorialConversion.html
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/TutorialConversion.html
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-di2action.png b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-di2action.png
index 1e1d021cd66..1e1d021cd66 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-di2action.png
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-di2action.png
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-project.png b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-project.png
index 5c11cc12e2e..5c11cc12e2e 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-project.png
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-project.png
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-result.png b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-result.png
index fe3a0e97514..fe3a0e97514 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-result.png
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/conversion-example-result.png
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-mdt.png b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-mdt.png
index ae6b496d0c8..ae6b496d0c8 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-mdt.png
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-mdt.png
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-p1.12.png b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-p1.12.png
index 0a61e8d5ae5..0a61e8d5ae5 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-p1.12.png
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example-composite-diag-p1.12.png
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-mdt.png b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-mdt.png
index 531381a328e..531381a328e 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-mdt.png
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-mdt.png
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-p1.12.png b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-p1.12.png
index 726a5582f1b..726a5582f1b 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-p1.12.png
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example1-class-diagram-p1.12.png
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-mdt.png b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-mdt.png
index c8112529635..c8112529635 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-mdt.png
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-mdt.png
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-p1.12.png b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-p1.12.png
index 8a9e3e5e824..8a9e3e5e824 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-p1.12.png
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/doc/figs/example2-class-diagram-p1.12.png
Binary files differ
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/plugin.properties b/deprecated/org.eclipse.papyrus.conversion.di2todi/plugin.properties
index 1803ba8aee5..1803ba8aee5 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/plugin.properties
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/plugin.xml b/deprecated/org.eclipse.papyrus.conversion.di2todi/plugin.xml
index 484692c3519..484692c3519 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/plugin.xml
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/Activator.java b/deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/Activator.java
index c660b3cea70..c660b3cea70 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/Activator.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/Activator.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/blackboxes/UtilitiesLibrary.java b/deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/blackboxes/UtilitiesLibrary.java
index 9138b043865..9138b043865 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/blackboxes/UtilitiesLibrary.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/blackboxes/UtilitiesLibrary.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/Di2toDiAction.java b/deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/Di2toDiAction.java
index 2c0729cdeda..2c0729cdeda 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/Di2toDiAction.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/Di2toDiAction.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/PapyrusNamespace.java b/deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/PapyrusNamespace.java
index 5a17df64ff2..5a17df64ff2 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/PapyrusNamespace.java
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/src/org/eclipse/papyrus/conversion/di2todi/popupactions/PapyrusNamespace.java
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/toc.xml b/deprecated/org.eclipse.papyrus.conversion.di2todi/toc.xml
index 3057fc280ee..3057fc280ee 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/toc.xml
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/toc.xml
diff --git a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/tocdev.xml b/deprecated/org.eclipse.papyrus.conversion.di2todi/tocdev.xml
index 53009154565..53009154565 100644
--- a/extraplugins/conversion/org.eclipse.papyrus.conversion.di2todi/tocdev.xml
+++ b/deprecated/org.eclipse.papyrus.conversion.di2todi/tocdev.xml
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.classpath b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/.classpath
index f6e5811e42c..f6e5811e42c 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.classpath
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/.classpath
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/.project b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/.project
index 1ea070c1cb1..1ea070c1cb1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/.project
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/.project
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF
index bfc42fda765..bfc42fda765 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/META-INF/MANIFEST.MF
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/about.html
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/build.properties b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/build.properties
index b5b64632427..b5b64632427 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/build.properties
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/build.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/plugin.properties b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/plugin.properties
index 153470243c9..153470243c9 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/plugin.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/plugin.xml b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/plugin.xml
index 786991d95b2..786991d95b2 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/plugin.xml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/resource/CoreQueriesConfigurationSet.querySet b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/resource/CoreQueriesConfigurationSet.querySet
index c44b3eab993..c44b3eab993 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/resource/CoreQueriesConfigurationSet.querySet
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/resource/CoreQueriesConfigurationSet.querySet
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/resource/Test1.configuration b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/resource/Test1.configuration
index b3a1cee35e0..b3a1cee35e0 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/resource/Test1.configuration
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/resource/Test1.configuration
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/resource/TestModel.uml b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/resource/TestModel.uml
index a8dc6187e2b..a8dc6187e2b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/resource/TestModel.uml
+++ b/deprecated/org.eclipse.papyrus.core.queries.configuration.tests/resource/TestModel.uml
diff --git a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/.classpath b/deprecated/org.eclipse.papyrus.core.queries.test/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/extraplugins/modisco/org.eclipse.papyrus.adaptor.modisco/.classpath
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/.classpath
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.project b/deprecated/org.eclipse.papyrus.core.queries.test/.project
index 067347a2311..067347a2311 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.project
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/.project
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.core.resources.prefs b/deprecated/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.core.resources.prefs
index 290533da739..290533da739 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.core.resources.prefs
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.jdt.core.prefs
index 4c7133a63e1..4c7133a63e1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF
index ed116d991ef..ed116d991ef 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/META-INF/MANIFEST.MF
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html b/deprecated/org.eclipse.papyrus.core.queries.test/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/about.html
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/build.properties b/deprecated/org.eclipse.papyrus.core.queries.test/build.properties
index 53926ef8f40..53926ef8f40 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/build.properties
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/build.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/org.eclipse.papyrus.core.queries.test.launch b/deprecated/org.eclipse.papyrus.core.queries.test/org.eclipse.papyrus.core.queries.test.launch
index 5898e5a0bcb..5898e5a0bcb 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/org.eclipse.papyrus.core.queries.test.launch
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/org.eclipse.papyrus.core.queries.test.launch
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/plugin.properties b/deprecated/org.eclipse.papyrus.core.queries.test/plugin.properties
index 943221ff355..943221ff355 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/plugin.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/plugin.xml b/deprecated/org.eclipse.papyrus.core.queries.test/plugin.xml
index 9fd0f8803b4..9fd0f8803b4 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/plugin.xml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/AndConfiguration.configuration b/deprecated/org.eclipse.papyrus.core.queries.test/resources/AndConfiguration.configuration
index 4d0b6436b0b..4d0b6436b0b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/AndConfiguration.configuration
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/AndConfiguration.configuration
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/CoreQueriesTest.querySet b/deprecated/org.eclipse.papyrus.core.queries.test/resources/CoreQueriesTest.querySet
index 1b7a30de950..1b7a30de950 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/CoreQueriesTest.querySet
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/CoreQueriesTest.querySet
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration
index b1339e16508..b1339e16508 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration2.configuration b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration2.configuration
index db9558dcacb..db9558dcacb 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration2.configuration
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration2.configuration
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsNamedQueryConfiguration.configuration b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsNamedQueryConfiguration.configuration
index b850be270dd..b850be270dd 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsNamedQueryConfiguration.configuration
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsNamedQueryConfiguration.configuration
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfModel.configuration b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfModel.configuration
index 11d985c29c3..11d985c29c3 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfModel.configuration
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfModel.configuration
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfPackage.configuration b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfPackage.configuration
index 2ced6113451..2ced6113451 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfPackage.configuration
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfPackage.configuration
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/ListElementsInstanceofClassifiersWithNameContainingBasic.configuration b/deprecated/org.eclipse.papyrus.core.queries.test/resources/ListElementsInstanceofClassifiersWithNameContainingBasic.configuration
index 8388e815a0b..8388e815a0b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/ListElementsInstanceofClassifiersWithNameContainingBasic.configuration
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/ListElementsInstanceofClassifiersWithNameContainingBasic.configuration
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/ListElementsWithNameBasic.configuration b/deprecated/org.eclipse.papyrus.core.queries.test/resources/ListElementsWithNameBasic.configuration
index a37170c5cfd..a37170c5cfd 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/ListElementsWithNameBasic.configuration
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/ListElementsWithNameBasic.configuration
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/basic.ecore b/deprecated/org.eclipse.papyrus.core.queries.test/resources/basic.ecore
index 7bd632c4640..7bd632c4640 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/basic.ecore
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/basic.ecore
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/basic.ecorediag b/deprecated/org.eclipse.papyrus.core.queries.test/resources/basic.ecorediag
index 18f4d5ffb77..18f4d5ffb77 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/basic.ecorediag
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/basic.ecorediag
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/basic.uml b/deprecated/org.eclipse.papyrus.core.queries.test/resources/basic.uml
index c9475e049e1..c9475e049e1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/resources/basic.uml
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/resources/basic.uml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/Activator.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/Activator.java
index 586e124ec84..586e124ec84 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/Activator.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/Activator.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java
index dbca9a6dbd6..dbca9a6dbd6 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ANDTests.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/AbstractQueryUtilTest.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/AbstractQueryUtilTest.java
index 2e9c13be42e..2e9c13be42e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/AbstractQueryUtilTest.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/AbstractQueryUtilTest.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java
index 4268608f477..4268608f477 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanMultipleTest_NoParametersTests.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java
index bc25ff4ad97..bc25ff4ad97 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/BooleanTest_NoParametersTests.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IQueryNames.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IQueryNames.java
index 2ece8ece34b..2ece8ece34b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IQueryNames.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IQueryNames.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java
index e6f9243b45c..e6f9243b45c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNameLongerThanTests.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java
index 472d97cfa77..472d97cfa77 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/IsNamedTests.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java
index 8c1d7874891..8c1d7874891 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsInstanceofClassifiersWithNameContainingBasicTests.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java
index 64025d548e4..64025d548e4 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/ListElementsWithNameTest.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/Messages.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/Messages.java
index 565011b1863..565011b1863 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/Messages.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/Messages.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java
index 7fb77e77264..7fb77e77264 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtilBasicTests.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java
index b242d26dc93..b242d26dc93 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/QueryUtil_Parameters.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java
index 550373d19ba..550373d19ba 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringMultipleTest_NoParametersTests.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java
index cb0094e4d28..cb0094e4d28 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/StringTest_NoParametersTests.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java
index 5f608e8ffcb..5f608e8ffcb 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/TestUtil.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/messages.properties b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/messages.properties
index 839db70c4a9..839db70c4a9 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/messages.properties
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/messages.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java
index 372ac3939db..372ac3939db 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/AND.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java
index 2b453f63916..2b453f63916 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanMultipleTest_NoParameters.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java
index 3a2fe753106..3a2fe753106 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Boolean_1_Integer_1.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java
index 546bb68085d..546bb68085d 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_Enum_1.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_NoParameters.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_NoParameters.java
index 6b8d0062a0c..6b8d0062a0c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_NoParameters.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_NoParameters.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java
index d4aaf417b0a..d4aaf417b0a 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_1.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java
index 4de555ad4e6..4de555ad4e6 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_3.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java
index 12d1e0da49d..12d1e0da49d 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/BooleanTest_String_Star.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java
index 900f94da7fb..900f94da7fb 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/CopyOfIsNamed.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java
index 75981cdc3e8..75981cdc3e8 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNameLongerThan.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNamed.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNamed.java
index d3be1d98827..d3be1d98827 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNamed.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsNamed.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsStrictInstanceOf.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsStrictInstanceOf.java
index d48d4257d6e..d48d4257d6e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsStrictInstanceOf.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/IsStrictInstanceOf.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java
index b8a0e48eefe..b8a0e48eefe 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsInstanceofClassifiers.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsWithName.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsWithName.java
index 9e08001426e..9e08001426e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsWithName.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/ListElementsWithName.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java
index a9f3a8f6f83..a9f3a8f6f83 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringMultipleTest_NoParameters.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java
index 60e1dc0be08..60e1dc0be08 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java
+++ b/deprecated/org.eclipse.papyrus.core.queries.test/src/org/eclipse/papyrus/core/queries/test/modisco/queries/StringTest_NoParameters.java
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/.classpath b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/.classpath
index 45f024e850e..45f024e850e 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/.classpath
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/.classpath
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/.project b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/.project
index 62152d80745..62152d80745 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/.project
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/.project
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/META-INF/MANIFEST.MF
index 44c7a0051e4..44c7a0051e4 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/META-INF/MANIFEST.MF
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/build.properties b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/build.properties
index 53c8b373787..53c8b373787 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/build.properties
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/build.properties
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/icons/ClassDiagram.gif b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/icons/ClassDiagram.gif
index edf2be7e83d..edf2be7e83d 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/icons/ClassDiagram.gif
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/icons/ClassDiagram.gif
Binary files differ
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/plugin.xml b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/plugin.xml
index dff8aaf444b..dff8aaf444b 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/plugin.xml
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorFactory.java b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorFactory.java
index ea4e01b9a6c..ea4e01b9a6c 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorFactory.java
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorFactory.java
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorModel.java b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorModel.java
index cd6f7df4192..cd6f7df4192 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorModel.java
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/ClassDiagramEditorModel.java
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/CreateClassDiagramHandler.java b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/CreateClassDiagramHandler.java
index 3711c1a54e5..3711c1a54e5 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/CreateClassDiagramHandler.java
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/CreateClassDiagramHandler.java
diff --git a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/UmlClassDiagramForMultiEditor.java b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/UmlClassDiagramForMultiEditor.java
index 36c7a2a6d99..36c7a2a6d99 100644
--- a/extraplugins/umltools/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/UmlClassDiagramForMultiEditor.java
+++ b/deprecated/org.eclipse.papyrus.diagram.umltools.clazz/src/org/eclipse/papyrus/diagram/umltools/clazz/UmlClassDiagramForMultiEditor.java
diff --git a/extraplugins/org.eclipse.papyrus.diagramqueryresult/.classpath b/deprecated/org.eclipse.papyrus.diagramqueryresult/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/extraplugins/org.eclipse.papyrus.diagramqueryresult/.classpath
+++ b/deprecated/org.eclipse.papyrus.diagramqueryresult/.classpath
diff --git a/extraplugins/org.eclipse.papyrus.diagramqueryresult/.project b/deprecated/org.eclipse.papyrus.diagramqueryresult/.project
index f2ccb673650..f2ccb673650 100644
--- a/extraplugins/org.eclipse.papyrus.diagramqueryresult/.project
+++ b/deprecated/org.eclipse.papyrus.diagramqueryresult/.project
diff --git a/extraplugins/org.eclipse.papyrus.diagramqueryresult/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.diagramqueryresult/.settings/org.eclipse.jdt.core.prefs
index 5f279a814d0..5f279a814d0 100644
--- a/extraplugins/org.eclipse.papyrus.diagramqueryresult/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.diagramqueryresult/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/org.eclipse.papyrus.diagramqueryresult/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.diagramqueryresult/META-INF/MANIFEST.MF
index f39e39761a7..f39e39761a7 100644
--- a/extraplugins/org.eclipse.papyrus.diagramqueryresult/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.diagramqueryresult/META-INF/MANIFEST.MF
diff --git a/extraplugins/org.eclipse.papyrus.diagramqueryresult/build.properties b/deprecated/org.eclipse.papyrus.diagramqueryresult/build.properties
index 6f20375d6c7..6f20375d6c7 100644
--- a/extraplugins/org.eclipse.papyrus.diagramqueryresult/build.properties
+++ b/deprecated/org.eclipse.papyrus.diagramqueryresult/build.properties
diff --git a/extraplugins/org.eclipse.papyrus.diagramqueryresult/plugin.properties b/deprecated/org.eclipse.papyrus.diagramqueryresult/plugin.properties
index d0bf9665000..d0bf9665000 100644
--- a/extraplugins/org.eclipse.papyrus.diagramqueryresult/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.diagramqueryresult/plugin.properties
diff --git a/extraplugins/org.eclipse.papyrus.diagramqueryresult/plugin.xml b/deprecated/org.eclipse.papyrus.diagramqueryresult/plugin.xml
index 48397355a76..48397355a76 100644
--- a/extraplugins/org.eclipse.papyrus.diagramqueryresult/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.diagramqueryresult/plugin.xml
diff --git a/extraplugins/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/Activator.java b/deprecated/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/Activator.java
index 2b689b6d427..2b689b6d427 100644
--- a/extraplugins/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/Activator.java
+++ b/deprecated/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/Activator.java
diff --git a/extraplugins/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/DiagramQueryResultDisplayer.java b/deprecated/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/DiagramQueryResultDisplayer.java
index 1a7ebb55819..1a7ebb55819 100644
--- a/extraplugins/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/DiagramQueryResultDisplayer.java
+++ b/deprecated/org.eclipse.papyrus.diagramqueryresult/src/org/eclipse/papyrus/diagramqueryresult/DiagramQueryResultDisplayer.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath
index 64c5e31b7a2..64c5e31b7a2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.classpath
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project
index a0496ee9a76..a0496ee9a76 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.project
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs
index 52164b21347..52164b21347 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs
index 74df85c62f7..74df85c62f7 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs
index cd7271ff61d..cd7271ff61d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.launching.prefs
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs
index f6caf599885..f6caf599885 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs
index 2bd5814c381..2bd5814c381 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/.settings/org.eclipse.pde.prefs
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF
index 321050a31b5..321050a31b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/META-INF/MANIFEST.MF
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/about.html b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties
index e5a949cc43c..e5a949cc43c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/build.properties
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml
index 30f1ff73ff3..30f1ff73ff3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/plugin.xml
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java
index b22de38760d..b22de38760d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/Activator.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java
index 3cff16ceb76..3cff16ceb76 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/PopupEditorConfiguration.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java
index a4a7936d051..a4a7936d051 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/ConcurrentModificationObserver.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java
index cb51de74209..cb51de74209 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/EditingDomainAdapter.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java
index 1108a6dbf91..1108a6dbf91 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/concurrency/SimpleDirtyResource.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java
index 0e46b3393f8..0e46b3393f8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CompletionProposalUtils.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java
index 31f79f3e1a5..31f79f3e1a5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/contentassist/CustomCompletionProposal.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java
index 2b61fd571cd..2b61fd571cd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/AntlrParserWrapper.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java
index 64f0219be9c..64f0219be9c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/DefaultXtextSemanticValidator.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java
index 274ca08acec..274ca08acec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXTextSemanticValidator.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java
index 137c58a0462..137c58a0462 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/IXtextEMFReconciler.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java
index 475ec38eee0..475ec38eee0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorHelper.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java
index 0cc682bb923..0cc682bb923 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/PopupXtextEditorKeyListener.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java
index e15dc5553f6..e15dc5553f6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/edit/part/StringUtil.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java
index d3a9fdc516f..d3a9fdc516f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/ChangeAggregatorAdapter.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java
index 6fb03239ea9..6fb03239ea9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/SemanticRootUnloadListener.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java
index a1f4a622e05..a1f4a622e05 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/UpdateXtextResourceTextCommand.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java
index 4605d2a1a5c..4605d2a1a5c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/editingdomain/XtextNodeModelReconciler.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java
index 577dcd58091..577dcd58091 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/CustomXtextSourceViewer.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java
index 0f0e7114282..0f0e7114282 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingHelper.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java
index bce3698527e..bce3698527e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/HighlightingReconciler.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java
index 1805f2bfcc9..1805f2bfcc9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IActionContributor.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java
index 95133155d81..95133155d81 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/IPartialContentAssistParser.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java
index 50d9eab79d1..50d9eab79d1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/ISyntheticResourceProvider.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java
index 9db63acc890..9db63acc890 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/OperationHistoryListener.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java
index c6baf0199e1..c6baf0199e1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialContentAssistContextFactory.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java
index 79d3cbb2d32..79d3cbb2d32 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/PartialModelEditor.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java
index 52fe8a87962..52fe8a87962 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandle.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java
index c4b05c671f5..c4b05c671f5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SourceViewerHandleFactory.java
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java
index 616ce3a3dc0..616ce3a3dc0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.gmfdiag.xtext.glue/src/org/eclipse/papyrus/infra/gmfdiag/xtext/glue/partialEditing/SyntheticResourceProvider.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath
index cedf0d0d0b5..cedf0d0d0b5 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/.classpath
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project
index d784407f2ea..d784407f2ea 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF
index 13e26e08855..13e26e08855 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/about.html b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/about.html
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties
index f465f5d7485..f465f5d7485 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/build.properties
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gif
index 7839cb59536..7839cb59536 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Duration.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gif
index bbdaa350889..bbdaa350889 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_DurationInterval.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gif
index b94380bd871..b94380bd871 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Expression.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gif
index 1bca29e3795..1bca29e3795 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_InstanceValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gif
index 7d35c8972d1..7d35c8972d1 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_Interval.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gif
index 7f2d45eb492..7f2d45eb492 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralBoolean.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gif
index 58e344bde6e..58e344bde6e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralInteger.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gif
index e3cf235bb60..e3cf235bb60 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralNull.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gif
index ebe3a4888bb..ebe3a4888bb 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralString.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gif
index dfe51cfa69b..dfe51cfa69b 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_LiteralUnlimitedNatural.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gif
index b94380bd871..b94380bd871 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_OpaqueExpression.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gif
index 7d35c8972d1..7d35c8972d1 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_StringExpression.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gif
index 24c57a05b7e..24c57a05b7e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeExpression.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gif
index a674b69c271..a674b69c271 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateConstantParameterValue_valueInstance_TimeInterval.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gif
index f213cc393ad..f213cc393ad 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ConstantParameterValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gif
index 888a2c1bacc..888a2c1bacc 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ListParameterValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gif
index 79a0a45b269..79a0a45b269 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_ParameterValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gif
index 523057cd5d9..523057cd5d9 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateModiscoQueryConfiguration_parameterValues_QueryExecutionValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gif
index 7f7c51a1f20..7f7c51a1f20 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Duration.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gif
index 2769bc64647..2769bc64647 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_DurationInterval.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gif
index de6af47e2ec..de6af47e2ec 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Expression.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gif
index cc2ef529556..cc2ef529556 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_InstanceValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gif
index 0c1ee4c917e..0c1ee4c917e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_Interval.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gif
index a382f74844b..a382f74844b 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralBoolean.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gif
index b72b5e57a83..b72b5e57a83 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralInteger.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gif
index b32e049d4a4..b32e049d4a4 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralNull.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gif
index a89d0ec24fe..a89d0ec24fe 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralString.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gif
index 52baab8f56e..52baab8f56e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_LiteralUnlimitedNatural.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gif
index de6af47e2ec..de6af47e2ec 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_OpaqueExpression.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gif
index 0c1ee4c917e..0c1ee4c917e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_StringExpression.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gif
index e8233067cc9..e8233067cc9 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeExpression.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gif
index bc7b7f9c860..bc7b7f9c860 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/ctool16/CreateParameterValue_valueInstance_TimeInterval.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gif
index 134551bff7e..134551bff7e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ConstantParameterValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gif
index 4365960a04b..4365960a04b 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ListParameterValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gif
index 134551bff7e..134551bff7e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ModiscoQueryConfiguration.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gif
index 2b692560297..2b692560297 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/ParameterValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gif b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gif
index ed874747401..ed874747401 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gif
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/icons/full/obj16/QueryExecutionValue.gif
Binary files differ
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties
index 69cc28400be..69cc28400be 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.properties
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml
index 4296ad2fa25..4296ad2fa25 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/plugin.xml
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java
index f8205917100..f8205917100 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationEditPlugin.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java
index 7615aff1dcc..7615aff1dcc 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConfigurationItemProviderAdapterFactory.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java
index de2560858ea..de2560858ea 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ConstantParameterValueItemProvider.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java
index b476a6f00c5..b476a6f00c5 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ListParameterValueItemProvider.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java
index c0ec3dbd806..c0ec3dbd806 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ModiscoQueryConfigurationItemProvider.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java
index a88d5c2f912..a88d5c2f912 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/ParameterValueItemProvider.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java
index 964c9c87be8..964c9c87be8 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryConfigurationItemProvider.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java
index 2b3050ce093..2b3050ce093 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/provider/QueryExecutionValueItemProvider.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.classpath b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.classpath
index cedf0d0d0b5..cedf0d0d0b5 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.classpath
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.project
index 19b48341fa2..19b48341fa2 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.project
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs
index 7cceaebc432..7cceaebc432 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs
index 2010cb0a8ba..2010cb0a8ba 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF
index af3264a0829..af3264a0829 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/about.html b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/about.html
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/build.properties b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/build.properties
index e05d6efaf6a..e05d6efaf6a 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/build.properties
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore
index 5e4046fa300..5e4046fa300 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag
index 7b7dc6485ef..7b7dc6485ef 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecorediag
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel
index e1ab6b1384f..e1ab6b1384f 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties
index 27eac336a7e..27eac336a7e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/plugin.properties
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml
index 52cff66df0a..52cff66df0a 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/plugin.xml
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java
index a41797e0838..a41797e0838 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationFactory.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java
index 5560e67ef85..5560e67ef85 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConfigurationPackage.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java
index c7a98e250b4..c7a98e250b4 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ConstantParameterValue.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java
index a15a622ece5..a15a622ece5 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ListParameterValue.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java
index e6316e5443c..e6316e5443c 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ModiscoQueryConfiguration.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java
index 2f82772c2c2..2f82772c2c2 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/ParameterValue.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java
index a97e1cc6261..a97e1cc6261 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryConfiguration.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java
index 768f82c46da..768f82c46da 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/QueryExecutionValue.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java
index c08ed885209..c08ed885209 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationFactoryImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java
index 93081f21411..93081f21411 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConfigurationPackageImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java
index dde0ce6ecd6..dde0ce6ecd6 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ConstantParameterValueImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java
index a99d8db56bc..a99d8db56bc 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ListParameterValueImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java
index d68c0622dca..d68c0622dca 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ModiscoQueryConfigurationImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java
index 6b2f1f9f252..6b2f1f9f252 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/ParameterValueImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java
index 95bbfb9e23c..95bbfb9e23c 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryConfigurationImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java
index 767a4719dc3..767a4719dc3 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/impl/QueryExecutionValueImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java
index 3f795c4cb92..3f795c4cb92 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/plugin/Activator.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java
index 7222535c6d5..7222535c6d5 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationAdapterFactory.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java
index cf45077cb5e..cf45077cb5e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceFactoryImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java
index 6f579e7873e..6f579e7873e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationResourceImpl.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java
index 726b23f70ab..726b23f70ab 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationSwitch.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java
index e1d7197cc16..e1d7197cc16 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core.configuration/src-gen/org/eclipse/papyrus/infra/queries/core/configuration/util/ConfigurationXMLProcessor.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.classpath b/deprecated/org.eclipse.papyrus.infra.queries.core/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/.classpath
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project b/deprecated/org.eclipse.papyrus.infra.queries.core/.project
index 35970c3736b..35970c3736b 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/.project
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs b/deprecated/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs
index a960e953d11..a960e953d11 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs
index 3b447f78043..3b447f78043 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF
index d9cee11dc74..d9cee11dc74 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/about.html b/deprecated/org.eclipse.papyrus.infra.queries.core/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/about.html
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/build.properties b/deprecated/org.eclipse.papyrus.infra.queries.core/build.properties
index bfc183478ca..bfc183478ca 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/build.properties
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/plugin.properties b/deprecated/org.eclipse.papyrus.infra.queries.core/plugin.properties
index fe4e8ecaa6a..fe4e8ecaa6a 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/plugin.properties
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore b/deprecated/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore
index 9d21ce6e9db..9d21ce6e9db 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecore
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag b/deprecated/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag
index 88be98ad0bd..88be98ad0bd 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/resources/ToolConfiguration.ecorediag
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java
index 33bc5c2b73d..33bc5c2b73d 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/Activator.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java
index ce3c5be4356..ce3c5be4356 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterNotfoundException.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java
index fed4d51e1e6..fed4d51e1e6 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ConverterRegistry.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java
index facfdeb5920..facfdeb5920 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToBooleanConverter.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java
index c6a8735690d..c6a8735690d 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ObjectToIntegerConverter.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java
index fe244a435bb..fe244a435bb 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToBooleanConverter.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java
index b7393eace12..b7393eace12 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToIntegerConverter.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java
index b2987996f4f..b2987996f4f 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/converter/ValueSpecificationToStringConverter.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java
index b6b5a445a07..b6b5a445a07 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQueryNotFoundException.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java
index efe014c6678..efe014c6678 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/ModelQuerySetNotFoundException.java
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java
index f87a4810a9a..f87a4810a9a 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java
+++ b/deprecated/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/infra/queries/core/modisco/QueryUtil.java
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/.classpath b/deprecated/org.eclipse.papyrus.qvtTransformation/.classpath
index 8a8f1668cdc..8a8f1668cdc 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/.classpath
+++ b/deprecated/org.eclipse.papyrus.qvtTransformation/.classpath
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/.project b/deprecated/org.eclipse.papyrus.qvtTransformation/.project
index fc20664dbb7..fc20664dbb7 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/.project
+++ b/deprecated/org.eclipse.papyrus.qvtTransformation/.project
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.qvtTransformation/.settings/org.eclipse.jdt.core.prefs
index bedb6e48320..bedb6e48320 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.qvtTransformation/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.qvtTransformation/META-INF/MANIFEST.MF
index 366e510fbc3..366e510fbc3 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.qvtTransformation/META-INF/MANIFEST.MF
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/build.properties b/deprecated/org.eclipse.papyrus.qvtTransformation/build.properties
index 4b8162ab8b2..4b8162ab8b2 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/build.properties
+++ b/deprecated/org.eclipse.papyrus.qvtTransformation/build.properties
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/icons/icon.gif b/deprecated/org.eclipse.papyrus.qvtTransformation/icons/icon.gif
index 2c1ceaf036e..2c1ceaf036e 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/icons/icon.gif
+++ b/deprecated/org.eclipse.papyrus.qvtTransformation/icons/icon.gif
Binary files differ
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/plugin.xml b/deprecated/org.eclipse.papyrus.qvtTransformation/plugin.xml
index 8294a8d4f36..8294a8d4f36 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.qvtTransformation/plugin.xml
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java b/deprecated/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java
index bed24bdc18a..bed24bdc18a 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java
+++ b/deprecated/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java b/deprecated/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java
index 33d9fc465f1..33d9fc465f1 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java
+++ b/deprecated/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.classpath b/deprecated/org.eclipse.papyrus.sasheditor.ui/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.test/.classpath
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/.classpath
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/.project b/deprecated/org.eclipse.papyrus.sasheditor.ui/.project
index 128d28c4703..128d28c4703 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/.project
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/.project
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.sasheditor.ui/META-INF/MANIFEST.MF
index 6750130f072..6750130f072 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/META-INF/MANIFEST.MF
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/build.properties b/deprecated/org.eclipse.papyrus.sasheditor.ui/build.properties
index 255e23b619c..255e23b619c 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/build.properties
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/build.properties
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/contexts.xml b/deprecated/org.eclipse.papyrus.sasheditor.ui/contexts.xml
index 64aff45a3ad..64aff45a3ad 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/contexts.xml
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/contexts.xml
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/icons/sample.gif b/deprecated/org.eclipse.papyrus.sasheditor.ui/icons/sample.gif
index 34fb3c9d8cb..34fb3c9d8cb 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/icons/sample.gif
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/icons/sample.gif
Binary files differ
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/plugin.xml b/deprecated/org.eclipse.papyrus.sasheditor.ui/plugin.xml
index 8f36319eff1..8f36319eff1 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/plugin.xml
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/Activator.java b/deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/Activator.java
index 100b9943bf1..100b9943bf1 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/Activator.java
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/Activator.java
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsView.java b/deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsView.java
index f9f7907d5bb..f9f7907d5bb 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsView.java
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsView.java
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewModel.java b/deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewModel.java
index ba95ca7a7be..ba95ca7a7be 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewModel.java
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewModel.java
diff --git a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewPart.java b/deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewPart.java
index f3ceff10af2..f3ceff10af2 100644
--- a/extraplugins/developer/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewPart.java
+++ b/deprecated/org.eclipse.papyrus.sasheditor.ui/src/org/eclipse/papyrus/sasheditor/ui/views/SashWindowsViewPart.java
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.settings/org.eclipse.jdt.core.prefs b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c537b63063c
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
index 19fc7907330..fab154a1744 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.gmf.runtime.common.core;bundle-version="1.4.1",
org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
org.eclipse.papyrus.acceleo;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.views.cpp;
uses:="org.eclipse.ui,
com.cea.papyrus.views.panels,
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CppPanelView.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CppPanelView.java
index 0e6e7452753..8edc83aec64 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CppPanelView.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/cpp/CppPanelView.java
@@ -11,12 +11,10 @@
package org.eclipse.papyrus.views.cpp;
-import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.views.panels.CppAbstractPanel;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbenchPart;
@@ -78,22 +76,8 @@ public class CppPanelView extends AbstractCppPanelView {
}
// Retrieve selected object
- Object currentObject = sSelection.getFirstElement();
- // If the object is an edit part, try to get semantic bridge
- if(currentObject instanceof GraphicalEditPart) {
- GraphicalEditPart editPart = (GraphicalEditPart)currentObject;
- if(editPart.getModel() instanceof View) {
- View view = (View)editPart.getModel();
- if(view.getElement() instanceof Element) {
- currentObject = (Element)view.getElement();
- }
- }
- }
- else if(currentObject instanceof IAdaptable) {
- // modisco ModelElementItem supports IAdaptable (cleaner than cast / dependency with modisco)
- currentObject = ((IAdaptable)currentObject).getAdapter(EObject.class);
- }
-
+ EObject currentObject = EMFHelper.getEObject(sSelection.getFirstElement());
+
if(currentObject instanceof Element) {
if(currentTarget != currentObject) {
currentTarget = (Element)currentObject;
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppAbstractPanel.java b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppAbstractPanel.java
index aa7a0ba16d2..d8cbc5766c5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppAbstractPanel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/src/org/eclipse/papyrus/views/panels/CppAbstractPanel.java
@@ -44,18 +44,18 @@ public abstract class CppAbstractPanel extends Composite {
// string representing the ID of the language
// this is the string contained in the language attribute of Activity
- protected static final String C_CPP_ID = "C/C++";
+ protected static final String C_CPP_ID = "C/C++"; //$NON-NLS-1$
- protected static final String CPP_ID = "C++";
+ protected static final String CPP_ID = "C++"; //$NON-NLS-1$
- protected static final String C_ID = "C";
+ protected static final String C_ID = "C"; //$NON-NLS-1$
// CppInclude text area
protected Button buttonSave;
protected Button buttonCancel;
- /** Listener for modifications on the uml element */
+ /** Listener for modifications on the UML element */
protected UMLElementPanelListener umlListener = null;
public CppAbstractPanel(Composite parent, int style) {
@@ -129,7 +129,7 @@ public abstract class CppAbstractPanel extends Composite {
groupBody.setBackground(textArea.getBackground());
groupBody.setLayout(new FormLayout());
- groupBody.setText(" " + name + " ");
+ groupBody.setText(" " + name + " "); //$NON-NLS-1$ //$NON-NLS-2$
groupBody.setFont(Activator.VIEW_FONT);
FormData data = new FormData();
@@ -235,7 +235,7 @@ public abstract class CppAbstractPanel extends Composite {
buttonSave = new Button(this, SWT.PUSH);
buttonSave.setImage(Activator.getImage(Activator.SAVE_IMAGE));
- buttonSave.setToolTipText(Activator.getResourceString("panel.class.button.save.tooltip"));
+ buttonSave.setToolTipText(Activator.getResourceString("panel.class.button.save.tooltip")); //$NON-NLS-1$
buttonSave.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent arg0) {
@@ -245,7 +245,7 @@ public abstract class CppAbstractPanel extends Composite {
buttonCancel = new Button(this, SWT.PUSH);
buttonCancel.setImage(Activator.getImage(Activator.UNDO_IMAGE));
- buttonCancel.setToolTipText(Activator.getResourceString("panel.class.button.cancel.tooltip"));
+ buttonCancel.setToolTipText(Activator.getResourceString("panel.class.button.cancel.tooltip")); //$NON-NLS-1$
buttonCancel.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent arg0) {
@@ -337,13 +337,13 @@ public abstract class CppAbstractPanel extends Composite {
if(modelChanged) {
MessageDialog dialog = new MessageDialog(
Display.getCurrent().getActiveShell(),
- Activator.getResourceString("panel.property.dialog.saveorignore.title"),
+ Activator.getResourceString("panel.property.dialog.saveorignore.title"), //$NON-NLS-1$
Activator.getImage(Activator.WARNING_IMAGE),
- Activator.getResourceString("panel.property.dialog.saveorignore"),
+ Activator.getResourceString("panel.property.dialog.saveorignore"), //$NON-NLS-1$
0,
new String[]{
- Activator.getResourceString("panel.property.dialog.saveorignore.button.save"),
- Activator.getResourceString("panel.property.dialog.saveorignore.button.ignore") },
+ Activator.getResourceString("panel.property.dialog.saveorignore.button.save"), //$NON-NLS-1$
+ Activator.getResourceString("panel.property.dialog.saveorignore.button.ignore") }, //$NON-NLS-1$
0);
dialog.open();
if(dialog.getReturnCode() == 0) { //saveButton pressed
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/.classpath b/extraplugins/epf-richtext/org.eclipse.epf.common.html/.classpath
deleted file mode 100644
index 8db29a6be58..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/Tidy.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/.project b/extraplugins/epf-richtext/org.eclipse.epf.common.html/.project
deleted file mode 100644
index 4fa523f8557..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.epf.common.html</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/META-INF/MANIFEST.MF b/extraplugins/epf-richtext/org.eclipse.epf.common.html/META-INF/MANIFEST.MF
deleted file mode 100644
index 566a52ac1ec..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.common.html;singleton:=true
-Bundle-Version: 1.5.0.qualifier
-Bundle-ClassPath: commonHTML.jar,lib/Tidy.jar
-Bundle-Activator: org.eclipse.epf.common.html.CommonHTMLPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.epf.common
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.common.html
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/about.html b/extraplugins/epf-richtext/org.eclipse.epf.common.html/about.html
deleted file mode 100644
index 04a6d65fb9f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/build.properties b/extraplugins/epf-richtext/org.eclipse.epf.common.html/build.properties
deleted file mode 100644
index cb33cb2a0e2..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.commonHTML.jar = src/
-output.commonHTML.jar = bin/
-bin.includes = commonHTML.jar,\
- plugin.properties,\
- META-INF/,\
- about.html,\
- plugin.xml,\
- lib/
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/lib/Tidy.jar b/extraplugins/epf-richtext/org.eclipse.epf.common.html/lib/Tidy.jar
deleted file mode 100644
index af4eed0506b..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/lib/Tidy.jar
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/plugin.properties b/extraplugins/epf-richtext/org.eclipse.epf.common.html/plugin.properties
deleted file mode 100644
index 6372abf9e60..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# NLS_ENCODING=UNICODE
-#-------------------------------------------------------------------------------
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial implementation.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Common HTML
-providerName=Eclipse.org
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/plugin.xml b/extraplugins/epf-richtext/org.eclipse.epf.common.html/plugin.xml
deleted file mode 100644
index f6af5e2d3ca..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.epf.common.htmlFormatter">
- <htmlFormatter
- class="org.eclipse.epf.common.html.DefaultHTMLFormatter"/>
- </extension>
-
- <extension
- point="org.eclipse.epf.common.htmlParser">
- <htmlParser
- class="org.eclipse.epf.common.html.DefaultHTMLParser"/>
- </extension>
-</plugin>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/CommonHTMLPlugin.java b/extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/CommonHTMLPlugin.java
deleted file mode 100644
index ae5a9f9c28f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/CommonHTMLPlugin.java
+++ /dev/null
@@ -1,56 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.html;
-
-import org.eclipse.epf.common.AbstractActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Common plug-in activator.
- */
-public final class CommonHTMLPlugin extends AbstractActivator {
-
- // The shared plug-in instance.
- private static CommonHTMLPlugin plugin;
-
- /**
- * Creates a new instance.
- */
- public CommonHTMLPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * @see org.eclipse.epf.common.ui.AbstractPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * @see org.eclipse.epf.common.ui.AbstractPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Gets the shared instance.
- *
- * @return the shared plug-in instance
- */
- public static CommonHTMLPlugin getDefault() {
- return plugin;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/DefaultHTMLFormatter.java b/extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/DefaultHTMLFormatter.java
deleted file mode 100644
index eca7bf5a198..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/DefaultHTMLFormatter.java
+++ /dev/null
@@ -1,286 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.html;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.epf.common.IHTMLFormatter;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.w3c.tidy.Tidy;
-
-/**
- * Pretty-formats HTML source and makes it XHTML compliant.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class DefaultHTMLFormatter implements IHTMLFormatter{
-
- protected static final String HTML_BODY_START_TAG = "<body"; //$NON-NLS-1$
-
- protected static final String HTML_BODY_END_TAG = "</body>"; //$NON-NLS-1$
-
-// private static final int HTML_BODY_START_TAG_LENGTH = HTML_BODY_START_TAG
-// .length();
-
- protected int lineWidth;
-
- protected boolean indent;
-
- protected int indentSize;
-
- protected String lastErrorStr;
-
-
-
-
-
- /**
- * Creates a new instance.
- */
- public DefaultHTMLFormatter() {
- this(132, true, 4);
- }
-
- /**
- * Creates a new instance.
- */
- public DefaultHTMLFormatter(int lineWidth, boolean indent, int indentSize) {
- this.lineWidth = lineWidth;
- this.indent = indent;
- this.indentSize = indentSize;
- }
-
- /**
- * Sets the maximum character width of a line.
- *
- * @param lineWidth
- * The line width (in number of characters).
- */
- public void setLineWidth(int lineWidth) {
- this.lineWidth = lineWidth;
- }
-
- /**
- * Enables or disables tags indent.
- *
- * @param indent
- * If true, ident the tags.
- */
- public void setIndent(boolean indent) {
- this.indent = indent;
- }
-
- /**
- * Sets the indent size.
- *
- * @param indentSize
- * The indent size (in number of characters).
- */
- public void setIndentSize(int indentSize) {
- this.indentSize = indentSize;
- }
-
- /**
- * Formats the given HTML source.
- *
- * @param html
- * The HTML source.
- * @return The pretty-formatted HTML source.
- */
- public String formatHTML(String html) throws UnsupportedEncodingException {
- return formatHTML(html, false, false, false, false);
- }
-
- /**
- * Formats the given HTML source.
- *
- * @param html The HTML source.
- * @param returnBodyOnly if false, return full HTML document or body content based on what is passed in. if true, always return body content only
- * @param forceOutput if true, return cleaned HTML even if errors. if false, will clean minor problems and return clean HTML, but on a major error, will set getLastErrorStr() and return passed-in html
- * @param makeBare set to true for cleaning MS HTML
- * @param word2000 set to true for cleaning MS Word 2000 HTML
- * @return
- * @throws UnsupportedEncodingException
- */
- public String formatHTML(String html, boolean returnBodyOnly, boolean forceOutput, boolean makeBare, boolean word2000) throws UnsupportedEncodingException {
- lastErrorStr = null;
- if (html == null || html.length() == 0) {
- return html;
- }
-
- html = removeLeadingWhitespace(html);
-
- Tidy tidy = new Tidy();
- tidy.setXHTML(true);
- tidy.setDropEmptyParas(false);
- tidy.setDropFontTags(false);
- tidy.setQuiet(true);
- tidy.setShowWarnings(false);
- tidy.setSmartIndent(false);
- tidy.setTidyMark(false);
- tidy.setWraplen(lineWidth);
- tidy.setIndentAttributes(false);
- tidy.setIndentContent(indent);
- tidy.setSpaces(indentSize);
- tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
-// tidy.setInputEncoding("UTF-16"); //$NON-NLS-1$
-// tidy.setOutputEncoding("UTF-16");//$NON-NLS-1$
- tidy.setFixBackslash(false);
- // this will add <p> around each text block (?that isn't in a block already?)
-// tidy.setEncloseBlockText(true);
- // setting this seemed to prevent JTidy from indenting the source
-// tidy.setPrintBodyOnly(true);
-
- if (forceOutput) {
- // output document even if errors are present
-// tidy.setForceOutput(true);
- }
- if (makeBare) {
- // remove MS clutter
-// tidy.setMakeBare(true);
- tidy.setMakeClean(true);
- }
- if (word2000) {
- // draconian Word2000 cleaning
- tidy.setWord2000(true);
- }
-
-
-// Reader input = new StringReader(html);
-// Writer output = new StringWriter();
-
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- tidy.setErrout(pw);
- InputStream input= new ByteArrayInputStream(html.getBytes("UTF-8"));
-
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- tidy.parse(input, output);
- String error = sw.getBuffer().toString();
- if (error != null && error.length() > 0
- && error.startsWith("line") && error.indexOf("column") > 0) { //$NON-NLS-1$ //$NON-NLS-2$
- lastErrorStr = error;
- if (!forceOutput) {
- // if forceOutput is true, JTidy will return clean HTML so don't return here
- return html;
- }
- }
-
- String formattedHTML = new String(output.toByteArray(), "UTF-8"); //$NON-NLS-1$
- formattedHTML = StrUtil.getEscapedHTML(formattedHTML);
-
- String htmlStartUpper = html.substring(0, Math.min(10, html.length())).toUpperCase();
-
- if (returnBodyOnly || (!htmlStartUpper.startsWith("<!DOCTYPE") && !htmlStartUpper.startsWith("<HTML"))) { //$NON-NLS-1$ //$NON-NLS-2$
- int startBodyTag = formattedHTML.indexOf(HTML_BODY_START_TAG);
- int start = -1;
- if (startBodyTag != -1) {
- start = formattedHTML.indexOf(">",startBodyTag); //$NON-NLS-1$
- }
- int end = formattedHTML.indexOf(HTML_BODY_END_TAG);
- if (start == -1 || end == -1) {
- return ""; //$NON-NLS-1$
- }
- start += 1;
- if (start >= end) {
- return ""; //$NON-NLS-1$
- }
- start += FileUtil.LINE_SEP_LENGTH;
- end -= FileUtil.LINE_SEP_LENGTH;
- if (indent && indentSize > 0) {
- end -= indentSize;
- }
- if (start >= end) {
- return ""; //$NON-NLS-1$
- }
- String result = formattedHTML.substring(start, end);
- if (indent && indentSize > 0) {
- String indentStr = getIndentStr(indentSize * 2);
- result = fixIndentation(result, indentStr);
- return result;
- }
- }
- return formattedHTML;
- }
-
- /**
- * Returns the indent string.
- */
- protected static String getIndentStr(int indentLength) {
- if (indentLength == 0) {
- return ""; //$NON-NLS-1$
- }
- StringBuffer indentStr = new StringBuffer();
- for (int i = 0; i < indentLength; i++) {
- indentStr.append(' ');
- }
- return indentStr.toString();
- }
-
- public static final String PRE_TAG_START = "<pre>"; //$NON-NLS-1$
-
- public static final String PRE_TAG_END = "</pre>"; //$NON-NLS-1$
-
- public static final int PRE_TAG_END_LENGTH = PRE_TAG_END.length();
-
- /**
- * Undo the JTidy indent, but ignore &lt;pre&gt; tags
- *
- * @param html
- * @param indentStr
- * @return
- */
- protected static String fixIndentation(String html, String indentStr) {
- if (html.startsWith(indentStr)) {
- html = html.substring(indentStr.length());
- }
- StringBuffer strBuf = new StringBuffer();
- int pre_index = -1;
- int last_pre_end_index = -1;
- while ((pre_index = html.indexOf(PRE_TAG_START, last_pre_end_index)) != -1) {
- strBuf.append(html.substring(
- last_pre_end_index < 0 ? 0 : last_pre_end_index
- + PRE_TAG_END_LENGTH, pre_index).replaceAll(
- "\r\n" + indentStr, "\r\n")); //$NON-NLS-1$ //$NON-NLS-2$
- last_pre_end_index = html.indexOf(PRE_TAG_END, pre_index);
- if (last_pre_end_index != -1) {
- strBuf.append(html.substring(pre_index, last_pre_end_index
- + PRE_TAG_END_LENGTH));
- } else {
- // found <pre>, but no ending </pre> - shouldn't ever get here
- // append rest of string and return it
- strBuf.append(html.substring(pre_index));
- return strBuf.toString();
- }
- }
- strBuf.append(html.substring(
- last_pre_end_index < 0 ? 0 : last_pre_end_index
- + PRE_TAG_END_LENGTH).replaceAll("\r\n" + indentStr, //$NON-NLS-1$
- "\r\n")); //$NON-NLS-1$
- return strBuf.toString();
- }
-
- public String getLastErrorStr() {
- return lastErrorStr;
- }
-
-
- public String removeLeadingWhitespace(String input) {
- return p_whitespace.matcher(input).replaceAll(""); //$NON-NLS-1$
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/DefaultHTMLParser.java b/extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/DefaultHTMLParser.java
deleted file mode 100644
index 9e99d55b3ed..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.html/src/org/eclipse/epf/common/html/DefaultHTMLParser.java
+++ /dev/null
@@ -1,212 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.html;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Properties;
-
-import org.eclipse.epf.common.IHTMLParser;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.tidy.Configuration;
-import org.w3c.tidy.Tidy;
-
-/**
- * Extracts the title, meta tags and text from a HTML file or source.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class DefaultHTMLParser implements IHTMLParser{
-
- private static final int BUFFER_SIZE = 4096;
-
- private static final String HTML_SCRIPT_TAG = "script"; //$NON-NLS-1$
-
- private static final String HTML_TITLE_TAG = "title"; //$NON-NLS-1$
-
- private static final String HTML_META_TAG = "meta"; //$NON-NLS-1$
-
- protected Tidy tidy;
-
- private String title;
-
- private String summary;
-
- private String text;
-
- private Properties metaTags;
-
- private StringBuffer htmlText;
-
- /**
- * Creates a new instance.
- */
- public DefaultHTMLParser() {
- try {
- tidy = new Tidy();
- tidy.setXHTML(true);
- tidy.setDropEmptyParas(true);
- tidy.setDropFontTags(true);
- tidy.setQuiet(true);
- tidy.setShowWarnings(false);
- tidy.setSmartIndent(false);
- tidy.setTidyMark(false);
- tidy.setWraplen(132);
- tidy.setIndentAttributes(false);
- tidy.setIndentContent(false);
- tidy.setSpaces(2);
- tidy.setCharEncoding(Configuration.ISO2022);
-// tidy.setInputEncoding("UTF-8"); //$NON-NLS-1$
-// tidy.setOutputEncoding("UTF-8"); //$NON-NLS-1$
- } catch (Exception e) {
- tidy = null;
- }
- }
-
- /**
- * Parses the given HTML file.
- */
- public void parse(File file) throws Exception {
- if (tidy == null || !file.exists() || !file.canRead()) {
- return;
- }
-
- FileInputStream fis = new FileInputStream(file);
- InputStreamReader isr = new InputStreamReader(fis, "UTF-8"); //$NON-NLS-1$
- BufferedReader br = new BufferedReader(isr);
-
- StringBuffer textBuffer = new StringBuffer(BUFFER_SIZE);
- char[] buffer = new char[BUFFER_SIZE];
- int charsRead;
- while ((charsRead = br.read(buffer, 0, BUFFER_SIZE)) > 0) {
- textBuffer.append(buffer, 0, charsRead);
- }
-
- parse(textBuffer.toString());
-
- if (br != null) {
- try {
- br.close();
- } catch (IOException e) {
- }
- }
- }
-
- /**
- * Parses the given HTML source.
- */
- protected void parse(String htmlSource) throws Exception {
- title = ""; //$NON-NLS-1$
- summary = ""; //$NON-NLS-1$
- text = ""; //$NON-NLS-1$
- metaTags = new Properties();
-
- Document doc = getDocument(htmlSource);
- if (doc != null) {
- htmlText = new StringBuffer(1024);
- extract(doc.getChildNodes());
- text = htmlText.toString();
- }
- }
-
- /**
- * Returns the title text.
- */
- public String getTitle() {
- return title;
- }
-
- /**
- * Returns the HTML meta tags.
- */
- public Properties getMetaTags() {
- return metaTags;
- }
-
- /**
- * Returns the summary.
- */
- public String getSummary() {
- return summary;
- }
-
- /**
- * Returns the body text.
- */
- public String getText() {
- return text;
- }
-
- /**
- * Returns the DOM document for the given HTML source.
- */
- protected Document getDocument(String html) throws Exception {
- if (html == null || html.length() == 0) {
- return null;
- }
-
- ByteArrayInputStream input = new ByteArrayInputStream(html
- .getBytes("UTF-8")); //$NON-NLS-1$
- ByteArrayOutputStream output = new ByteArrayOutputStream();
-
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- tidy.setErrout(pw);
-
- return tidy.parseDOM(input, output);
- }
-
- /**
- * Extracts the title, meta tags and body text from the given nodes.
- */
- protected void extract(NodeList nodes) {
- for (int i = 0; i < nodes.getLength(); i++) {
- Node node = nodes.item(i);
- String nodeName = node.getNodeName();
- switch (node.getNodeType()) {
- case Node.ELEMENT_NODE:
- if (!nodeName.equals(HTML_SCRIPT_TAG)) {
- NamedNodeMap attrs = node.getAttributes();
- for (int j = 0; j < attrs.getLength(); j++) {
- Node attrNode = attrs.item(j);
- String attrNodeName = attrNode.getNodeName();
- String attrNodeValue = attrNode.getNodeValue();
- if (attrNodeName.equals(HTML_TITLE_TAG)) {
- title = attrNodeValue;
- } else if (attrNodeName.equals(HTML_META_TAG)) {
- metaTags.put(attrNodeName, attrNodeValue);
- }
- }
- NodeList childNodes = node.getChildNodes();
- if (childNodes != null && childNodes.getLength() > 0) {
- extract(childNodes);
- }
- }
- break;
- case Node.TEXT_NODE:
- htmlText.append(node.getNodeValue()).append(' ');
- break;
- }
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/.classpath b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/.classpath
deleted file mode 100644
index 02159672985..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/.project b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/.project
deleted file mode 100644
index eacf917d8f1..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.epf.common.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/.settings/org.eclipse.pde.core.prefs b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 0efa3f0b61e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Jan 04 15:09:09 PST 2008
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/META-INF/MANIFEST.MF b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 376c2425211..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.common.ui
-Bundle-Version: 1.5.0.qualifier
-Bundle-Activator: org.eclipse.epf.common.ui.CommonUIPlugin
-Import-Package: org.osgi.framework;version="1.3.0"
-Eclipse-LazyStart: true
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;visibility:=reexport,
- org.eclipse.epf.common;visibility:=reexport
-Export-Package: org.eclipse.epf.common.ui,
- org.eclipse.epf.common.ui.actions,
- org.eclipse.epf.common.ui.util
-Bundle-Vendor: %providerName
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/about.html b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/about.html
deleted file mode 100644
index 04a6d65fb9f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/build.properties b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/build.properties
deleted file mode 100644
index f4ae9701586..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/plugin.properties b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/plugin.properties
deleted file mode 100644
index b50cbf887d1..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial implementation.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Common UI plug-in
-providerName=Eclipse.org
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/AbstractPlugin.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/AbstractPlugin.java
deleted file mode 100644
index fa3ca270068..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/AbstractPlugin.java
+++ /dev/null
@@ -1,529 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.IActivator;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.common.ui.util.MsgDialog;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.I18nUtil;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The abstract base class for all EPF plug-ins.
- *
- * @author Kelvin Low
- * @author Jinhua Xi
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public abstract class AbstractPlugin extends AbstractUIPlugin implements IActivator {
-
-
- // The relative path to the icons.
- private static final String ICON_PATH = "icons/"; //$NON-NLS-1$;
-
- // The logger hash map.
- private static Map<String, Logger> loggers = new HashMap<String, Logger>();
-
- // The message dialog hash map.
- private static Map<String, MsgDialog> msgDialogs = new HashMap<String, MsgDialog>();
-
- // The shared image hash map.
- private static Map<String, Image> sharedImages = new HashMap<String, Image>();
-
- // The resource bundle for this plug-in.
- private ResourceBundle resourceBundle;
-
- // This plug-in ID.
- private String pluginId;
-
- // The plug-in install URL.
- private URL installURL;
-
- // The plug-in install path.
- private String installPath;
-
- // The plug-in icon URL.
- private URL iconURL;
-
- // The profiling flag.
- private boolean profiling;
-
- /**
- * Default constructor.
- */
- public AbstractPlugin() {
- super();
- }
-
- /**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
-
- init(context);
-
- // set the
- if (isDebugging()) {
- getLogger().logInfo("Started " + pluginId); //$NON-NLS-1$
- }
- }
-
- /**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- // Free the shared images.
- for (Iterator images = sharedImages.values().iterator(); images
- .hasNext();) {
- Image image = (Image) images.next();
- if (image != null && !image.isDisposed()) {
- image.dispose();
- }
- }
-
- super.stop(context);
-
- if (isDebugging()) {
- getLogger().logInfo("Stopped " + pluginId); //$NON-NLS-1$
- }
- }
-
- /**
- * Initializes this plug-in.
- *
- * @param context
- * The bundle context.
- */
- protected void init(BundleContext context) throws Exception {
- // Get the bundle for this plug-in.
- Bundle bundle = getBundle();
-
- // Get the resouce bundle for this plug-in.
- resourceBundle = Platform.getResourceBundle(bundle);
-
- // Get the ID for this plug-in.
- pluginId = bundle.getSymbolicName();
-
- if (isDebugging()) {
- getLogger().logInfo("Initializing " + pluginId); //$NON-NLS-1$
- }
-
- // Get the install path of this plug-in.
- installURL = bundle.getEntry("/"); //$NON-NLS-1$
-
- try {
- installPath = FileLocator.resolve(installURL).getPath();
- } catch (IOException e) {
- installPath = Platform.getInstallLocation().getURL().getPath();
- }
-
- try {
- iconURL = new URL(installURL, ICON_PATH);
- } catch (IOException e) {
- }
-
- String symbolicName = bundle.getSymbolicName();
- if (symbolicName != null) {
- String key = symbolicName + "/profiling"; //$NON-NLS-1$
- String value = InternalPlatform.getDefault().getOption(key);
- profiling = value == null ? false : value.equalsIgnoreCase("true"); //$NON-NLS-1$
- }
-
- if (isDebugging()) {
- getLogger().logInfo(
- "Initialized " + pluginId + ", installPath=" + installPath); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * Returns the ID of this plug-in.
- *
- * @return The ID of this plug-in.
- */
- public String getId() {
- return pluginId;
- }
-
- /**
- * Returns the install URL of this plug-in.
- *
- * @param The
- * install URL of this plug-in.
- */
- public URL getInstallURL() {
- return installURL;
- }
-
- /**
- * Returns the install path of this plug-in.
- *
- * @param The
- * install path of this plug-in.
- */
- public String getInstallPath() {
- return installPath;
- }
-
- /**
- * Loads and returns the localized properties of a Java properties file.
- * <p>
- *
- * @param path
- * The properties file path relative to the plug-in root.
- * @return A <code>Properties</code> object.
- */
- public Properties getProperties(String path) throws IOException {
- Properties props = new Properties();
- if (path == null) {
- return props;
- }
-
- String filePath = getLocalizedFile(path, true);
- if (filePath != null) {
- props.load(new FileInputStream(filePath));
- }
-
- return props;
- }
-
- /**
- * get the locale specific absolute file path name of the given file in the
- * plugin.
- *
- * @param path
- * The properties file path relative to the plug-in root.
- * @return String the locale specific absolute file path name of the given
- * file.
- * @throws IOException
- */
- public String getLocalizedFile(String path, boolean useDefault)
- throws IOException {
- String filePath = null;
- String fileName = FileUtil.getFileName(path);
- int index = path.lastIndexOf(fileName);
- String pathName = path.substring(0, index);
-
- Locale locale = Locale.getDefault();
-
- Bundle bundle = getBundle();
- Bundle[] bundles = Platform.getFragments(bundle);
- if (bundles != null) {
- for (int i = 0; i < bundles.length; i++) {
- URL entry = bundles[i].getEntry(pathName);
- if (entry != null) {
- URL url = FileLocator.resolve(entry);
- filePath = I18nUtil.getLocalizedFile(url.getPath()
- + fileName, locale);
- if (filePath != null) {
- break;
- }
- }
- }
- }
-
- if (filePath == null) {
- URL entry = bundle.getEntry(path);
- if (entry != null) {
- URL url = FileLocator.resolve(entry);
- filePath = I18nUtil.getLocalizedFile(url.getPath(), locale);
- if (filePath == null && useDefault) {
- filePath = url.getPath();
- }
- }
- }
-
- return filePath;
- }
-
- /**
- * for the given path in the plugin, find the localized files form the nl
- * fragemenets and copy the localized files to the destination folder
- *
- * @param path
- * String a relative path to the plugin root. The files in this
- * folder will be iterated and their localized files will be
- * copied over
- * @param toDir
- * FIle the destination folder
- * @param recursive
- * boolean recurively looking for files int the specified folder
- * @param useLocaleFileName
- * boolean if true the locale specific file names will be used in
- * the copied destination, otherwise, the locale specific file
- * name will be renamed to the default one in the destination
- * folder
- * @throws IOException
- */
- public void copyLocalizedFiles(String path, File toDir, boolean recursive,
- boolean useLocaleFileName) throws IOException {
- String pluginPath = getInstallPath();
- URI pluginUri = new File(pluginPath).toURI();
- URI pathUri = new File(pluginPath, path).toURI();
-
- List<File> files = new ArrayList<File>();
- File f = new File(pluginPath, path);
- FileUtil.getAllFiles(f, files, recursive);
-
- // for each file found in the specified folder, get the localized file
- for (Iterator it = files.iterator(); it.hasNext();) {
- URI srcUri = ((File) it.next()).toURI();
-
- // get the relative path of the file to the plugin root, then find
- // the localized file
- String relPath = pluginUri.relativize(srcUri).getPath();
-
- // only get the locale specific file, don't include the default one
- String localizedFile = getLocalizedFile(relPath, false);
- if (localizedFile == null) {
- continue;
- }
-
- // need to change the target file path to relative to the path
- // instead of the plugin root
- relPath = pathUri.relativize(srcUri).getPath();
- File srcFile = new File(localizedFile);
- File targetFile = new File(toDir, relPath);
- File targetParent = targetFile.getParentFile();
-
- // copy the file to the desitination
- // if useLocaleFileName is true, the destination file name should
- // also use the locale specific file name
- if (useLocaleFileName) {
- String fileName = srcFile.getName();
- targetFile = new File(targetParent, fileName);
- }
-
- if (isDebugging()) {
- System.out.println("Copying localized file: "); //$NON-NLS-1$
- System.out.println("Source: " + srcFile); //$NON-NLS-1$
- System.out.println("Target: " + targetFile); //$NON-NLS-1$
- System.out.println(""); //$NON-NLS-1$
- }
-
- try {
- if (!targetParent.exists()) {
- targetParent.mkdirs();
- }
-
- if (!targetFile.exists()) {
- targetFile.createNewFile();
- }
-
- FileUtil.copyFile(srcFile, targetFile);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- }
-
- /**
- * Returns the localized resource.
- *
- * @param key
- * The resource key.
- * @return The localized resource.
- */
- public String getString(String key) {
- if (resourceBundle != null) {
- try {
- return resourceBundle.getString(key);
- } catch (MissingResourceException e) {
- }
- }
- return '[' + key + ']';
- }
-
- /**
- * Returns the formatted localized message given the resource key and the
- * message argument.
- *
- * @param key
- * The resource key.
- * @param argument
- * The message argument.
- * @return The formatted localized message.
- */
- public String formatMessage(String key, Object argument) {
- if (resourceBundle != null) {
- try {
- String msg = resourceBundle.getString(key);
- Object[] arguments = { argument };
- return MessageFormat.format(msg, arguments);
- } catch (MissingResourceException e) {
- }
- }
- return '[' + key + ']';
- }
-
- /**
- * Returns the image URL given the relative path.
- *
- * @param relativePath
- * The image's path relative to the plug-in's root.
- * @return The image URL.
- */
- public URL getImageURL(String relativePath) {
- try {
- URL url = new URL(iconURL, relativePath);
- return FileLocator.resolve(url);
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- * Returns the image descriptor given the relative path.
- *
- * @param relativePath
- * The image's path relative to the plug-in's root.
- * @return The image descriptor.
- */
- public ImageDescriptor getImageDescriptor(String relativePath) {
- try {
- URL url = new URL(iconURL, relativePath);
- return ImageDescriptor.createFromURL(url);
- } catch (MalformedURLException e) {
- return ImageDescriptor.getMissingImageDescriptor();
- }
- }
-
- /**
- * Returns the image given the relative path.
- * <p>
- * Note: The returned image need to be freed by the caller.
- *
- * @param relativePath
- * The image's path relative to the plug-in's root.
- * @return The image.
- */
- public Image getImage(String relativePath) {
- Image image = null;
-
- ImageDescriptor imageDescriptor = getImageDescriptor(relativePath);
- if (imageDescriptor != null) {
- image = imageDescriptor.createImage(false);
- }
-
- return image;
- }
-
- /**
- * Returns the shared image given the relative path.
- * <p>
- * Note: The returned image will be automatically freed when the plug-in
- * shuts down.
- *
- * @param relativePath
- * The image's path relative to the plug-in's root.
- * @return The image.
- */
- public Image getSharedImage(String relativePath) {
- Image image = (Image) sharedImages.get(relativePath);
- if (image != null) {
- return image;
- }
-
- ImageDescriptor imageDescriptor = getImageDescriptor(relativePath);
- if (imageDescriptor != null) {
- image = imageDescriptor.createImage(false);
- if (image != null) {
- sharedImages.put(relativePath, image);
- }
- }
-
- return image;
- }
-
- /**
- * Returns the profiling flag.
- *
- * @return <code>true</code> if profiling is enabled for this plu-in
- */
- public boolean isProfiling() {
- return profiling;
- }
-
- /**
- * Returns the logger given the plug-in ID.
- *
- * @return The new or cached logger.
- */
- public Logger getLogger() {
- Logger logger = (Logger) loggers.get(pluginId);
- if (logger == null) {
- logger = new Logger(this);
- loggers.put(pluginId, logger);
- }
- return logger;
- }
-
- /**
- * Returns the message dialog given the plug-in ID.
- *
- * @return The new or cached message dialog.
- */
- public static MsgDialog getMsgDialog(IActivator plugin) {
- MsgDialog msgDialog = (MsgDialog) msgDialogs.get(plugin.getId());
- if (msgDialog == null) {
- msgDialog = new MsgDialog(plugin);
- msgDialogs.put(plugin.getId(), msgDialog);
- }
- return msgDialog;
- }
-
-
- public MsgDialog getMsgDialog() {
- return getMsgDialog(this);
- }
-
- /**
- * Returns the standard display to be used. The method first checks, if the
- * thread calling this method has an associated disaply. If so, this display
- * is returned. Otherwise the method returns the default display.
- */
- public static Display getStandardDisplay() {
- Display display;
- display = Display.getCurrent();
- if (display == null)
- display = Display.getDefault();
- return display;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/CommonUIPlugin.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/CommonUIPlugin.java
deleted file mode 100644
index 3681e7d3c58..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/CommonUIPlugin.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common.ui;
-
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.common.IMessageCallback;
-import org.eclipse.epf.common.ui.util.MsgBox;
-import org.osgi.framework.BundleContext;
-
-public class CommonUIPlugin extends AbstractPlugin {
-
- // The shared plug-in instance.
- private static CommonUIPlugin plugin;
-
- /**
- * Creates a new instance.
- */
- public CommonUIPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * @see org.eclipse.epf.common.ui.AbstractPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
-
-// // set the preference store for the common plugin
- PreferenceStoreWrapper storeWrapper = new PreferenceStoreWrapper(getPreferenceStore());
- CommonPlugin.getDefault().setCommonPreferenceStore(storeWrapper);
-
- // create the message callback context for the non-ui plugins
- // this is the context for message callback
- // for eclipse client, this is the Shell object
- // shell object can't be shared acrooss thread, use a context provider instead
- //CommonPlugin.getDefault().setContext(MsgBox.getDefaultShell());
-
- CommonPlugin.getDefault().setContextProvider(new ContextProvider());
-
- // create the MessageCallback to be accessible to the non-ui plugin
- IMessageCallback msgCallback = new MessageCallback();
- }
-
- /**
- * @see org.eclipse.epf.common.ui.AbstractPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Gets the shared instance.
- *
- * @return the shared plug-in instance
- */
- public static CommonUIPlugin getDefault() {
- return plugin;
- }
-
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/ContextProvider.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/ContextProvider.java
deleted file mode 100644
index 7530e31cf0d..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/ContextProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common.ui;
-
-import org.eclipse.epf.common.IContextProvider;
-import org.eclipse.epf.common.ui.util.MsgBox;
-
-/**
- * content provider for non-ui plugins
- *
- * @author Jinhua Xi
- * @since 1.5
- *
- */
-public class ContextProvider implements IContextProvider {
-
- public Object getContext() {
- //TODO: revisit
- Object ctx = null;
- try {
- ctx = CommonUIPlugin.getDefault().getWorkbench().getDisplay().getActiveShell();
- }
- catch(Exception e) {
- //
- }
- return ctx != null ? ctx : MsgBox.getDefaultShell();
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/MessageCallback.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/MessageCallback.java
deleted file mode 100644
index dfef39b6621..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/MessageCallback.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common.ui;
-
-import org.eclipse.epf.common.AbstractActivator;
-import org.eclipse.epf.common.IMessageCallback;
-import org.eclipse.epf.common.ui.util.MsgDialog;
-
-/**
- * message callback implementation
- *
- * @author Jinhua Xi
- * @since 1.5
- *
- */
-public class MessageCallback implements IMessageCallback {
-
- public void displayWarning(AbstractActivator plugin, String title, String msg, String reason) {
- displayWarning(plugin, title, msg, reason, null, null);
- }
-
- public void displayWarning(AbstractActivator plugin, String msg, String reason, Throwable ex) {
- displayWarning(plugin, msg, reason, null, ex);
- }
-
- public void displayWarning(AbstractActivator plugin, String msg, String reason,
- String details, Throwable ex) {
- String title = CommonUIPlugin.getDefault().getWorkbench().getDisplay().getActiveShell().getText();
- displayWarning(plugin, title, msg, reason, details, ex);
- }
-
- public void displayWarning(AbstractActivator plugin, String title, String msg, String reason,
- String details, Throwable ex) {
- MsgDialog dlg = CommonUIPlugin.getDefault().getMsgDialog(plugin);
- dlg.displayWarning(title, msg, reason, details, ex);
- }
-
- public void displayError(AbstractActivator plugin, String title, String msg) {
- displayError(plugin, title, msg, null, null, null);
- }
-
- public void displayError(AbstractActivator plugin, String title, String msg, Throwable ex) {
- displayError(plugin, title, msg, null, null, ex);
- }
- public void displayError(AbstractActivator plugin, String title, String msg, String reason, String details, Throwable ex) {
- MsgDialog dlg = CommonUIPlugin.getDefault().getMsgDialog(plugin);
- dlg.displayError(title, msg, reason, details, ex);
-
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/PreferenceStoreWrapper.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/PreferenceStoreWrapper.java
deleted file mode 100644
index 534f8af084b..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/PreferenceStoreWrapper.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common.ui;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.epf.common.preferences.IPreferenceStoreWrapper;
-import org.eclipse.epf.common.preferences.IPropertyChangeListenerWrapper;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-/**
- * wrapper class for preference store
- *
- * @author Jinhua Xi
- * @since 1.5
- *
- */
-public class PreferenceStoreWrapper implements IPreferenceStoreWrapper {
- private IPreferenceStore store;
- public PreferenceStoreWrapper(IPreferenceStore store) {
- this.store = store;
- }
-
- Map<IPropertyChangeListenerWrapper, IPropertyChangeListener> listenerMap = new HashMap<IPropertyChangeListenerWrapper, IPropertyChangeListener>();
-
- public IPreferenceStore getStore() {
- return store;
- }
-
- public void addPropertyChangeListener(final IPropertyChangeListenerWrapper listener) {
- // create a PropertyChangeListener and add to the store
- IPropertyChangeListener pcl = new IPropertyChangeListener(){
-
- public void propertyChange(PropertyChangeEvent event) {
- PropertyChangeEventWrapper wrapper = new PropertyChangeEventWrapper(event);
- listener.propertyChange(wrapper);
-
- }};
-
- listenerMap.put(listener, pcl);
- store.addPropertyChangeListener(pcl);
- }
-
- public void firePropertyChangeEvent(String name, Object oldValue,
- Object newValue) {
- store.firePropertyChangeEvent(name, oldValue, newValue);
- }
-
- public void removePropertyChangeListener(IPropertyChangeListenerWrapper listener) {
- IPropertyChangeListener pcl = listenerMap.remove(listener);
- if ( pcl != null ) {
- store.removePropertyChangeListener(pcl);
- }
- }
-
- /**
- * Returns the current value of the boolean-valued preference with the
- * given name.
- * Returns the default-default value (<code>false</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as a boolean.
- *
- * @param name the name of the preference
- * @return the boolean-valued preference
- */
- public boolean getBoolean(String name) {
- return store.getBoolean(name);
- }
-
- /**
- * Returns the default value for the boolean-valued preference
- * with the given name.
- * Returns the default-default value (<code>false</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as a boolean.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public boolean getDefaultBoolean(String name) {
- return store.getDefaultBoolean(name);
- }
-
- /**
- * Returns the default value for the double-valued preference
- * with the given name.
- * Returns the default-default value (<code>0.0</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as a double.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public double getDefaultDouble(String name) {
- return store.getDefaultDouble(name);
- }
-
- /**
- * Returns the default value for the float-valued preference
- * with the given name.
- * Returns the default-default value (<code>0.0f</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as a float.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public float getDefaultFloat(String name) {
- return store.getDefaultFloat(name);
- }
-
- /**
- * Returns the default value for the integer-valued preference
- * with the given name.
- * Returns the default-default value (<code>0</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as an integer.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public int getDefaultInt(String name) {
- return store.getDefaultInt(name);
- }
-
- /**
- * Returns the default value for the long-valued preference
- * with the given name.
- * Returns the default-default value (<code>0L</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as a long.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public long getDefaultLong(String name) {
- return store.getDefaultLong(name);
- }
-
- /**
- * Returns the default value for the string-valued preference
- * with the given name.
- * Returns the default-default value (the empty string <code>""</code>)
- * is no default preference with the given name, or if the default
- * value cannot be treated as a string.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public String getDefaultString(String name) {
- return store.getDefaultString(name);
- }
-
- /**
- * Returns the current value of the double-valued preference with the
- * given name.
- * Returns the default-default value (<code>0.0</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as a double.
- *
- * @param name the name of the preference
- * @return the double-valued preference
- */
- public double getDouble(String name) {
- return store.getDouble(name);
- }
-
- /**
- * Returns the current value of the float-valued preference with the
- * given name.
- * Returns the default-default value (<code>0.0f</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as a float.
- *
- * @param name the name of the preference
- * @return the float-valued preference
- */
- public float getFloat(String name) {
- return store.getFloat(name);
- }
-
- /**
- * Returns the current value of the integer-valued preference with the
- * given name.
- * Returns the default-default value (<code>0</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as an integter.
- *
- * @param name the name of the preference
- * @return the int-valued preference
- */
- public int getInt(String name) {
- return store.getInt(name);
- }
-
- /**
- * Returns the current value of the long-valued preference with the
- * given name.
- * Returns the default-default value (<code>0L</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as a long.
- *
- * @param name the name of the preference
- * @return the long-valued preference
- */
- public long getLong(String name) {
- return store.getLong(name);
- }
-
- /**
- * Returns the current value of the string-valued preference with the
- * given name.
- * Returns the default-default value (the empty string <code>""</code>)
- * if there is no preference with the given name, or if the current value
- * cannot be treated as a string.
- *
- * @param name the name of the preference
- * @return the string-valued preference
- */
- public String getString(String name) {
- return store.getString(name);
- }
-
- /**
- * Returns whether the current value of the preference with the given name
- * has the default value.
- *
- * @param name the name of the preference
- * @return <code>true</code> if the preference has a known default value
- * and its current value is the same, and <code>false</code> otherwise
- * (including the case where the preference is unknown to this store)
- */
- public boolean isDefault(String name) {
- return store.isDefault(name);
- }
-
- /**
- * Returns whether the current values in this property store
- * require saving.
- *
- * @return <code>true</code> if at least one of values of
- * the preferences known to this store has changed and
- * requires saving, and <code>false</code> otherwise.
- */
- public boolean needsSaving() {
- return store.needsSaving();
- }
-
- /**
- * Sets the current value of the preference with the given name to
- * the given string value without sending a property change.
- * <p>
- * This method does not fire a property change event and
- * should only be used for setting internal preferences
- * that are not meant to be processed by listeners.
- * Normal clients should instead call #setValue.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void putValue(String name, String value) {
- store.putValue(name, value);
- }
-
- /**
- * Sets the default value for the double-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, double value) {
- store.setDefault(name, value);
- }
-
- /**
- * Sets the default value for the float-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, float value) {
- store.setDefault(name, value);
- }
-
- /**
- * Sets the default value for the integer-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, int value) {
- store.setDefault(name, value);
- }
-
- /**
- * Sets the default value for the long-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, long value) {
- store.setDefault(name, value);
- }
-
- /**
- * Sets the default value for the string-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param defaultObject the new default value for the preference
- */
- public void setDefault(String name, String defaultObject) {
- store.setDefault(name, defaultObject);
- }
-
- /**
- * Sets the default value for the boolean-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, boolean value) {
- store.setDefault(name, value);
- }
-
- /**
- * Sets the current value of the preference with the given name back
- * to its default value.
- * <p>
- * Note that the preferred way of re-initializing a preference to the
- * appropriate default value is to call <code>setToDefault</code>.
- * This is implemented by removing the named value from the store,
- * thereby exposing the default value.
- * </p>
- *
- * @param name the name of the preference
- */
- public void setToDefault(String name) {
- store.setToDefault(name);
- }
-
- /**
- * Sets the current value of the double-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, double value) {
- store.setValue(name, value);
- }
-
- /**
- * Sets the current value of the float-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, float value) {
- store.setValue(name, value);
- }
-
- /**
- * Sets the current value of the integer-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, int value) {
- store.setValue(name, value);
- }
-
- /**
- * Sets the current value of the long-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, long value) {
- store.setValue(name, value);
- }
-
- /**
- * Sets the current value of the string-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, String value) {
- store.setValue(name, value);
- }
-
- /**
- * Sets the current value of the boolean-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, boolean value) {
- store.setValue(name, value);
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/PropertyChangeEventWrapper.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/PropertyChangeEventWrapper.java
deleted file mode 100644
index 2d3a7717757..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/PropertyChangeEventWrapper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common.ui;
-
-import org.eclipse.epf.common.preferences.IPropertyChangeEventWrapper;
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-/**
- * wrapper class for property change event
- *
- * @author Jinhua Xi
- * @since 1.5
- *
- */
-public class PropertyChangeEventWrapper implements IPropertyChangeEventWrapper {
-
- private PropertyChangeEvent event;
- public PropertyChangeEventWrapper(PropertyChangeEvent event) {
- this.event = event;
- }
-
- /**
- * Returns the new value of the property.
- *
- * @return the new value, or <code>null</code> if not known
- * or not relevant (for instance if the property was removed).
- */
- public Object getNewValue() {
- return this.event.getNewValue();
- }
-
- /**
- * Returns the old value of the property.
- *
- * @return the old value, or <code>null</code> if not known
- * or not relevant (for instance if the property was just
- * added and there was no old value).
- */
- public Object getOldValue() {
- return this.event.getOldValue();
- }
-
- /**
- * Returns the name of the property that changed.
- * <p>
- * Warning: there is no guarantee that the property name returned
- * is a constant string. Callers must compare property names using
- * equals, not ==.
- * </p>
- *
- * @return the name of the property that changed
- */
- public String getProperty() {
- return this.event.getProperty();
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/actions/CComboContributionItem.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/actions/CComboContributionItem.java
deleted file mode 100644
index 1858e7f8bb6..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/actions/CComboContributionItem.java
+++ /dev/null
@@ -1,164 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui.actions;
-
-import java.util.Collection;
-
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.CoolBar;
-import org.eclipse.swt.widgets.CoolItem;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * Wraps a CCombo in a ContributionItem for use in a toolbar
- *
- * Does not use a ComboViewer because of tabbing issues - see bug 78885
- * @author Jeff Hardy
- *
- */
-public class CComboContributionItem extends ContributionItem {
-
- protected CCombo CCombo;
-
- protected ToolItem toolItem;
-
- protected CoolItem coolItem;
-
- protected int style;
-
- protected Collection<String> input;
-
- /**
- * Creates a new instance.
- */
- public CComboContributionItem(int style) {
- super();
- this.style = style;
- }
-
- /*
- * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.ToolBar,
- * int)
- */
- public void fill(ToolBar parent, int index) {
- toolItem = new ToolItem(parent, SWT.SEPARATOR);
- Control box = createControl(parent);
- toolItem.setControl(box);
- Point preferredSize = CCombo.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
- toolItem.setWidth(preferredSize.x);
- }
-
- /*
- * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.CoolBar,
- * int)
- */
- public void fill(CoolBar coolBar, int index) {
- Control box = createControl(coolBar);
-
- if (index >= 0) {
- coolItem = new CoolItem(coolBar, SWT.DROP_DOWN, index);
- } else {
- coolItem = new CoolItem(coolBar, SWT.DROP_DOWN);
- }
-
- // Set the back reference.
- coolItem.setData(this);
-
- // Add the toolbar to the CoolItem widget.
- coolItem.setControl(box);
-
- // If the toolbar item exists then adjust the size of the cool item.
- Point toolBarSize = box.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-
- // Set the preferred size to the size of the toolbar plus trim.
- coolItem.setMinimumSize(toolBarSize);
- coolItem.setPreferredSize(toolBarSize);
- coolItem.setSize(toolBarSize);
- }
-
- /*
- * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.Composite)
- */
- public void fill(Composite parent) {
- createControl(parent);
- }
-
- /**
- * Creates the control.
- */
- protected Control createControl(final Composite parent) {
- CCombo = new CCombo(parent, style);
- CCombo.setVisibleItemCount(10);
- CCombo.setEnabled(true);
- CCombo.setItems(input.toArray(new String[0]));
- CCombo.addDisposeListener(
- new DisposeListener() {
- public void widgetDisposed(DisposeEvent event) {
- dispose();
- }
- });
-
- CCombo.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- performSelectionChanged();
- }
- });
-
- return CCombo;
- }
-
- /**
- * Returns the currently selected method configuration
- */
- protected int getSelectionIndex() {
- return CCombo.getSelectionIndex();
- }
-
- protected void setInput(Collection<String> input) {
- this.input = input;
- }
-
-
- protected void performSelectionChanged() {
- }
-
- /*
- * @see org.eclipse.jface.action.ContributionItem#dispose()
- */
- public void dispose() {
- super.dispose();
- }
-
- public CCombo getCCombo() {
- return CCombo;
- }
-
- public ToolItem getToolItem() {
- return toolItem;
- }
-
- public CoolItem getCoolItem() {
- return coolItem;
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/ClipboardUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/ClipboardUtil.java
deleted file mode 100644
index 6fc767b6db4..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/ClipboardUtil.java
+++ /dev/null
@@ -1,122 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui.util;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.HTMLTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
-import org.osgi.framework.Bundle;
-
-/**
- * Utility class for retrieving data from the clipboard.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class ClipboardUtil {
-
- /**
- * The current clipboard.
- */
- private static Clipboard clipboard;
-
- private static final String SOURCE_URL = "SourceURL:"; //$NON-NLS-1$
-
- private static Transfer htmlTransfer = null;
-
- static {
- if (SWT.getPlatform().equals("win32")) { //$NON-NLS-1$
- try {
- boolean is64bit = (System.getProperty("os.arch").indexOf("64") != -1);
- Bundle bundle = null;
- if (is64bit) {
- bundle = Platform
- .getBundle("org.eclipse.epf.common.win32.win32.x86_64"); //$NON-NLS-1$
- } else {
- bundle = Platform
- .getBundle("org.eclipse.epf.common.win32.win32.x86"); //$NON-NLS-1$
- }
- if (bundle != null) {
- Class<?> c = bundle
- .loadClass("org.eclipse.epf.common.win32.Win32HTMLTransfer"); //$NON-NLS-1$
- if (c != null) {
- htmlTransfer = (Transfer) c.newInstance();
- }
- }
- } catch (Exception e) {
- htmlTransfer = null;
- }
- }
- }
-
- /**
- * Gets the HTML source URL from the current clipboard.
- *
- * @return the HTML source URL or <code>null</code>
- */
- public static String getHTMLSourceURL() {
- if (htmlTransfer == null) {
- return null;
- }
-
- Clipboard clipboard = new Clipboard(Display.getCurrent());
- String sourceURL = null;
- try {
- String htmlContent = (String) clipboard.getContents(htmlTransfer);
- if (htmlContent != null && htmlContent.length() > 0) {
- int index = htmlContent.indexOf(SOURCE_URL);
- if (index > 0) {
- sourceURL = htmlContent.substring(index
- + SOURCE_URL.length());
- sourceURL = sourceURL.substring(0, sourceURL
- .indexOf(FileUtil.LINE_SEP));
- }
- }
- if (sourceURL != null && sourceURL.indexOf("\\") != -1) { //$NON-NLS-1$
- // IE provides sourceURL in form "file://C:\foo\bar.htm"
- // but when the hrefs are resolved, files look like "file:///C:/foo/bar.htm"
- URL url = new URL(sourceURL);
- sourceURL = url.toExternalForm();
- if (sourceURL.startsWith("file://") && !sourceURL.startsWith("file:///")) { //$NON-NLS-1$ //$NON-NLS-2$
- // need to add a third / so rte.js can match the sourceURL to hrefs
- sourceURL = "file:///" + sourceURL.substring(7); //$NON-NLS-1$
- }
- }
- return sourceURL;
- } catch (MalformedURLException urlEx) {
- return sourceURL;
- } finally {
- clipboard.dispose();
- }
- }
-
- /**
- * Copy the string to the clipboard.
- */
- public static void copyTextHTMLToClipboard(String string) {
- if (clipboard != null)
- clipboard.dispose();
- clipboard = new Clipboard(null);
- clipboard.setContents(new Object[] { string, string },
- new Transfer[] { TextTransfer.getInstance(), HTMLTransfer.getInstance() });
- if (clipboard != null)
- clipboard.dispose();
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/CommonPreferences.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/CommonPreferences.java
deleted file mode 100644
index d20685d3365..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/CommonPreferences.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common.ui.util;
-
-import org.eclipse.epf.common.ui.CommonUIPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Manages the common preferences.
- *
- * @author Kelvin Low
- * @since 1.2
- */
-public class CommonPreferences {
-
- /**
- * Preference key for storing the preference history size.
- */
- private static final String PREFERENCE_HISTORY_SIZE = "preferenceHistorySize"; //$NON-NLS-1$
-
- // The plug-in specific preference store.
- private static IPreferenceStore prefStore = CommonUIPlugin.getDefault()
- .getPreferenceStore();
-
- static {
- // Initialize the default preference values.
- prefStore.setDefault(PREFERENCE_HISTORY_SIZE,
- getDefaultPreferenceHistorySize());
- }
-
- /**
- * Gets the default preference history size.
- */
- public static int getDefaultPreferenceHistorySize() {
- return 10;
- }
-
- /**
- * Gets the preference history size.
- */
- public static int getPreferenceHistorySize() {
- return prefStore.getInt(PREFERENCE_HISTORY_SIZE);
- }
-
- /**
- * Saves the preference history size.
- */
- public static void setPreferenceHistorySize(int value) {
- prefStore.setValue(PREFERENCE_HISTORY_SIZE, value);
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/ErrorDialogNoReason.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/ErrorDialogNoReason.java
deleted file mode 100644
index 6793260c080..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/ErrorDialogNoReason.java
+++ /dev/null
@@ -1,598 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui.util;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IconAndMessageDialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Displays an error dialog without the Details button.
- *
- * @author Bingxue Xu
- * @since 1.0
- */
-public class ErrorDialogNoReason extends IconAndMessageDialog {
-
- /**
- * Static to prevent opening of error dialogs for automated testing.
- */
- public static final boolean AUTOMATED_MODE = false;
-
- /**
- * Reserve room for this many list items.
- */
- private static final int LIST_ITEM_COUNT = 7;
-
- /**
- * The nesting indent.
- */
- private static final String NESTING_INDENT = " "; //$NON-NLS-1$
-
- /**
- * The Details button.
- */
- protected Button detailsButton;
-
- /**
- * The title of the dialog.
- */
- private String title;
-
- /**
- * The SWT list control that displays the error details.
- */
- private List list;
-
- /**
- * Indicates whether the error details viewer is currently created.
- */
- private boolean listCreated = false;
-
- /**
- * Filter mask for determining which status items to display.
- */
- private int displayMask = 0xFFFF;
-
- /**
- * The main status object.
- */
- private IStatus status;
-
- /**
- * The current clipboard. To be disposed when closing the dialog.
- */
- private Clipboard clipboard;
-
- private boolean shouldIncludeTopLevelErrorInDetails = false;
-
- /**
- * Creates an error dialog. Note that the dialog will have no visual
- * representation (no widgets) until it is told to open.
- * <p>
- * Normally one should use <code>openError</code> to create and open one
- * of these. This constructor is useful only if the error object being
- * displayed contains child items <it>and </it> you need to specify a mask
- * which will be used to filter the displaying of these children.
- * </p>
- *
- * @param parentShell
- * the shell under which to create this dialog
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as
- * per <code>IStatus.matches</code>
- * @see org.eclipse.core.runtime.IStatus#matches(int)
- */
- public ErrorDialogNoReason(Shell parentShell, String dialogTitle,
- String message, IStatus status, int displayMask) {
- super(parentShell);
- this.title = dialogTitle == null ? JFaceResources
- .getString("Problem_Occurred") : //$NON-NLS-1$
- dialogTitle;
- this.message = message == null ? status.getMessage() : message;
- this.status = status;
- this.displayMask = displayMask;
- setShellStyle(getShellStyle() | SWT.RESIZE);
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog. Handles the pressing of the Ok
- * or Details button in this dialog. If the Ok button was pressed then close
- * this dialog. If the Details button was pressed then toggle the displaying
- * of the error details area. Note that the Details button will only be
- * visible if the error being displayed specifies child details.
- */
- protected void buttonPressed(int id) {
- if (id == IDialogConstants.DETAILS_ID) {
- // was the details button pressed?
- toggleDetailsArea();
- } else {
- super.buttonPressed(id);
- }
- }
-
- /*
- * (non-Javadoc) Method declared in Window.
- */
- protected void configureShell(Shell shell) {
- super.configureShell(shell);
- shell.setText(title);
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected void createButtonsForButtonBar(Composite parent) {
- // create OK and Details buttons
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- true);
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
- if (shouldShowDetailsButton()) {
- detailsButton = createButton(parent, IDialogConstants.DETAILS_ID,
- IDialogConstants.SHOW_DETAILS_LABEL, false);
- }
- }
-
- /**
- * This implementation of the <code>Dialog</code> framework method creates
- * and lays out a composite and calls <code>createMessageArea</code> and
- * <code>createCustomArea</code> to populate it. Subclasses should
- * override <code>createCustomArea</code> to add contents below the
- * message.
- */
- protected Control createDialogArea(Composite parent) {
- createMessageArea(parent);
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- layout.numColumns = 2;
- composite.setLayout(layout);
- GridData childData = new GridData(GridData.FILL_BOTH);
- childData.horizontalSpan = 2;
- composite.setLayoutData(childData);
- composite.setFont(parent.getFont());
- return composite;
- }
-
- /*
- * @see IconAndMessageDialog#createDialogAndButtonArea(Composite)
- */
- protected void createDialogAndButtonArea(Composite parent) {
- super.createDialogAndButtonArea(parent);
- if (this.dialogArea instanceof Composite) {
- // Create a label if there are no children to force a smaller layout
- Composite dialogComposite = (Composite) dialogArea;
- if (dialogComposite.getChildren().length == 0)
- new Label(dialogComposite, SWT.NULL);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.IconAndMessageDialog#getImage()
- */
- protected Image getImage() {
- if (status != null) {
- if (status.getSeverity() == IStatus.WARNING)
- return getWarningImage();
- if (status.getSeverity() == IStatus.INFO)
- return getInfoImage();
- }
- // If it was not a warning or an error then return the error image
- return getErrorImage();
- }
-
- /**
- * Create this dialog's drop-down list component.
- *
- * @param parent
- * the parent composite
- * @return the drop-down list component
- */
- protected List createDropDownList(Composite parent) {
- // create the list
- list = new List(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.MULTI);
- // fill the list
- populateList(list);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL
- | GridData.GRAB_VERTICAL);
- data.heightHint = list.getItemHeight() * LIST_ITEM_COUNT;
- data.horizontalSpan = 2;
- list.setLayoutData(data);
- list.setFont(parent.getFont());
- Menu copyMenu = new Menu(list);
- MenuItem copyItem = new MenuItem(copyMenu, SWT.NONE);
- copyItem.addSelectionListener(new SelectionListener() {
- /*
- * @see SelectionListener.widgetSelected (SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- copyToClipboard();
- }
-
- /*
- * @see SelectionListener.widgetDefaultSelected(SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- copyToClipboard();
- }
- });
- copyItem.setText(JFaceResources.getString("copy")); //$NON-NLS-1$
- list.setMenu(copyMenu);
- listCreated = true;
- return list;
- }
-
- /*
- * (non-Javadoc) Method declared on Window.
- */
- /**
- * Extends <code>Window.open()</code>. Opens an error dialog to display
- * the error. If you specified a mask to filter the displaying of these
- * children, the error dialog will only be displayed if there is at least
- * one child status matching the mask.
- */
- public int open() {
- if (!AUTOMATED_MODE && shouldDisplay(status, displayMask)) {
- return super.open();
- }
- setReturnCode(OK);
- return OK;
- }
-
- /**
- * Opens an error dialog to display the given error. Use this method if the
- * error object being displayed does not contain child items, or if you wish
- * to display all such items without filtering.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param dialogTitle
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @return the code of the button that was pressed that resulted in this
- * dialog closing. This will be <code>Dialog.OK</code> if the OK
- * button was pressed, or <code>Dialog.CANCEL</code> if this
- * dialog's close window decoration or the ESC key was used.
- */
- public static int openError(Shell parent, String dialogTitle,
- String message, IStatus status) {
- return openError(parent, dialogTitle, message, status, IStatus.OK
- | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
- }
-
- /**
- * Opens an error dialog to display the given error. Use this method if the
- * error object being displayed contains child items <it>and </it> you wish
- * to specify a mask which will be used to filter the displaying of these
- * children. The error dialog will only be displayed if there is at least
- * one child status matching the mask.
- *
- * @param parentShell
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the title to use for this dialog, or <code>null</code> to
- * indicate that the default title should be used
- * @param message
- * the message to show in this dialog, or <code>null</code> to
- * indicate that the error's message should be shown as the
- * primary message
- * @param status
- * the error to show to the user
- * @param displayMask
- * the mask to use to filter the displaying of child items, as
- * per <code>IStatus.matches</code>
- * @return the code of the button that was pressed that resulted in this
- * dialog closing. This will be <code>Dialog.OK</code> if the OK
- * button was pressed, or <code>Dialog.CANCEL</code> if this
- * dialog's close window decoration or the ESC key was used.
- * @see org.eclipse.core.runtime.IStatus#matches(int)
- */
- public static int openError(Shell parentShell, String title,
- String message, IStatus status, int displayMask) {
- ErrorDialogNoReason dialog = new ErrorDialogNoReason(parentShell,
- title, message, status, displayMask);
- return dialog.open();
- }
-
- /**
- * Populates the list using this error dialog's status object. This walks
- * the child static of the status object and displays them in a list. The
- * format for each entry is status_path : status_message If the status's
- * path was null then it (and the colon) are omitted.
- *
- * @param listToPopulate
- * The list to fill.
- */
- private void populateList(List listToPopulate) {
- populateList(listToPopulate, status, 0,
- shouldIncludeTopLevelErrorInDetails);
- }
-
- /**
- * Populate the list with the messages from the given status. Traverse the
- * children of the status deeply and also traverse CoreExceptions that
- * appear in the status.
- *
- * @param listToPopulate
- * the list to populate
- * @param buildingStatus
- * the status being displayed
- * @param nesting
- * the nesting level (increases one level for each level of
- * children)
- * @param includeStatus
- * whether to include the buildingStatus in the display or just
- * its children
- */
- private void populateList(List listToPopulate, IStatus buildingStatus,
- int nesting, boolean includeStatus) {
-
- if (!buildingStatus.matches(displayMask)) {
- return;
- }
-
- Throwable t = buildingStatus.getException();
- boolean isCoreException = t instanceof CoreException;
- boolean incrementNesting = false;
-
- if (includeStatus) {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < nesting; i++) {
- sb.append(NESTING_INDENT);
- }
- String message = buildingStatus.getMessage();
- sb.append(message);
- listToPopulate.add(sb.toString());
- incrementNesting = true;
- }
-
- if (!isCoreException && t != null) {
- // Include low-level exception message
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < nesting; i++) {
- sb.append(NESTING_INDENT);
- }
- String message = t.getLocalizedMessage();
- if (message == null)
- message = t.toString();
-
- sb.append(message);
- listToPopulate.add(sb.toString());
- incrementNesting = true;
- }
-
- if (incrementNesting)
- nesting++;
-
- // Look for a nested core exception
- if (isCoreException) {
- CoreException ce = (CoreException) t;
- IStatus eStatus = ce.getStatus();
- // Only print the exception message if it is not contained in the
- // parent message
- if (message == null || message.indexOf(eStatus.getMessage()) == -1) {
- populateList(listToPopulate, eStatus, nesting, true);
- }
- }
-
- // Look for child status
- IStatus[] children = buildingStatus.getChildren();
- for (int i = 0; i < children.length; i++) {
- populateList(listToPopulate, children[i], nesting, true);
- }
- }
-
- /**
- * Returns whether the given status object should be displayed.
- *
- * @param status
- * a status object
- * @param mask
- * a mask as per <code>IStatus.matches</code>
- * @return <code>true</code> if the given status should be displayed, and
- * <code>false</code> otherwise
- * @see org.eclipse.core.runtime.IStatus#matches(int)
- */
- protected static boolean shouldDisplay(IStatus status, int mask) {
- IStatus[] children = status.getChildren();
- if (children == null || children.length == 0) {
- return status.matches(mask);
- }
- for (int i = 0; i < children.length; i++) {
- if (children[i].matches(mask))
- return true;
- }
- return false;
- }
-
- /**
- * Toggles the unfolding of the details area. This is triggered by the user
- * pressing the details button.
- */
- private void toggleDetailsArea() {
- Point windowSize = getShell().getSize();
- Point oldSize = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- if (listCreated) {
- list.dispose();
- listCreated = false;
- detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
- } else {
- list = createDropDownList((Composite) getContents());
- detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
- }
- Point newSize = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- getShell()
- .setSize(
- new Point(windowSize.x, windowSize.y
- + (newSize.y - oldSize.y)));
- }
-
- /**
- * Put the details of the status of the error onto the stream.
- *
- * @param buildingStatus
- * @param buffer
- * @param nesting
- */
- private void populateCopyBuffer(IStatus buildingStatus,
- StringBuffer buffer, int nesting) {
- if (!buildingStatus.matches(displayMask)) {
- return;
- }
- for (int i = 0; i < nesting; i++) {
- buffer.append(NESTING_INDENT);
- }
- buffer.append(buildingStatus.getMessage());
- buffer.append("\n"); //$NON-NLS-1$
-
- // Look for a nested core exception
- Throwable t = buildingStatus.getException();
- if (t instanceof CoreException) {
- CoreException ce = (CoreException) t;
- populateCopyBuffer(ce.getStatus(), buffer, nesting + 1);
- }
-
- IStatus[] children = buildingStatus.getChildren();
- for (int i = 0; i < children.length; i++) {
- populateCopyBuffer(children[i], buffer, nesting + 1);
- }
- }
-
- /**
- * Copy the contents of the statuses to the clipboard.
- */
- private void copyToClipboard() {
- if (clipboard != null)
- clipboard.dispose();
- StringBuffer statusBuffer = new StringBuffer();
- populateCopyBuffer(status, statusBuffer, 0);
- clipboard = new Clipboard(list.getDisplay());
- clipboard.setContents(new Object[] { statusBuffer.toString() },
- new Transfer[] { TextTransfer.getInstance() });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.window.Window#close()
- */
- public boolean close() {
- if (clipboard != null)
- clipboard.dispose();
- return super.close();
- }
-
- /**
- * Show the details portion of the dialog if it is not already visible. This
- * method will only work when it is invoked after the control of the dialog
- * has been set. In other words, after the <code>createContents</code>
- * method has been invoked and has returned the control for the content area
- * of the dialog. Invoking the method before the content area has been set
- * or after the dialog has been disposed will have no effect.
- *
- * @since 3.1
- */
- protected final void showDetailsArea() {
- if (!listCreated) {
- Control control = getContents();
- if (control != null && !control.isDisposed())
- toggleDetailsArea();
- }
- }
-
- /**
- * Return whether the Details button should be included. This method is
- * invoked once when the dialog is built. By default, the Details button is
- * only included if the status used when creating the dialog was a
- * multi-status or if the status contains an exception. Subclasses may
- * override.
- *
- * @return whether the Details button should be included
- * @since 3.1
- */
- protected boolean shouldShowDetailsButton() {
- return status.isMultiStatus() || status.getException() != null;
- }
-
- /**
- * Set the status displayed by this error dialog to the given status. This
- * only affects the status displayed by the Details list. The message, image
- * and title should be updated by the subclass, if desired.
- *
- * @param status
- * the status to be displayed in the details list
- * @since 3.1
- */
- protected final void setStatus(IStatus status) {
- if (this.status != status) {
- this.status = status;
- }
- shouldIncludeTopLevelErrorInDetails = true;
- if (listCreated) {
- repopulateList();
- }
- }
-
- /**
- * Repopulate the supplied list widget.
- */
- private void repopulateList() {
- if (list != null && !list.isDisposed()) {
- list.removeAll();
- populateList(list);
- }
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MenuUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MenuUtil.java
deleted file mode 100644
index 52a828d1e80..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MenuUtil.java
+++ /dev/null
@@ -1,47 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui.util;
-
-import org.eclipse.swt.widgets.MenuItem;
-
-/**
- * A helper class for retrieving Eclipse menus.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class MenuUtil {
-
- /**
- * Searches an array of menu items and returns the menu item that matches
- * the given menu text.
- *
- * @param menuItems
- * An array of menu items.
- * @param text
- * The text to look for.
- * @return The menu item if found, <code>null</code> otherwise.
- */
- public static MenuItem getMenuItem(MenuItem[] menuItems, String text) {
- if (menuItems == null || text == null || text.length() == 0) {
- return null;
- }
-
- for (int i = 0; i < menuItems.length; i++) {
- if (menuItems[i].getText().startsWith(text)) {
- return menuItems[i];
- }
- }
-
- return null;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MsgBox.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MsgBox.java
deleted file mode 100644
index 1d97b41167a..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MsgBox.java
+++ /dev/null
@@ -1,123 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui.util;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Helper class to display a message box.
- *
- * @author Phong Nguyen Le
- * @author Kelvin Low
- * @since 1.0
- */
-public final class MsgBox {
- /**
- * Use this method to show error message if you don't want long path to be
- * cut off.
- *
- * @param msg
- */
- public static final void nativeShowError(Shell shell, String msg) {
- if (shell == null) {
- shell = getDefaultShell();
- if (shell == null) {
- return;
- }
- }
- MessageBox msgBox = new MessageBox(shell, SWT.OK | SWT.ICON_ERROR);
- msgBox.setMessage(msg);
- msgBox.setText(shell.getText());
- msgBox.open();
- }
-
- public static final void showError(String msg) {
- showError(getDefaultShell(), msg);
- }
-
- public static final void showError(Shell shell, String msg) {
- WrappedMessageDialog.openError(shell, shell == null ? null : shell
- .getText(), msg);
- }
-
- public static final void showWarning(String msg) {
- showWarning(getDefaultShell(), msg);
- }
-
- public static final void showWarning(Shell shell, String msg) {
- WrappedMessageDialog.openWarning(shell, shell == null ? null : shell
- .getText(), msg);
- }
-
- public static final Shell getDefaultShell() {
- try {
- Display d = Display.getCurrent();
- if (d == null) {
- d = Display.getDefault();
- }
-
- Shell s = null;
- if (d != null) {
- s = d.getActiveShell();
- }
-
- return s;
- } catch (RuntimeException e) {
- return null;
- }
- }
-
- public static final Display getDisplay() {
- try {
- Display d = Display.getCurrent();
- if (d == null) {
- d = Display.getDefault();
- }
-
- return d;
- } catch (RuntimeException e) {
- return null;
- }
- }
-
- public static final int prompt(String msg) {
- return prompt(getDefaultShell(), msg);
- }
-
- public static final int prompt(Shell shell, String msg) {
- return prompt(shell, null, msg, SWT.YES | SWT.NO | SWT.CANCEL);
- }
-
- public static final int prompt(String msg, int buttons) {
- return prompt(getDefaultShell(), null, msg, buttons);
- }
-
- public static final int prompt(String title, String msg, int buttons) {
- return prompt(getDefaultShell(), title, msg, buttons);
- }
-
- public static final int prompt(Shell shell, String msg, int buttons) {
- return prompt(shell, null, msg, buttons);
- }
-
- public static final int prompt(Shell shell, String title, String msg,
- int buttons) {
- MessageBox msgBox = new MessageBox(shell, buttons | SWT.ICON_QUESTION);
- msgBox.setText(title != null && title.length() > 0 ? title : shell
- .getText());
- msgBox.setMessage(msg);
- return msgBox.open();
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MsgDialog.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MsgDialog.java
deleted file mode 100644
index e681d33a19d..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/MsgDialog.java
+++ /dev/null
@@ -1,626 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui.util;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.common.IActivator;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A message dialog used for displaying error, warning, confirmation or
- * informational messages.
- *
- * @author Kelvin Low
- * @author Jinhua Xi
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MsgDialog {
-
- // The plug-in ID.
- private String pluginId;
-
- // The plug-in logger.
- private Logger logger;
-
- /**
- * Create a new instance given the plug-in instance.
- *
- * @param plugin
- * The plugin instance.
- */
- public MsgDialog(IActivator plugin) {
- this.pluginId = plugin.getId();
- this.logger = plugin.getLogger();
- }
-
- protected Shell getShell() {
- return PlatformUI.getWorkbench().getDisplay().getActiveShell();
- }
-
- /**
- * Displays the given error message in an error dialog without the error
- * reason and Details button.
- * <p>
- * Note: The error message will be written to the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- */
- public void displayError(String title, String msg) {
- display(IStatus.ERROR, title, msg, null, null, null);
- }
-
- /**
- * Displays the given error message in an error dialog without the error
- * reason and Details button.
- * <p>
- * Note: The error message and the exception stack trace will be written to
- * the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- * @param ex
- * The exception associated with the error.
- */
- public void displayError(String title, String msg, Throwable ex) {
- display(IStatus.ERROR, title, msg, null, null, ex);
- }
-
- /**
- * Displays the given error message in an error dialog without the Details
- * button.
- * <p>
- * Note: The error message will be written to the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- * @param reason
- * The reason for the error.
- */
- public void displayError(String title, String msg, String reason) {
- display(IStatus.ERROR, title, msg, reason, null, null);
- }
-
- /**
- * Displays the given error message in an error dialog without the Details
- * button.
- * <p>
- * Note: The error message and the exception stack trace will be written to
- * the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- * @param reason
- * The reason for the error.
- * @param ex
- * The exception associated with the error.
- */
- public void displayError(String title, String msg, String reason,
- Throwable ex) {
- display(IStatus.ERROR, title, msg, reason, null, ex);
- }
-
- /**
- * Displays the given error message in an error dialog. The Details button
- * will be displayed if the <code>details</code> parameter it not null or
- * empty.
- * <p>
- * Note: The error message will be written to the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- * @param reason
- * The reason for the error.
- * @param details
- * The error details.
- */
- public void displayError(String title, String msg, String reason,
- String details) {
- display(IStatus.ERROR, title, msg, reason, details, null);
- }
-
- /**
- * Displays the given error message in an error dialog. The Details button
- * will be displayed if the <code>details</code> parameter it not null or
- * empty.
- * <p>
- * Note: The error message and the exception stack trace will be written to
- * the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- * @param reason
- * The reason for the error.
- * @param details
- * The error details.
- * @param ex
- * The exception associated with the error.
- */
- public void displayError(String title, String msg, String reason,
- String details, Throwable ex) {
- display(IStatus.ERROR, title, msg, reason, details, ex);
- }
-
- /**
- * Displays the given error status in an error dialog.
- * <p>
- * Note: The error message and the exception stack trace will be written to
- * the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param status
- * The error status.
- */
- public int displayError(String title, IStatus status) {
- return display(title, null, status);
- }
-
- /**
- * Displays the given error status in an error dialog.
- * <p>
- * Note: The error message and the exception stack trace will be written to
- * the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- * @param status
- * The error status.
- */
- public int displayError(String title, String msg, IStatus status) {
- return display(title, msg, status);
- }
-
- /**
- * Displays the given warning message in a warning dialog without the
- * warning reason and Details button.
- * <p>
- * Note: The waning message will be written to the log file.
- *
- * @param title
- * The title for the warning dialog.
- * @param msg
- * The warning message.
- */
- public void displayWarning(String title, String msg) {
- display(IStatus.WARNING, title, msg, null, null, null);
- }
-
- /**
- * Displays the given warning message in a warning dialog without the
- * warning reason and Details button.
- * <p>
- * Note: The warning message and the exception stack trace will be written
- * to the log file.
- *
- * @param title
- * The title for the warning dialog.
- * @param msg
- * The warning message.
- * @param ex
- * The exception associated with the warning.
- */
- public void displayWarning(String title, String msg, Throwable ex) {
- display(IStatus.WARNING, title, msg, null, null, ex);
- }
-
- /**
- * Displays the given warning message in a warning dialog without the
- * warning reason and Details button.
- * <p>
- * Note: The waning message will be written to the log file.
- *
- * @param title
- * The title for the warning dialog.
- * @param msg
- * The warning message.
- * @param reason
- * The reason for the warning.
- */
- public void displayWarning(String title, String msg, String reason) {
- display(IStatus.WARNING, title, msg, reason, null, null);
- }
-
- /**
- * Displays the given warning message in a warning dialog without the
- * warning reason and Details button.
- * <p>
- * Note: The warning message and the exception stack trace will be written
- * to the log file.
- *
- * @param title
- * The title for the warning dialog.
- * @param msg
- * The warning message.
- * @param reason
- * The reason for the warning.
- * @param ex
- * The exception associated with the warning.
- */
- public void displayWarning(String title, String msg, String reason,
- Throwable ex) {
- display(IStatus.WARNING, title, msg, reason, null, ex);
- }
-
- /**
- * Displays the given warning message in a warning dialog. The Details
- * button will be displayed if the <code>details</code> parameter it not
- * null or empty.
- * <p>
- * Note: The waning message will be written to the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The warning message.
- * @param reason
- * The reason for the warning.
- * @param details
- * The warning details.
- */
- public void displayWarning(String title, String msg, String reason,
- String details) {
- display(IStatus.WARNING, title, msg, reason, details, null);
- }
-
- /**
- * Displays the given warning message in a warning dialog. The Details
- * button will be displayed if the <code>details</code> parameter it not
- * null or empty.
- * <p>
- * Note: The warning message and the exception stack trace will be written
- * to the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The warning message.
- * @param reason
- * The reason for the warning.
- * @param details
- * The warning details.
- * @param ex
- * The exception associated with the warning.
- */
- public void displayWarning(String title, String msg, String reason,
- String details, Throwable ex) {
- display(IStatus.WARNING, title, msg, reason, details, ex);
- }
-
- /**
- * Displays the given warning status in an error dialog.
- * <p>
- * Note: The warning message and the exception stack trace will be written
- * to the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param status
- * The error status.
- */
- public void displayWarning(String title, IStatus status) {
- display(title, null, status);
- }
-
- /**
- * Displays the given warning status in an error dialog.
- * <p>
- * Note: The warning message and the exception stack trace will be written
- * to the log file.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- * @param status
- * The error status.
- */
- public void displayWarning(String title, String msg, IStatus status) {
- display(title, msg, status);
- }
-
- /**
- * Displays the given error or warning message in an error or warning
- * dialog. The Details button will be displayed if the <code>details</code>
- * parameter it not null or empty.
- *
- * @param severity
- * The severity, either IStatus.ERROR or IStatus.WARNING.
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- * @param reason
- * The reason for the error.
- * @param details
- * The error details.
- * @param ex
- * The exception associated with the error.
- */
- public synchronized void display(int severity, String title, String msg,
- String reason, String details, Throwable ex) {
- if (msg == null && ex != null) {
- msg = ex.getMessage();
- }
-
- if (msg == null) {
- msg = ""; //$NON-NLS-1$
- }
-
- if (severity == IStatus.ERROR || severity == IStatus.WARNING) {
- logger.logMsg(severity, msg, ex);
- } else {
- throw new IllegalArgumentException(
- "severity argument must be IStatus.ERROR or IStatus.WARNING"); //$NON-NLS-1$
- }
-
- Image oldImage = org.eclipse.jface.dialogs.ErrorDialog
- .getDefaultImage();
- Image shellImage = getShellImage();
- if (shellImage != null) {
- ErrorDialog.setDefaultImage(shellImage);
- }
-
- Shell shell = getShell();
-
- if (details != null && details.length() > 0) {
- MultiStatus mStatus = new MultiStatus(pluginId, IStatus.OK, reason,
- ex);
- Status status = new Status(severity, pluginId, IStatus.OK, details,
- ex);
- mStatus.add(status);
- org.eclipse.jface.dialogs.ErrorDialog.openError(shell, title, msg,
- mStatus);
- } else if (reason != null && reason.length() > 0) {
- Status status = new Status(severity, pluginId, IStatus.OK, reason,
- ex);
- org.eclipse.jface.dialogs.ErrorDialog.openError(shell, title, msg,
- status);
- } else {
- if (severity == IStatus.ERROR) {
- WrappedMessageDialog.openError(shell, title, msg);
- } else if (severity == IStatus.WARNING) {
- WrappedMessageDialog.openWarning(shell, title, msg);
- }
- }
-
- if (shellImage != null) {
- ErrorDialog.setDefaultImage(oldImage);
- }
- }
-
- /**
- * Displays the given error or warning message in an error or warning
- * dialog. The Details button will be displayed if the <code>details</code>
- * parameter it not null or empty.
- *
- * @param title
- * The title for the error dialog.
- * @param status
- * The error status.
- */
- public synchronized int display(String title, IStatus status) {
- return display(title, null, status);
- }
-
- /**
- * Displays the given error or warning message in an error or warning
- * dialog. The Details button will be displayed if the <code>details</code>
- * parameter it not null or empty.
- *
- * @param title
- * The title for the error dialog.
- * @param msg
- * The error message.
- * @param status
- * The error status.
- */
- public synchronized int display(String title, String msg, IStatus status) {
- if (status == null) {
- throw new IllegalArgumentException("status argument cannot be null"); //$NON-NLS-1$
- }
-
- if (msg == null) {
- msg = status.getMessage();
- }
- if (msg == null) {
- msg = ""; //$NON-NLS-1$
- }
-
- int severity = status.getSeverity();
- if (severity == IStatus.ERROR || severity == IStatus.WARNING) {
- logger.logMsg(severity, msg, status.getException());
- }
-
- Image oldImage = org.eclipse.jface.dialogs.ErrorDialog
- .getDefaultImage();
- Image shellImage = getShellImage();
- if (shellImage != null) {
- ErrorDialog.setDefaultImage(shellImage);
- }
-
- Shell shell = getShell();
-
- int rc = org.eclipse.jface.dialogs.ErrorDialog.openError(shell, title,
- msg, status);
-
- if (shellImage != null) {
- ErrorDialog.setDefaultImage(oldImage);
- }
-
- return rc;
- }
-
- /**
- * Displays the given message in a informational dialog with an "OK" button.
- *
- * @param title
- * The title for the information dialog.
- * @param msg
- * The message to display.
- */
- public void displayInfo(String title, String msg) {
- if (msg == null) {
- msg = ""; //$NON-NLS-1$
- }
-
- Image oldImage = WrappedMessageDialog.getDefaultImage();
- Image shellImage = getShellImage();
- if (shellImage != null) {
- WrappedMessageDialog.setDefaultImage(shellImage);
- }
-
- Shell shell = getShell();
- WrappedMessageDialog.openInformation(shell, title, msg);
-
- if (shellImage != null) {
- WrappedMessageDialog.setDefaultImage(oldImage);
- }
- }
-
- /**
- * Displays the given message in a question dialog with a "Yes" and "No"
- * button.
- *
- * @param title
- * The title for the information dialog.
- * @param msg
- * The message to display.
- */
- public boolean displayPrompt(String title, String msg) {
- if (msg == null) {
- msg = ""; //$NON-NLS-1$
- }
-
- Image oldImage = WrappedMessageDialog.getDefaultImage();
- Image shellImage = getShellImage();
- if (shellImage != null) {
- WrappedMessageDialog.setDefaultImage(shellImage);
- }
-
- Shell shell = getShell();
- boolean result = WrappedMessageDialog.openQuestion(shell, title, msg);
-
- if (shellImage != null) {
- WrappedMessageDialog.setDefaultImage(oldImage);
- }
-
- return result;
- }
-
- /**
- * Displays the given message in a confirmation dialog with a "Yes" and
- * "Cancel" button.
- *
- * @param title
- * The title for the information dialog.
- * @param msg
- * The message to display.
- */
- public boolean displayConfirmation(String title, String msg) {
- return displayConfirmationWithCheckBox(title, msg, null) > 0;
- }
-
- //return: 0 = cancel, 1 = ok with check-box checked, 2 = ok with check box unchecked
- public int displayConfirmationWithCheckBox(String title, String msg, String checkBoxLabel) {
- if (msg == null) {
- msg = ""; //$NON-NLS-1$
- }
-
- Image oldImage = WrappedMessageDialog.getDefaultImage();
- Image shellImage = getShellImage();
- if (shellImage != null) {
- WrappedMessageDialog.setDefaultImage(shellImage);
- }
-
- Shell shell = getShell();
-
- if (shellImage != null) {
- WrappedMessageDialog.setDefaultImage(oldImage);
- }
-
- if (checkBoxLabel == null) {
- boolean b = WrappedMessageDialog.openConfirm(shell, title, msg);
- return b ? 1 : 0;
- }
-
- return WrappedMessageDialog.openConfirmWithCheckBox(shell, title, msg, checkBoxLabel);
- }
-
- public int displayConfirmation(String title, String msg, IStatus status) {
- if (status == null) {
- throw new IllegalArgumentException("status argument cannot be null"); //$NON-NLS-1$
- }
-
- if (msg == null) {
- msg = status.getMessage();
- }
- if (msg == null) {
- msg = ""; //$NON-NLS-1$
- }
-
- Image shellImage = getShellImage();
- if (shellImage != null) {
- ErrorDialogNoReason.setDefaultImage(shellImage);
- }
-
- Shell shell = getShell();
-
- int rc = ErrorDialogNoReason.openError(shell, title, msg, status);
-
- return rc;
-
- }
-
- /**
- * Returns the image for the current shell.
- *
- * @return The current shell image.
- */
- private Image getShellImage() {
- IWorkbench workbench = PlatformUI.getWorkbench();
- if (workbench != null) {
- IWorkbenchWindow workbenchWindow = workbench
- .getActiveWorkbenchWindow();
- if (workbenchWindow != null) {
- Shell shell = workbenchWindow.getShell();
- if (shell != null) {
- return shell.getImage();
- }
- }
- }
- return null;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/PerspectiveUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/PerspectiveUtil.java
deleted file mode 100644
index a928ec798c8..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/PerspectiveUtil.java
+++ /dev/null
@@ -1,127 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui.util;
-
-import org.eclipse.ui.IPerspectiveDescriptor;
-import org.eclipse.ui.IPerspectiveRegistry;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.WorkbenchException;
-
-/**
- * Utility class for accessing perspectives.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class PerspectiveUtil {
-
- /**
- * Private constructor to prevent this class from being instantiated. All
- * methods in this class should be static.
- */
- private PerspectiveUtil() {
- }
-
- /**
- * Returns the ID of the active perspective.
- *
- * @return The active perspective ID.
- */
- public static String getActivePerspectiveId() {
- if (PlatformUI.getWorkbench() == null || PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow() == null) {
- return null;
- }
-
- IWorkbenchPage activePage = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- if (activePage != null) {
- IPerspectiveDescriptor activePerspective = activePage
- .getPerspective();
- return activePerspective.getId();
- }
- return null;
- }
-
- /**
- * Opens a perspective.
- *
- * @param perspectiveId
- * The perspective ID.
- * @return The previously active perspective.
- */
- public static IPerspectiveDescriptor openPerspective(String perspectiveId) {
- IWorkbenchPage activePage = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- if (activePage != null) {
- IPerspectiveRegistry registry = PlatformUI.getWorkbench()
- .getPerspectiveRegistry();
- IPerspectiveDescriptor oldPerspective = activePage.getPerspective();
- if (!oldPerspective.getId().equals(perspectiveId)) {
- IPerspectiveDescriptor perspective = registry
- .findPerspectiveWithId(perspectiveId);
- activePage.setPerspective(perspective);
- }
- return oldPerspective;
- } else {
- IWorkbenchWindow activeWindow = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow();
- try {
- PlatformUI.getWorkbench().showPerspective(
- perspectiveId, activeWindow);
- } catch (WorkbenchException e) {
- }
- }
- return null;
- }
-
- /**
- * Returns true if the given perspective is already active.
- *
- * @param perspectiveId
- * The perspective ID.
- * @return
- */
- public static boolean isActivePerspective(String perspectiveId) {
- String activePerspectiveId = PerspectiveUtil.getActivePerspectiveId();
- if (perspectiveId == null || activePerspectiveId == null) {
- return false;
- }
- return activePerspectiveId.equalsIgnoreCase(perspectiveId);
- }
-
- /**
- * Returns the view part with the given view ID.
- *
- * @param viewId
- * The view ID.
- * @return The view part.
- */
- public static IViewPart getView(String viewId) {
- try {
- IWorkbenchPage activePage = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- if (activePage != null) {
- IViewPart view = activePage.findView(viewId);
- if (view == null) {
- view = activePage.showView(viewId);
- }
- return view;
- }
- } catch (Exception e) {
- }
- return null;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/PreferenceUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/PreferenceUtil.java
deleted file mode 100644
index 158d7d882ec..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/PreferenceUtil.java
+++ /dev/null
@@ -1,173 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Utility class for accessing preferences.
- *
- * @author Kelvin Low
- * @since 1.2
- */
-public class PreferenceUtil {
-
- // The multi-string preference delimiter.
- private static final String PREFERENCE_DELIMITER = ";"; //$NON-NLS-1$
-
- /**
- * Gets a list containing string values associated with a named preference.
- *
- * @param prefStore
- * a preference store
- * @param name
- * the preference name
- * @return a list of string values
- */
- public static List<String> getList(IPreferenceStore prefStore, String name) {
- List<String> values = new ArrayList<String>();
- if (prefStore != null && name != null) {
- String value = prefStore.getString(name);
- StringTokenizer tokenizer = new StringTokenizer(value,
- PREFERENCE_DELIMITER);
- int tokenCount = tokenizer.countTokens();
- for (int i = 0; i < tokenCount; i++) {
- values.add(tokenizer.nextToken());
- }
- }
- return values;
- }
-
- /**
- * Gets the string values associated with a named preference.
- *
- * @param prefStore
- * a preference store
- * @param name
- * the preference name
- * @return a list of string preference values
- */
- public static String[] getStringValues(IPreferenceStore prefStore,
- String name) {
- List<String> list = getList(prefStore, name);
- String[] values = new String[list.size()];
- list.toArray(values);
- return values;
- }
-
- /**
- * Saves a list containing string values associated with a named preference.
- *
- * @param prefStore
- * a preference store
- * @param name
- * the preference name
- * @param values
- * a list of string values
- */
- public static void setList(IPreferenceStore prefStore, String name,
- List values) {
- if (prefStore != null && name != null && values != null) {
- StringBuffer buffer = new StringBuffer();
- for (Iterator it = values.iterator(); it.hasNext();) {
- String value = (String) it.next();
- buffer.append(value);
- buffer.append(PREFERENCE_DELIMITER);
- }
- prefStore.setValue(name, buffer.toString());
- }
- }
-
- /**
- * Adds a string value to a list containing string values associated with a
- * named preference.
- *
- * @param prefStore
- * a preference store
- * @param name
- * the preference name
- * @param value
- * a string value
- * @param defaultValue
- * a default string value that will be added to the end of the
- * list
- */
- public static void addToList(IPreferenceStore prefStore, String name,
- String value, String defaultValue) {
- if (prefStore != null && name != null && value != null) {
- List<String> list = getList(prefStore, name);
- list.remove(value);
- list.add(0, value);
-
- //adjust the list according to the history size
- int preferenceHistorySize = CommonPreferences.getPreferenceHistorySize();
- if (list.size() > preferenceHistorySize) {
- list = list.subList(0, preferenceHistorySize - 1);
- }
- if (defaultValue != null && defaultValue.length() > 0) {
- if (!list.contains(defaultValue)) {
- if (list.size() == preferenceHistorySize) {
- list.add(list.size() - 1, defaultValue);
- } else {
- list.add(defaultValue);
- }
- }
- }
-
- setList(prefStore, name, list);
- }
- }
-
- /**
- * Adds a string value to a list containing string values associated with a
- * named preference.
- *
- * @param prefStore
- * a preference store
- * @param name
- * the preference name
- * @param value
- * a string value
- */
- public static void addToList(IPreferenceStore prefStore, String name,
- String value) {
- addToList(prefStore, name, value, null);
- }
-
- /**
- * Saves an array of string values associated with a named preference.
- *
- * @param prefStore
- * a preference store
- * @param name
- * the preference name
- * @param values
- * an array of string values
- */
- public static void setStringValues(IPreferenceStore prefStore, String name,
- String[] values) {
- if (prefStore != null && name != null && values != null) {
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < values.length; i++) {
- buffer.append(values[i]);
- buffer.append(PREFERENCE_DELIMITER);
- }
- prefStore.setValue(name, buffer.toString());
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/WrappedMessageDialog.java b/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/WrappedMessageDialog.java
deleted file mode 100644
index 926cc5ad791..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.ui/src/org/eclipse/epf/common/ui/util/WrappedMessageDialog.java
+++ /dev/null
@@ -1,208 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.ui.util;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Displays a message dialog that displays wrapped text.
- *
- * @author Bingxue Xu
- * @since 1.0
- */
-public class WrappedMessageDialog extends MessageDialog {
-
- public WrappedMessageDialog(Shell parentShell, String dialogTitle,
- Image dialogTitleImage, String dialogMessage, int dialogImageType,
- String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage,
- dialogImageType, dialogButtonLabels, defaultIndex);
- }
-
- protected Control createMessageArea(Composite composite) {
-
- Control rComposite = super.createMessageArea(composite);
-
- int minWidth = IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH;// + 300;
- // TO-DO: need to revist the # of dialog display units and margin
- // when in other languages
- int charsPerLine = minWidth / 4 - 15;
- GridData gd = (GridData) messageLabel.getLayoutData();
- gd.minimumWidth = minWidth;
- messageLabel.setText(addLineBreaks(message, charsPerLine));
-
- return rComposite;
- }
-
- String addLineBreaks(String msg, int maxChars) {
- // System.out.println("$$$ DEBUG: original message = " + msg);
-
- if (msg == null)
- return null;
-
- StringBuffer strBuf = new StringBuffer();
- int count = 0;
- for (int i = 0; i < msg.length(); i++) {
- strBuf.append(msg.charAt(i));
- if (Character.isWhitespace(msg.charAt(i)))
- count = 0;
- else
- count++;
-
- if (count >= maxChars) {
- if (!Character.isWhitespace(msg.charAt(i))) {
- strBuf.append("\n"); //$NON-NLS-1$
- }
- count = 0;
- }
- }
-
- // System.out.println("$$$ DEBUG: broken message = " +
- // strBuf.toString());
- return strBuf.toString();
- }
-
- public static boolean openConfirm(Shell parent, String title, String message) {
- WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
- null, // accept
- // the
- // default
- // window
- // icon
- message, QUESTION, new String[] { IDialogConstants.OK_LABEL,
- IDialogConstants.CANCEL_LABEL }, 0); // OK is the
- // default
- return dialog.open() == 0;
- }
-
- static class ConfirmWithCheckBoxDialog extends WrappedMessageDialog {
- private String checkBoxLabel;
- private Button checkBox;
- private boolean checkBoxChecked = false;
-
- public ConfirmWithCheckBoxDialog(Shell parentShell, String dialogTitle,
- Image dialogTitleImage, String dialogMessage, int dialogImageType,
- String[] dialogButtonLabels, int defaultIndex, String checkBoxLabel) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage,
- dialogImageType, dialogButtonLabels, defaultIndex);
- this.checkBoxLabel = checkBoxLabel;
- }
-
- @Override
- protected Control createMessageArea(Composite composite) {
- Control rComposite = super.createMessageArea(composite);
-
- checkBox = new Button(composite, SWT.CHECK);
- checkBox.setText(checkBoxLabel);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- checkBox.setLayoutData(gd);
-
- return rComposite;
- }
-
- protected void buttonPressed(int buttonId) {
- checkBoxChecked = checkBox.getSelection();
- super.buttonPressed(buttonId);
- }
-
- public boolean isCheckBoxChecked() {
- return checkBoxChecked;
- }
-
- }
-
- //return: 0 = cancel, 1 = ok with check-box checked, 2 = ok with check box unchecked
- public static int openConfirmWithCheckBox(Shell parent, String title, String message, String checkBoxLabel) {
- ConfirmWithCheckBoxDialog dialog = new ConfirmWithCheckBoxDialog(parent, title,
- null, // accept
- // the
- // default
- // window
- // icon
- message, QUESTION, new String[] { IDialogConstants.OK_LABEL,
- IDialogConstants.CANCEL_LABEL }, 0, checkBoxLabel); // OK is the default
-
- int ix = dialog.open() ;
- if (ix != 0) {
- return 0;
- }
-
- return dialog.isCheckBoxChecked() ? 1 : 2;
- }
-
- public static void openError(Shell parent, String title, String message) {
- WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
- null, // accept
- // the
- // default
- // window
- // icon
- message, ERROR, new String[] { IDialogConstants.OK_LABEL }, 0); // ok
- // is
- // the
- // default
- dialog.open();
- return;
- }
-
- public static void openInformation(Shell parent, String title,
- String message) {
- WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
- null, // accept
- // the
- // default
- // window
- // icon
- message, INFORMATION,
- new String[] { IDialogConstants.OK_LABEL }, 0);
- // ok is the default
- dialog.open();
- return;
- }
-
- public static boolean openQuestion(Shell parent, String title,
- String message) {
- WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
- null, // accept
- // the
- // default
- // window
- // icon
- message, QUESTION, new String[] { IDialogConstants.YES_LABEL,
- IDialogConstants.NO_LABEL }, 0); // yes is the
- // default
- return dialog.open() == 0;
- }
-
- public static void openWarning(Shell parent, String title, String message) {
- WrappedMessageDialog dialog = new WrappedMessageDialog(parent, title,
- null, // accept
- // the
- // default
- // window
- // icon
- message, WARNING, new String[] { IDialogConstants.OK_LABEL }, 0); // ok
- // is
- // the
- // default
- dialog.open();
- return;
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/.classpath b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/.classpath
deleted file mode 100644
index 02159672985..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/.project b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/.project
deleted file mode 100644
index e57f6e3d952..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.epf.common.win32.win32.x86</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/META-INF/MANIFEST.MF b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/META-INF/MANIFEST.MF
deleted file mode 100644
index 4c8e398d5f9..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.common.win32.win32.x86
-Bundle-Version: 1.5.0.qualifier
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.swt
-Bundle-Vendor: %providerName
-Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/about.html b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/about.html
deleted file mode 100644
index 04a6d65fb9f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/build.properties b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/build.properties
deleted file mode 100644
index ebe02751cbb..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- about.html
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/plugin.properties b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/plugin.properties
deleted file mode 100644
index ff010d4c880..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial implementation.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Win32 Common x86
-providerName=Eclipse.org
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java
deleted file mode 100644
index 1a58b1dd316..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java
+++ /dev/null
@@ -1,218 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.win32;
-
-import org.eclipse.swt.dnd.ByteArrayTransfer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.internal.ole.win32.COM;
-import org.eclipse.swt.internal.ole.win32.FORMATETC;
-import org.eclipse.swt.internal.ole.win32.IDataObject;
-import org.eclipse.swt.internal.ole.win32.STGMEDIUM;
-import org.eclipse.swt.internal.win32.OS;
-
-/**
- * The class <code>HTMLTransfer</code> provides a platform specific mechanism
- * for converting text in HTML format represented as a java <code>String</code>
- * to a platform specific representation of the data and vice versa. See
- * <code>Transfer</code> for additional information.
- *
- * <p>
- * An example of a java <code>String</code> containing HTML text is shown
- * below:
- * </p>
- *
- * <code><pre>
- * String htmlData = &quot;
- * <p>
- * This is a paragraph of text.
- * </p>
- * &quot;;
- * </code></pre>
- */
-public class Win32HTMLTransfer extends ByteArrayTransfer {
-
- static Win32HTMLTransfer _instance = new Win32HTMLTransfer();
-
- static final String HTML_FORMAT = "HTML Format"; //$NON-NLS-1$
-
- static final int HTML_FORMATID = registerType(HTML_FORMAT);
-
- static final String NUMBER = "00000000"; //$NON-NLS-1$
-
- static final String HEADER = "Version:0.9\r\nStartHTML:" + NUMBER //$NON-NLS-1$
- + "\r\nEndHTML:" + NUMBER + "\r\nStartFragment:" + NUMBER //$NON-NLS-1$ //$NON-NLS-2$
- + "\r\nEndFragment:" + NUMBER + "\r\n"; //$NON-NLS-1$ //$NON-NLS-2$
-
- static final String PREFIX = "<html><body><!--StartFragment-->"; //$NON-NLS-1$
-
- static final String SUFFIX = "<!--EndFragment--></body></html>"; //$NON-NLS-1$
-
- static final String StartFragment = "StartFragment:"; //$NON-NLS-1$
-
- static final String EndFragment = "EndFragment:"; //$NON-NLS-1$
-
- public Win32HTMLTransfer() {
- }
-
- /**
- * Returns the singleton instance of the HTMLTransfer class.
- *
- * @return the singleton instance of the HTMLTransfer class
- */
- public static Win32HTMLTransfer getInstance() {
- return _instance;
- }
-
- /**
- * This implementation of <code>javaToNative</code> converts
- * HTML-formatted text represented by a java <code>String</code> to a
- * platform specific representation. For additional information see
- * <code>Transfer#javaToNative</code>.
- *
- * @param object
- * a java <code>String</code> containing HTML text
- * @param transferData
- * an empty <code>TransferData</code> object; this object will
- * be filled in on return with the platform specific format of
- * the data
- */
- public void javaToNative(Object object, TransferData transferData) {
- if (!checkHTML(object) || !isSupportedType(transferData)) {
- DND.error(DND.ERROR_INVALID_DATA);
- }
- String string = (String) object;
- int count = string.length();
- char[] chars = new char[count + 1];
- string.getChars(0, count, chars, 0);
- int codePage = OS.GetACP();
- int cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars, -1, null,
- 0, null, null);
- if (cchMultiByte == 0) {
- transferData.stgmedium = new STGMEDIUM();
- transferData.result = COM.DV_E_STGMEDIUM;
- return;
- }
- int startHTML = HEADER.length();
- int startFragment = startHTML + PREFIX.length();
- int endFragment = startFragment + cchMultiByte - 1;
- int endHTML = endFragment + SUFFIX.length();
-
- StringBuffer buffer = new StringBuffer(HEADER);
- int maxLength = NUMBER.length();
- // startHTML
- int start = buffer.toString().indexOf(NUMBER);
- String temp = Integer.toString(startHTML);
- buffer.replace(start + maxLength - temp.length(), start + maxLength,
- temp);
- // endHTML
- start = buffer.toString().indexOf(NUMBER, start);
- temp = Integer.toString(endHTML);
- buffer.replace(start + maxLength - temp.length(), start + maxLength,
- temp);
- // startFragment
- start = buffer.toString().indexOf(NUMBER, start);
- temp = Integer.toString(startFragment);
- buffer.replace(start + maxLength - temp.length(), start + maxLength,
- temp);
- // endFragment
- start = buffer.toString().indexOf(NUMBER, start);
- temp = Integer.toString(endFragment);
- buffer.replace(start + maxLength - temp.length(), start + maxLength,
- temp);
-
- buffer.append(PREFIX);
- buffer.append(string);
- buffer.append(SUFFIX);
-
- count = buffer.length();
- chars = new char[count + 1];
- buffer.getChars(0, count, chars, 0);
- cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars, -1, null, 0,
- null, null);
- int lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT,
- cchMultiByte);
- OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr,
- cchMultiByte, null, null);
- transferData.stgmedium = new STGMEDIUM();
- transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
- transferData.stgmedium.unionField = lpMultiByteStr;
- transferData.stgmedium.pUnkForRelease = 0;
- transferData.result = COM.S_OK;
- return;
- }
-
- /**
- * This implementation of <code>nativeToJava</code> converts a platform
- * specific representation of HTML text to a java <code>String</code>.
- * For additional information see <code>Transfer#nativeToJava</code>.
- *
- * @param transferData
- * the platform specific representation of the data to be been
- * converted
- * @return a java <code>String</code> containing HTML text if the
- * conversion was successful; otherwise null
- */
- public Object nativeToJava(TransferData transferData) {
- if (!isSupportedType(transferData) || transferData.pIDataObject == 0)
- return null;
- IDataObject data = new IDataObject(transferData.pIDataObject);
- data.AddRef();
- STGMEDIUM stgmedium = new STGMEDIUM();
- FORMATETC formatetc = transferData.formatetc;
- stgmedium.tymed = COM.TYMED_HGLOBAL;
- transferData.result = data.GetData(formatetc, stgmedium);
- data.Release();
- if (transferData.result != COM.S_OK)
- return null;
- int hMem = stgmedium.unionField;
-
- try {
- int lpMultiByteStr = OS.GlobalLock(hMem);
- if (lpMultiByteStr == 0)
- return null;
- try {
- int codePage = OS.GetACP();
- int cchWideChar = OS.MultiByteToWideChar(codePage,
- OS.MB_PRECOMPOSED, lpMultiByteStr, -1, null, 0);
- if (cchWideChar == 0)
- return null;
- char[] lpWideCharStr = new char[cchWideChar - 1];
- OS
- .MultiByteToWideChar(codePage, OS.MB_PRECOMPOSED,
- lpMultiByteStr, -1, lpWideCharStr,
- lpWideCharStr.length);
- return new String(lpWideCharStr);
- } finally {
- OS.GlobalUnlock(hMem);
- }
- } finally {
- OS.GlobalFree(hMem);
- }
- }
-
- protected int[] getTypeIds() {
- return new int[] { HTML_FORMATID };
- }
-
- protected String[] getTypeNames() {
- return new String[] { HTML_FORMAT };
- }
-
- boolean checkHTML(Object object) {
- return (object != null && object instanceof String && ((String) object)
- .length() > 0);
- }
-
- protected boolean validate(Object object) {
- return checkHTML(object);
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/package.html b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/package.html
deleted file mode 100644
index 2d697e1a095..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86/src/org/eclipse/epf/common/win32/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides windows-specific clipboard transfer services.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/.classpath b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/.classpath
deleted file mode 100644
index 02159672985..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/.project b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/.project
deleted file mode 100644
index 0801e35e8a0..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.epf.common.win32.win32.x86_64</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/META-INF/MANIFEST.MF b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/META-INF/MANIFEST.MF
deleted file mode 100644
index 830ab37eddc..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.common.win32.win32.x86_64
-Bundle-Version: 1.5.0.qualifier
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.swt
-Bundle-Vendor: %providerName
-Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/about.html b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/about.html
deleted file mode 100644
index 04a6d65fb9f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/build.properties b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/build.properties
deleted file mode 100644
index ebe02751cbb..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- about.html
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/plugin.properties b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/plugin.properties
deleted file mode 100644
index 0992ed99e31..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial implementation.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Win32 Common x86_64
-providerName=Eclipse.org
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java
deleted file mode 100644
index a5d8162ba96..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/src/org/eclipse/epf/common/win32/Win32HTMLTransfer.java
+++ /dev/null
@@ -1,218 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.win32;
-
-import org.eclipse.swt.dnd.ByteArrayTransfer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.internal.ole.win32.COM;
-import org.eclipse.swt.internal.ole.win32.FORMATETC;
-import org.eclipse.swt.internal.ole.win32.IDataObject;
-import org.eclipse.swt.internal.ole.win32.STGMEDIUM;
-import org.eclipse.swt.internal.win32.OS;
-
-/**
- * The class <code>HTMLTransfer</code> provides a platform specific mechanism
- * for converting text in HTML format represented as a java <code>String</code>
- * to a platform specific representation of the data and vice versa. See
- * <code>Transfer</code> for additional information.
- *
- * <p>
- * An example of a java <code>String</code> containing HTML text is shown
- * below:
- * </p>
- *
- * <code><pre>
- * String htmlData = &quot;
- * <p>
- * This is a paragraph of text.
- * </p>
- * &quot;;
- * </code></pre>
- */
-public class Win32HTMLTransfer extends ByteArrayTransfer {
-
- static Win32HTMLTransfer _instance = new Win32HTMLTransfer();
-
- static final String HTML_FORMAT = "HTML Format"; //$NON-NLS-1$
-
- static final int HTML_FORMATID = registerType(HTML_FORMAT);
-
- static final String NUMBER = "00000000"; //$NON-NLS-1$
-
- static final String HEADER = "Version:0.9\r\nStartHTML:" + NUMBER //$NON-NLS-1$
- + "\r\nEndHTML:" + NUMBER + "\r\nStartFragment:" + NUMBER //$NON-NLS-1$ //$NON-NLS-2$
- + "\r\nEndFragment:" + NUMBER + "\r\n"; //$NON-NLS-1$ //$NON-NLS-2$
-
- static final String PREFIX = "<html><body><!--StartFragment-->"; //$NON-NLS-1$
-
- static final String SUFFIX = "<!--EndFragment--></body></html>"; //$NON-NLS-1$
-
- static final String StartFragment = "StartFragment:"; //$NON-NLS-1$
-
- static final String EndFragment = "EndFragment:"; //$NON-NLS-1$
-
- public Win32HTMLTransfer() {
- }
-
- /**
- * Returns the singleton instance of the HTMLTransfer class.
- *
- * @return the singleton instance of the HTMLTransfer class
- */
- public static Win32HTMLTransfer getInstance() {
- return _instance;
- }
-
- /**
- * This implementation of <code>javaToNative</code> converts
- * HTML-formatted text represented by a java <code>String</code> to a
- * platform specific representation. For additional information see
- * <code>Transfer#javaToNative</code>.
- *
- * @param object
- * a java <code>String</code> containing HTML text
- * @param transferData
- * an empty <code>TransferData</code> object; this object will
- * be filled in on return with the platform specific format of
- * the data
- */
- public void javaToNative(Object object, TransferData transferData) {
- if (!checkHTML(object) || !isSupportedType(transferData)) {
- DND.error(DND.ERROR_INVALID_DATA);
- }
- String string = (String) object;
- int count = string.length();
- char[] chars = new char[count + 1];
- string.getChars(0, count, chars, 0);
- int codePage = OS.GetACP();
- int cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars, -1, null,
- 0, null, null);
- if (cchMultiByte == 0) {
- transferData.stgmedium = new STGMEDIUM();
- transferData.result = COM.DV_E_STGMEDIUM;
- return;
- }
- int startHTML = HEADER.length();
- int startFragment = startHTML + PREFIX.length();
- int endFragment = startFragment + cchMultiByte - 1;
- int endHTML = endFragment + SUFFIX.length();
-
- StringBuffer buffer = new StringBuffer(HEADER);
- int maxLength = NUMBER.length();
- // startHTML
- int start = buffer.toString().indexOf(NUMBER);
- String temp = Integer.toString(startHTML);
- buffer.replace(start + maxLength - temp.length(), start + maxLength,
- temp);
- // endHTML
- start = buffer.toString().indexOf(NUMBER, start);
- temp = Integer.toString(endHTML);
- buffer.replace(start + maxLength - temp.length(), start + maxLength,
- temp);
- // startFragment
- start = buffer.toString().indexOf(NUMBER, start);
- temp = Integer.toString(startFragment);
- buffer.replace(start + maxLength - temp.length(), start + maxLength,
- temp);
- // endFragment
- start = buffer.toString().indexOf(NUMBER, start);
- temp = Integer.toString(endFragment);
- buffer.replace(start + maxLength - temp.length(), start + maxLength,
- temp);
-
- buffer.append(PREFIX);
- buffer.append(string);
- buffer.append(SUFFIX);
-
- count = buffer.length();
- chars = new char[count + 1];
- buffer.getChars(0, count, chars, 0);
- cchMultiByte = OS.WideCharToMultiByte(codePage, 0, chars, -1, null, 0,
- null, null);
- long lpMultiByteStr = OS.GlobalAlloc(OS.GMEM_FIXED | OS.GMEM_ZEROINIT,
- cchMultiByte);
- OS.WideCharToMultiByte(codePage, 0, chars, -1, lpMultiByteStr,
- cchMultiByte, null, null);
- transferData.stgmedium = new STGMEDIUM();
- transferData.stgmedium.tymed = COM.TYMED_HGLOBAL;
- transferData.stgmedium.unionField = lpMultiByteStr;
- transferData.stgmedium.pUnkForRelease = 0;
- transferData.result = COM.S_OK;
- return;
- }
-
- /**
- * This implementation of <code>nativeToJava</code> converts a platform
- * specific representation of HTML text to a java <code>String</code>.
- * For additional information see <code>Transfer#nativeToJava</code>.
- *
- * @param transferData
- * the platform specific representation of the data to be been
- * converted
- * @return a java <code>String</code> containing HTML text if the
- * conversion was successful; otherwise null
- */
- public Object nativeToJava(TransferData transferData) {
- if (!isSupportedType(transferData) || transferData.pIDataObject == 0)
- return null;
- IDataObject data = new IDataObject(transferData.pIDataObject);
- data.AddRef();
- STGMEDIUM stgmedium = new STGMEDIUM();
- FORMATETC formatetc = transferData.formatetc;
- stgmedium.tymed = COM.TYMED_HGLOBAL;
- transferData.result = data.GetData(formatetc, stgmedium);
- data.Release();
- if (transferData.result != COM.S_OK)
- return null;
- long hMem = stgmedium.unionField;
-
- try {
- long lpMultiByteStr = OS.GlobalLock(hMem);
- if (lpMultiByteStr == 0)
- return null;
- try {
- int codePage = OS.GetACP();
- int cchWideChar = OS.MultiByteToWideChar(codePage,
- OS.MB_PRECOMPOSED, lpMultiByteStr, -1, null, 0);
- if (cchWideChar == 0)
- return null;
- char[] lpWideCharStr = new char[cchWideChar - 1];
- OS
- .MultiByteToWideChar(codePage, OS.MB_PRECOMPOSED,
- lpMultiByteStr, -1, lpWideCharStr,
- lpWideCharStr.length);
- return new String(lpWideCharStr);
- } finally {
- OS.GlobalUnlock(hMem);
- }
- } finally {
- OS.GlobalFree(hMem);
- }
- }
-
- protected int[] getTypeIds() {
- return new int[] { HTML_FORMATID };
- }
-
- protected String[] getTypeNames() {
- return new String[] { HTML_FORMAT };
- }
-
- boolean checkHTML(Object object) {
- return (object != null && object instanceof String && ((String) object)
- .length() > 0);
- }
-
- protected boolean validate(Object object) {
- return checkHTML(object);
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/src/org/eclipse/epf/common/win32/package.html b/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/src/org/eclipse/epf/common/win32/package.html
deleted file mode 100644
index 2d697e1a095..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common.win32.win32.x86_64/src/org/eclipse/epf/common/win32/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides windows-specific clipboard transfer services.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/.classpath b/extraplugins/epf-richtext/org.eclipse.epf.common/.classpath
deleted file mode 100644
index 4848249846f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/.project b/extraplugins/epf-richtext/org.eclipse.epf.common/.project
deleted file mode 100644
index 9164759b2ef..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.epf.common</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/META-INF/MANIFEST.MF b/extraplugins/epf-richtext/org.eclipse.epf.common/META-INF/MANIFEST.MF
deleted file mode 100644
index ca607535eb4..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.common;singleton:=true
-Bundle-Version: 1.5.0.qualifier
-Bundle-ClassPath: common.jar
-Bundle-Activator: org.eclipse.epf.common.CommonPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: com.ibm.icu;visibility:=reexport,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.core.runtime;visibility:=reexport,
- org.apache.ant;visibility:=reexport
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.common,
- org.eclipse.epf.common.preferences,
- org.eclipse.epf.common.serviceability,
- org.eclipse.epf.common.utils,
- org.eclipse.epf.common.xml
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/about.html b/extraplugins/epf-richtext/org.eclipse.epf.common/about.html
deleted file mode 100644
index 04a6d65fb9f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/build.properties b/extraplugins/epf-richtext/org.eclipse.epf.common/build.properties
deleted file mode 100644
index 1b2536daec7..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.common.jar = src/
-output.common.jar = bin/
-bin.includes = common.jar,\
- plugin.properties,\
- META-INF/,\
- about.html,\
- plugin.xml
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/plugin.properties b/extraplugins/epf-richtext/org.eclipse.epf.common/plugin.properties
deleted file mode 100644
index 08c7275f893..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial implementation.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Common
-providerName=Eclipse.org
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/plugin.xml b/extraplugins/epf-richtext/org.eclipse.epf.common/plugin.xml
deleted file mode 100644
index aff271b9081..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="markerAttributeContributer" name="MarkerAttributeContributer" schema="schema/markerAttributeContributer.exsd"/>
- <extension-point id="objectFactory" name="ObjectFactory" schema="schema/objectFactory.exsd"/>
- <extension-point id="htmlFormatter" name="HTMLFormatter" schema="schema/htmlFormatter.exsd"/>
- <extension-point id="htmlParser" name="HTMLParser" schema="schema/htmlParser.exsd"/>
-</plugin>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/schema/htmlFormatter.exsd b/extraplugins/epf-richtext/org.eclipse.epf.common/schema/htmlFormatter.exsd
deleted file mode 100644
index a06c38b4166..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/schema/htmlFormatter.exsd
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.epf.common" id="htmlFormatter" name="HTML Formatter"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <choice>
- <element ref="htmlFormatter"/>
- </choice>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="htmlFormatter">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.epf.common.IHTMLFormatter"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/schema/htmlParser.exsd b/extraplugins/epf-richtext/org.eclipse.epf.common/schema/htmlParser.exsd
deleted file mode 100644
index 38a8881f97e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/schema/htmlParser.exsd
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.epf.common" id="htmlParser" name="HTML Parser"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <choice>
- <element ref="htmlParser"/>
- </choice>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="htmlParser">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.epf.common.html.IHTMLParser"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/schema/markerAttributeContributer.exsd b/extraplugins/epf-richtext/org.eclipse.epf.common/schema/markerAttributeContributer.exsd
deleted file mode 100644
index f2a081cf2e3..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/schema/markerAttributeContributer.exsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.epf.common" id="markerAttributeContributer" name="MarkerAttributeContributer"/>
- </appInfo>
- <documentation>
- Allow adding addtional attributes to markers generated from EPF
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="markerAttributeContributer"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="markerAttributeContributer">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.5
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- org.eclipse.epf.common.utils.IMarkerAttributeContributer
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- //------------------------------------------------------------------------------
-// Copyright (c) 2005, 2008 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
- </documentation>
- </annotation>
-
-</schema>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/schema/objectFactory.exsd b/extraplugins/epf-richtext/org.eclipse.epf.common/schema/objectFactory.exsd
deleted file mode 100644
index ffa9a99bd00..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/schema/objectFactory.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.epf.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.epf.common" id="objectFactory" name="ObjectFactory"/>
- </appInfo>
- <documentation>
- Allow to create object through the extension
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="objectFactory"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="objectFactory">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.5
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- package org.eclipse.epf.common.utils.IObjectFactory
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/AbstractActivator.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/AbstractActivator.java
deleted file mode 100644
index b7593501458..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/AbstractActivator.java
+++ /dev/null
@@ -1,518 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.epf.common.preferences.IPreferenceStoreWrapper;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.I18nUtil;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The abstract base class for all EPF plug-ins.
- *
- * @author Kelvin Low
- * @author Jinhua Xi
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public abstract class AbstractActivator extends Plugin implements IActivator {
-
- // The relative path to the icons.
- private static final String ICON_PATH = "icons/"; //$NON-NLS-1$;
-
- // The logger hash map.
- private static Map<String, Logger> loggers = new HashMap<String, Logger>();
-
- // The message dialog hash map.
- //private static Map<String, MsgDialog> msgDialogs = new HashMap<String, MsgDialog>();
-
- // The shared image hash map.
- //private static Map<String, Image> sharedImages = new HashMap<String, Image>();
-
- // The resource bundle for this plug-in.
- private ResourceBundle resourceBundle;
-
- // This plug-in ID.
- private String pluginId;
-
- // The plug-in install URL.
- private URL installURL;
-
- // The plug-in install path.
- private String installPath;
-
- // The plug-in icon URL.
- protected URL iconURL;
-
- // The profiling flag.
- private boolean profiling;
-
- /**
- * Default constructor.
- */
- public AbstractActivator() {
- super();
- }
-
- /**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
-
- init(context);
-
- // set the
- if (isDebugging()) {
- getLogger().logInfo("Started " + pluginId); //$NON-NLS-1$
- }
- }
-
- /**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- // Free the shared images.
-// for (Iterator images = sharedImages.values().iterator(); images
-// .hasNext();) {
-// Image image = (Image) images.next();
-// if (image != null && !image.isDisposed()) {
-// image.dispose();
-// }
-// }
-
- super.stop(context);
-
- if (isDebugging()) {
- getLogger().logInfo("Stopped " + pluginId); //$NON-NLS-1$
- }
- }
-
- /**
- * Initializes this plug-in.
- *
- * @param context
- * The bundle context.
- */
- protected void init(BundleContext context) throws Exception {
- // Get the bundle for this plug-in.
- Bundle bundle = getBundle();
-
- // Get the resouce bundle for this plug-in.
- resourceBundle = Platform.getResourceBundle(bundle);
-
- // Get the ID for this plug-in.
- pluginId = bundle.getSymbolicName();
-
- if (isDebugging()) {
- getLogger().logInfo("Initializing " + pluginId); //$NON-NLS-1$
- }
-
- // Get the install path of this plug-in.
- installURL = bundle.getEntry("/"); //$NON-NLS-1$
-
- try {
- installPath = FileLocator.resolve(installURL).getPath();
- } catch (IOException e) {
- installPath = Platform.getInstallLocation().getURL().getPath();
- }
-
- try {
- iconURL = new URL(installURL, ICON_PATH);
- } catch (IOException e) {
- }
-
- String symbolicName = bundle.getSymbolicName();
- if (symbolicName != null) {
- String key = symbolicName + "/profiling"; //$NON-NLS-1$
- String value = InternalPlatform.getDefault().getOption(key);
- profiling = value == null ? false : value.equalsIgnoreCase("true"); //$NON-NLS-1$
- }
-
- if (isDebugging()) {
- getLogger().logInfo(
- "Initialized " + pluginId + ", installPath=" + installPath); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * Returns the ID of this plug-in.
- *
- * @return The ID of this plug-in.
- */
- public String getId() {
- return pluginId;
- }
-
- /**
- * Returns the install URL of this plug-in.
- *
- * @param The
- * install URL of this plug-in.
- */
- public URL getInstallURL() {
- return installURL;
- }
-
- /**
- * Returns the install path of this plug-in.
- *
- * @param The
- * install path of this plug-in.
- */
- public String getInstallPath() {
- return installPath;
- }
-
- /**
- * Loads and returns the localized properties of a Java properties file.
- * <p>
- *
- * @param path
- * The properties file path relative to the plug-in root.
- * @return A <code>Properties</code> object.
- */
- public Properties getProperties(String path) throws IOException {
- Properties props = new Properties();
- if (path == null) {
- return props;
- }
-
- String filePath = getLocalizedFile(path, true);
- if (filePath != null) {
- props.load(new FileInputStream(filePath));
- }
-
- return props;
- }
-
- /**
- * get the locale specific absolute file path name of the given file in the
- * plugin.
- *
- * @param path
- * The properties file path relative to the plug-in root.
- * @return String the locale specific absolute file path name of the given
- * file.
- * @throws IOException
- */
- public String getLocalizedFile(String path, boolean useDefault)
- throws IOException {
- String filePath = null;
- String fileName = FileUtil.getFileName(path);
- int index = path.lastIndexOf(fileName);
- String pathName = path.substring(0, index);
-
- Locale locale = Locale.getDefault();
-
- Bundle bundle = getBundle();
- Bundle[] bundles = Platform.getFragments(bundle);
- if (bundles != null) {
- for (int i = 0; i < bundles.length; i++) {
- URL entry = bundles[i].getEntry(pathName);
- if (entry != null) {
- URL url = FileLocator.resolve(entry);
- filePath = I18nUtil.getLocalizedFile(url.getPath()
- + fileName, locale);
- if (filePath != null) {
- break;
- }
- }
- }
- }
-
- if (filePath == null) {
- URL entry = bundle.getEntry(path);
- if (entry != null) {
- URL url = FileLocator.resolve(entry);
- filePath = I18nUtil.getLocalizedFile(url.getPath(), locale);
- if (filePath == null && useDefault) {
- filePath = url.getPath();
- }
- }
- }
-
- return filePath;
- }
-
- /**
- * for the given path in the plugin, find the localized files form the nl
- * fragemenets and copy the localized files to the destination folder
- *
- * @param path
- * String a relative path to the plugin root. The files in this
- * folder will be iterated and their localized files will be
- * copied over
- * @param toDir
- * FIle the destination folder
- * @param recursive
- * boolean recurively looking for files int the specified folder
- * @param useLocaleFileName
- * boolean if true the locale specific file names will be used in
- * the copied destination, otherwise, the locale specific file
- * name will be renamed to the default one in the destination
- * folder
- * @throws IOException
- */
- public void copyLocalizedFiles(String path, File toDir, boolean recursive,
- boolean useLocaleFileName) throws IOException {
- String pluginPath = getInstallPath();
- URI pluginUri = new File(pluginPath).toURI();
- URI pathUri = new File(pluginPath, path).toURI();
-
- List<File> files = new ArrayList<File>();
- File f = new File(pluginPath, path);
- FileUtil.getAllFiles(f, files, recursive);
-
- // for each file found in the specified folder, get the localized file
- for (Iterator it = files.iterator(); it.hasNext();) {
- URI srcUri = ((File) it.next()).toURI();
-
- // get the relative path of the file to the plugin root, then find
- // the localized file
- String relPath = pluginUri.relativize(srcUri).getPath();
-
- // only get the locale specific file, don't include the default one
- String localizedFile = getLocalizedFile(relPath, false);
- if (localizedFile == null) {
- continue;
- }
-
- // need to change the target file path to relative to the path
- // instead of the plugin root
- relPath = pathUri.relativize(srcUri).getPath();
- File srcFile = new File(localizedFile);
- File targetFile = new File(toDir, relPath);
- File targetParent = targetFile.getParentFile();
-
- // copy the file to the desitination
- // if useLocaleFileName is true, the destination file name should
- // also use the locale specific file name
- if (useLocaleFileName) {
- String fileName = srcFile.getName();
- targetFile = new File(targetParent, fileName);
- }
-
- if (isDebugging()) {
- System.out.println("Copying localized file: "); //$NON-NLS-1$
- System.out.println("Source: " + srcFile); //$NON-NLS-1$
- System.out.println("Target: " + targetFile); //$NON-NLS-1$
- System.out.println(""); //$NON-NLS-1$
- }
-
- try {
- if (!targetParent.exists()) {
- targetParent.mkdirs();
- }
-
- if (!targetFile.exists()) {
- targetFile.createNewFile();
- }
-
- FileUtil.copyFile(srcFile, targetFile);
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- }
-
- /**
- * Returns the localized resource.
- *
- * @param key
- * The resource key.
- * @return The localized resource.
- */
- public String getString(String key) {
- if (resourceBundle != null) {
- try {
- return resourceBundle.getString(key);
- } catch (MissingResourceException e) {
- }
- }
- return '[' + key + ']';
- }
-
- /**
- * Returns the formatted localized message given the resource key and the
- * message argument.
- *
- * @param key
- * The resource key.
- * @param argument
- * The message argument.
- * @return The formatted localized message.
- */
- public String formatMessage(String key, Object argument) {
- if (resourceBundle != null) {
- try {
- String msg = resourceBundle.getString(key);
- Object[] arguments = { argument };
- return MessageFormat.format(msg, arguments);
- } catch (MissingResourceException e) {
- }
- }
- return '[' + key + ']';
- }
-
- /**
- * Returns the image URL given the relative path.
- *
- * @param relativePath
- * The image's path relative to the plug-in's root.
- * @return The image URL.
- */
- public URL getImageURL(String relativePath) {
- try {
- URL url = new URL(iconURL, relativePath);
- return FileLocator.resolve(url);
- } catch (Exception e) {
- return null;
- }
- }
-
-// /**
-// * Returns the image descriptor given the relative path.
-// *
-// * @param relativePath
-// * The image's path relative to the plug-in's root.
-// * @return The image descriptor.
-// */
-// public ImageDescriptor getImageDescriptor(String relativePath) {
-// try {
-// URL url = new URL(iconURL, relativePath);
-// return ImageDescriptor.createFromURL(url);
-// } catch (MalformedURLException e) {
-// return ImageDescriptor.getMissingImageDescriptor();
-// }
-// }
-//
-// /**
-// * Returns the image given the relative path.
-// * <p>
-// * Note: The returned image need to be freed by the caller.
-// *
-// * @param relativePath
-// * The image's path relative to the plug-in's root.
-// * @return The image.
-// */
-// public Image getImage(String relativePath) {
-// Image image = null;
-//
-// ImageDescriptor imageDescriptor = getImageDescriptor(relativePath);
-// if (imageDescriptor != null) {
-// image = imageDescriptor.createImage(false);
-// }
-//
-// return image;
-// }
-//
-// /**
-// * Returns the shared image given the relative path.
-// * <p>
-// * Note: The returned image will be automatically freed when the plug-in
-// * shuts down.
-// *
-// * @param relativePath
-// * The image's path relative to the plug-in's root.
-// * @return The image.
-// */
-// public Image getSharedImage(String relativePath) {
-// Image image = (Image) sharedImages.get(relativePath);
-// if (image != null) {
-// return image;
-// }
-//
-// ImageDescriptor imageDescriptor = getImageDescriptor(relativePath);
-// if (imageDescriptor != null) {
-// image = imageDescriptor.createImage(false);
-// if (image != null) {
-// sharedImages.put(relativePath, image);
-// }
-// }
-//
-// return image;
-// }
-
- /**
- * Returns the profiling flag.
- *
- * @return <code>true</code> if profiling is enabled for this plu-in
- */
- public boolean isProfiling() {
- return profiling;
- }
-
- /**
- * Returns the logger given the plug-in ID.
- *
- * @return The new or cached logger.
- */
- public Logger getLogger() {
- Logger logger = (Logger) loggers.get(pluginId);
- if (logger == null) {
- logger = new Logger(this);
- loggers.put(pluginId, logger);
- }
- return logger;
- }
-
- /**
- * Logs the given object or message.
- */
- public void log(Object logEntry) {
- if (logEntry instanceof Throwable) {
- ((Throwable) logEntry).printStackTrace(System.err);
- } else {
- System.err.println(logEntry);
- }
- }
-
- public IPreferenceStoreWrapper getPreferenceStore() {
- return CommonPlugin.getDefault().getCommonPreferenceStore();
- }
-
-
- public Object getContext() {
- if ( CommonPlugin.getDefault().contextProvider != null ) {
- return CommonPlugin.getDefault().contextProvider.getContext();
- }
-
- return null;
- }
-
- public IMessageCallback getMsgCallback() {
- return CommonPlugin.getDefault().msgCallback;
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/CommonPlugin.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/CommonPlugin.java
deleted file mode 100644
index aa7c0c0d6ce..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/CommonPlugin.java
+++ /dev/null
@@ -1,82 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common;
-
-import org.eclipse.epf.common.preferences.IPreferenceStoreWrapper;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Common plug-in activator.
- */
-public final class CommonPlugin extends AbstractActivator {
-
- // The shared plug-in instance.
- private static CommonPlugin plugin;
-
- /**
- * Creates a new instance.
- */
- public CommonPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * @see org.eclipse.epf.common.ui.AbstractPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * @see org.eclipse.epf.common.ui.AbstractPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Gets the shared instance.
- *
- * @return the shared plug-in instance
- */
- public static CommonPlugin getDefault() {
- return plugin;
- }
-
-// /**
-// * set the store wrapper before it's being used.
-// * @param storeWrapper
-// */
- private IPreferenceStoreWrapper storeWrapper = null;
-
- public void setCommonPreferenceStore(IPreferenceStoreWrapper storeWrapper) {
- this.storeWrapper = storeWrapper;
- }
-
- public IPreferenceStoreWrapper getCommonPreferenceStore() {
- return storeWrapper;
- }
-
- // this is the context for message callback
- // for eclipse client, this is the Shell object
- IContextProvider contextProvider = null;
-
- public void setContextProvider(IContextProvider contextProvider) {
- this.contextProvider = contextProvider;
- }
-
- IMessageCallback msgCallback = null;
- public void setMsgCallback(IMessageCallback msgCallback) {
- this.msgCallback = msgCallback;
- }
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IActivator.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IActivator.java
deleted file mode 100644
index 4ddeed449fb..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IActivator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2008 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common;
-
-import org.eclipse.epf.common.serviceability.Logger;
-
-/**
- * @author Phong Nguyen Le
- * @since 1.5
- *
- */
-public interface IActivator {
- String getId();
- Logger getLogger();
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IContextProvider.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IContextProvider.java
deleted file mode 100644
index b361fcb8f17..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IContextProvider.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common;
-
-public interface IContextProvider {
- public Object getContext();
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IHTMLFormatter.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IHTMLFormatter.java
deleted file mode 100644
index b9db6ff70d8..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IHTMLFormatter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common;
-
-import java.io.UnsupportedEncodingException;
-import java.util.regex.Pattern;
-
-public interface IHTMLFormatter {
-
- /*
- * String location = m.group(1);
- * String lineStr = m.group(2);
- * String columnStr = m.group(3);
- * String errorMsg = m.group(4);
- */
- public static final Pattern jTidyErrorParser = Pattern
- .compile(
- "(line\\s+(\\d+)\\s+column\\s+(\\d+))\\s+-\\s+(.+)", Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
-
- public static final String DIAGNOSTIC_SOURCE = "org.eclipse.epf.common.IHTMLFormatter"; //$NON-NLS-1$
-
- public static final Pattern p_whitespace = Pattern.compile("^\\s+", Pattern.MULTILINE); //$NON-NLS-1$
-
- public String formatHTML(String html, boolean returnBodyOnly, boolean forceOutput, boolean makeBare, boolean word2000) throws UnsupportedEncodingException;
-
- public String formatHTML(String text) throws UnsupportedEncodingException;
-
- public String getLastErrorStr();
-
- public String removeLeadingWhitespace(String input);
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IHTMLParser.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IHTMLParser.java
deleted file mode 100644
index dac8b72e6c3..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IHTMLParser.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common;
-
-import java.io.File;
-import java.util.Properties;
-
-public interface IHTMLParser {
-
- public String getText();
-
- public String getSummary();
-
- public Properties getMetaTags();
-
- public void parse(File file) throws Exception;
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IMessageCallback.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IMessageCallback.java
deleted file mode 100644
index 362f33b983e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/IMessageCallback.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common;
-
-
-public interface IMessageCallback {
-
- public void displayWarning(AbstractActivator plugin, String title, String msg, String reason);
- public void displayWarning(AbstractActivator plugin, String msg, String reason, Throwable ex);
- public void displayWarning(AbstractActivator plugin, String msg, String reason, String details, Throwable ex);
- public void displayWarning(AbstractActivator plugin, String title, String msg, String reason, String details, Throwable ex);
-
- public void displayError(AbstractActivator plugin, String title, String msg);
- public void displayError(AbstractActivator plugin, String title, String msg, Throwable ex);
- public void displayError(AbstractActivator plugin, String title, String msg, String reason, String details, Throwable ex);
-
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/package.html b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/package.html
deleted file mode 100644
index dba34bd4a8f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the activator for managing the Common plug-in's life cycle.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPreferenceStoreWrapper.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPreferenceStoreWrapper.java
deleted file mode 100644
index 938f1fc7820..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPreferenceStoreWrapper.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common.preferences;
-
-
-/**
- * wrapper interface for preference store
- *
- * @author Jinhua Xi
- * @since 1.5
- *
- */
-public interface IPreferenceStoreWrapper {
-
- //public Object getStore();
-
- public void addPropertyChangeListener(IPropertyChangeListenerWrapper listener);
- public void firePropertyChangeEvent(String name, Object oldValue,
- Object newValue);
- public void removePropertyChangeListener(IPropertyChangeListenerWrapper listener);
-
- /**
- * Returns the current value of the boolean-valued preference with the
- * given name.
- * Returns the default-default value (<code>false</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as a boolean.
- *
- * @param name the name of the preference
- * @return the boolean-valued preference
- */
- public boolean getBoolean(String name);
-
- /**
- * Returns the default value for the boolean-valued preference
- * with the given name.
- * Returns the default-default value (<code>false</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as a boolean.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public boolean getDefaultBoolean(String name);
-
- /**
- * Returns the default value for the double-valued preference
- * with the given name.
- * Returns the default-default value (<code>0.0</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as a double.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public double getDefaultDouble(String name);
-
- /**
- * Returns the default value for the float-valued preference
- * with the given name.
- * Returns the default-default value (<code>0.0f</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as a float.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public float getDefaultFloat(String name);
-
- /**
- * Returns the default value for the integer-valued preference
- * with the given name.
- * Returns the default-default value (<code>0</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as an integer.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public int getDefaultInt(String name);
-
- /**
- * Returns the default value for the long-valued preference
- * with the given name.
- * Returns the default-default value (<code>0L</code>) if there
- * is no default preference with the given name, or if the default
- * value cannot be treated as a long.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public long getDefaultLong(String name);
-
- /**
- * Returns the default value for the string-valued preference
- * with the given name.
- * Returns the default-default value (the empty string <code>""</code>)
- * is no default preference with the given name, or if the default
- * value cannot be treated as a string.
- *
- * @param name the name of the preference
- * @return the default value of the named preference
- */
- public String getDefaultString(String name);
-
- /**
- * Returns the current value of the double-valued preference with the
- * given name.
- * Returns the default-default value (<code>0.0</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as a double.
- *
- * @param name the name of the preference
- * @return the double-valued preference
- */
- public double getDouble(String name);
-
- /**
- * Returns the current value of the float-valued preference with the
- * given name.
- * Returns the default-default value (<code>0.0f</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as a float.
- *
- * @param name the name of the preference
- * @return the float-valued preference
- */
- public float getFloat(String name);
-
- /**
- * Returns the current value of the integer-valued preference with the
- * given name.
- * Returns the default-default value (<code>0</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as an integter.
- *
- * @param name the name of the preference
- * @return the int-valued preference
- */
- public int getInt(String name);
-
- /**
- * Returns the current value of the long-valued preference with the
- * given name.
- * Returns the default-default value (<code>0L</code>) if there
- * is no preference with the given name, or if the current value
- * cannot be treated as a long.
- *
- * @param name the name of the preference
- * @return the long-valued preference
- */
- public long getLong(String name);
-
- /**
- * Returns the current value of the string-valued preference with the
- * given name.
- * Returns the default-default value (the empty string <code>""</code>)
- * if there is no preference with the given name, or if the current value
- * cannot be treated as a string.
- *
- * @param name the name of the preference
- * @return the string-valued preference
- */
- public String getString(String name);
-
- /**
- * Returns whether the current value of the preference with the given name
- * has the default value.
- *
- * @param name the name of the preference
- * @return <code>true</code> if the preference has a known default value
- * and its current value is the same, and <code>false</code> otherwise
- * (including the case where the preference is unknown to this store)
- */
- public boolean isDefault(String name);
-
- /**
- * Returns whether the current values in this property store
- * require saving.
- *
- * @return <code>true</code> if at least one of values of
- * the preferences known to this store has changed and
- * requires saving, and <code>false</code> otherwise.
- */
- public boolean needsSaving();
-
- /**
- * Sets the current value of the preference with the given name to
- * the given string value without sending a property change.
- * <p>
- * This method does not fire a property change event and
- * should only be used for setting internal preferences
- * that are not meant to be processed by listeners.
- * Normal clients should instead call #setValue.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void putValue(String name, String value);
-
- /**
- * Sets the default value for the double-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, double value);
-
- /**
- * Sets the default value for the float-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, float value);
-
- /**
- * Sets the default value for the integer-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, int value);
-
- /**
- * Sets the default value for the long-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, long value);
-
- /**
- * Sets the default value for the string-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param defaultObject the new default value for the preference
- */
- public void setDefault(String name, String defaultObject);
-
- /**
- * Sets the default value for the boolean-valued preference with the
- * given name.
- * <p>
- * Note that the current value of the preference is affected if
- * the preference's current value was its old default value, in which
- * case it changes to the new default value. If the preference's current
- * is different from its old default value, its current value is
- * unaffected. No property change events are reported by changing default
- * values.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new default value for the preference
- */
- public void setDefault(String name, boolean value);
-
- /**
- * Sets the current value of the preference with the given name back
- * to its default value.
- * <p>
- * Note that the preferred way of re-initializing a preference to the
- * appropriate default value is to call <code>setToDefault</code>.
- * This is implemented by removing the named value from the store,
- * thereby exposing the default value.
- * </p>
- *
- * @param name the name of the preference
- */
- public void setToDefault(String name);
-
- /**
- * Sets the current value of the double-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, double value);
-
- /**
- * Sets the current value of the float-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, float value);
-
- /**
- * Sets the current value of the integer-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, int value);
-
- /**
- * Sets the current value of the long-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, long value);
-
- /**
- * Sets the current value of the string-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, String value);
-
- /**
- * Sets the current value of the boolean-valued preference with the
- * given name.
- * <p>
- * A property change event is reported if the current value of the
- * preference actually changes from its previous value. In the event
- * object, the property name is the name of the preference, and the
- * old and new values are wrapped as objects.
- * </p>
- * <p>
- * Note that the preferred way of re-initializing a preference to its
- * default value is to call <code>setToDefault</code>.
- * </p>
- *
- * @param name the name of the preference
- * @param value the new current value of the preference
- */
- public void setValue(String name, boolean value);
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPropertyChangeEventWrapper.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPropertyChangeEventWrapper.java
deleted file mode 100644
index e1b305c88a5..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPropertyChangeEventWrapper.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common.preferences;
-
-/**
- * wrapper interface for property change event
- *
- * @author Jinhua Xi
- * @since 1.5
- *
- */
-public interface IPropertyChangeEventWrapper {
-
- /**
- * Returns the new value of the property.
- *
- * @return the new value, or <code>null</code> if not known
- * or not relevant (for instance if the property was removed).
- */
- public Object getNewValue();
-
- /**
- * Returns the old value of the property.
- *
- * @return the old value, or <code>null</code> if not known
- * or not relevant (for instance if the property was just
- * added and there was no old value).
- */
- public Object getOldValue();
-
- /**
- * Returns the name of the property that changed.
- * <p>
- * Warning: there is no guarantee that the property name returned
- * is a constant string. Callers must compare property names using
- * equals, not ==.
- * </p>
- *
- * @return the name of the property that changed
- */
- public String getProperty();
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPropertyChangeListenerWrapper.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPropertyChangeListenerWrapper.java
deleted file mode 100644
index 9e4f195a868..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/preferences/IPropertyChangeListenerWrapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.epf.common.preferences;
-
-/**
- * wrapper interface for property change listener
- *
- * @author Jinhua Xi
- * @since 1.5
- *
- */
-public interface IPropertyChangeListenerWrapper {
-
- public void propertyChange(IPropertyChangeEventWrapper event);
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/DebugTrace.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/DebugTrace.java
deleted file mode 100644
index 0e004d48034..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/DebugTrace.java
+++ /dev/null
@@ -1,104 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-/**
- * Helper utility for printing debug traces to the console.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class DebugTrace {
-
- /**
- * Prints a debug trace to the console.
- *
- * @param instance
- * a class instance
- * @param method
- * a method name
- * @param msg
- * a debug message
- * @param th
- * a <code>Throwable</code> object
- */
- public static void print(Object instance, String method, String msg,
- Throwable th) {
- StringBuffer debugMsg = new StringBuffer();
- if (instance != null) {
- debugMsg.append(instance.getClass().getName());
- if (method != null) {
- debugMsg.append('.').append(method);
- }
- debugMsg.append(": "); //$NON-NLS-1$
- }
- if (msg != null && msg.length() > 0) {
- debugMsg.append(msg);
- }
- System.out.println(debugMsg);
- if (th != null) {
- th.printStackTrace();
- }
- }
-
- /**
- * Prints a debug trace to the console.
- *
- * @param instance
- * a class instance
- * @param method
- * a method name
- * @param th
- * a <code>Throwable</code> object
- */
- public static void print(Object instance, String method, Throwable th) {
- print(instance, method, null, th);
- }
-
- /**
- * Prints a debug trace to the console.
- *
- * @param instance
- * a class instance
- * @param method
- * a method name
- * @param msg
- * a debug message
- */
- public static void print(Object instance, String method, String msg) {
- print(instance, method, msg, null);
- }
-
- /**
- * Prints a debug trace to the console.
- *
- * @param instance
- * a class instance
- * @param method
- * a method name
- */
- public static void print(Object instance, String method) {
- print(instance, method, null, null);
- }
-
- /**
- * Prints a debug trace to the console.
- *
- * @param th
- * a <code>Throwable</code> object
- */
- public static void print(Throwable th) {
- if (th != null) {
- th.printStackTrace();
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/Logger.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/Logger.java
deleted file mode 100644
index d8e12460230..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/Logger.java
+++ /dev/null
@@ -1,134 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.serviceability;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-
-/**
- * Generic logger used for logging status messages, warning messages, error
- * messages, and exception stack traces.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class Logger {
-
- public static String SeeLogFileForMoreDetails;
-
- // The plug-in instance.
- private Plugin plugin;
-
- // The plug-in ID.
- private String pluginId;
-
- /**
- * Create a new <code>Logger</code> given the plug-in instance.
- *
- * @param plugin
- * The plugin instance.
- */
- public Logger(Plugin plugin) {
- this.plugin = plugin;
- this.pluginId = plugin.getBundle().getSymbolicName(); //plugin.getId();
- }
-
- /**
- * Logs the given error message.
- *
- * @param msg
- * The error message.
- */
- public void logError(String msg) {
- logMsg(IStatus.ERROR, msg, null);
- }
-
- /**
- * Logs the given exception.
- *
- * @param ex
- * The exception.
- */
- public void logError(Throwable ex) {
- logMsg(IStatus.ERROR, null, ex);
- }
-
- /**
- * Logs the given error message and exception.
- *
- * @param msg
- * The error message.
- * @param ex
- * The exception.
- */
- public void logError(String msg, Throwable ex) {
- logMsg(IStatus.ERROR, msg, ex);
- }
-
- /**
- * Logs the given warning message.
- *
- * @param msg
- * The warning message.
- */
- public void logWarning(String msg) {
- logMsg(IStatus.WARNING, msg, null);
- }
-
- /**
- * Logs the given warning message and exception.
- *
- * @param msg
- * The warning message.
- * @param ex
- * The exception.
- */
- public void logWarning(String msg, Throwable ex) {
- logMsg(IStatus.WARNING, msg, ex);
- }
-
- /**
- * Logs the given status message and exception.
- *
- * @param msg
- * The status message.
- */
- public void logInfo(String msg) {
- logMsg(IStatus.INFO, msg, null);
- }
-
- /**
- * Logs the given message and exception.
- *
- * @param severity
- * The severity.
- * @param msg
- * The message.
- * @param ex
- * The exception.
- */
- public synchronized void logMsg(int severity, String msg, Throwable ex) {
- if (msg == null && ex != null) {
- msg = ex.getMessage();
- }
-
- if (msg == null) {
- msg = ""; //$NON-NLS-1$
- }
-
- Status status = new Status(severity, pluginId, IStatus.OK, msg, ex);
-
- // Call the Eclipse Logger.
- plugin.getLog().log(status);
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/package.html b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/package.html
deleted file mode 100644
index 7aed6dede63..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/serviceability/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides common error handling, logging and versioning services.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ExtensionHelper.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ExtensionHelper.java
deleted file mode 100644
index 2745046f8c6..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ExtensionHelper.java
+++ /dev/null
@@ -1,216 +0,0 @@
-//------------------------------------------------------------------------------
-//Copyright (c) 2005, 2008 IBM Corporation and others.
-//All rights reserved. This program and the accompanying materials
-//are made available under the terms of the Eclipse Public License v1.0
-//which accompanies this distribution, and is available at
-//http://www.eclipse.org/legal/epl-v10.html
-//
-//Contributors:
-//IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.common.IHTMLFormatter;
-import org.eclipse.epf.common.IHTMLParser;
-import org.osgi.framework.Bundle;
-
-/**
-* Helper class with methods to retrieve extensions
-* Moved part of org.eclipse.epf.library.edit.util.ExtensionManager, to allow
-* access by classes that have no dependency on org.eclipse.epf.library.edit
-*
-* @author Phong Nguyen Le
-* @author Weiping Lu
-* @since 1.5
-*/
-public class ExtensionHelper {
- private static Map IDToExtensionMap = new HashMap();
-
- public static Object createExtension(String namespace, String extensionPointName) {
- // Process the contributors.
- //
- IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(namespace, extensionPointName);
- if (extensionPoint != null) {
- IExtension[] extensions = extensionPoint.getExtensions();
- Object ext = null;
- ext_walk:
- for (int i = 0; i < extensions.length; i++) {
- IExtension extension = extensions[i];
- String pluginId = extension.getNamespaceIdentifier();
- Bundle bundle = Platform.getBundle(pluginId);
- IConfigurationElement[] configElements = extension
- .getConfigurationElements();
- for (int j = 0; j < configElements.length; j++) {
- IConfigurationElement configElement = configElements[j];
- try {
- String className = configElement.getAttribute("class"); //$NON-NLS-1$
- if(className != null) {
- ext = bundle.loadClass(className).newInstance();
- break ext_walk;
- }
- } catch (Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- }
- }
- }
- return ext;
- }
- return null;
- }
-
- public static Object getExtension(String namespace, String extensionPointName) {
- String ID = namespace + '.' + extensionPointName;
- Object ext = IDToExtensionMap.get(ID);
- if(ext == null) {
- synchronized (IDToExtensionMap) {
- ext = IDToExtensionMap.get(ID);
- if(ext == null) {
- ext = createExtension(namespace, extensionPointName);
- if(ext != null) {
- IDToExtensionMap.put(ID, ext);
- }
- }
- }
-
- }
- return ext;
- }
-
- /**
- * This is a special method to handle JTidy extensions
- *
- */
- public static Object createExtensionForJTidy(String namespace, String extensionPointName) {
- List<IHTMLFormatter> formaters = new ArrayList<IHTMLFormatter>();
- List<IHTMLParser> parsers = new ArrayList<IHTMLParser>();
-
- IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(namespace, extensionPointName);
- if (extensionPoint != null) {
- IExtension[] extensions = extensionPoint.getExtensions();
- for (int i = 0; i < extensions.length; i++) {
- IExtension extension = extensions[i];
- String pluginId = extension.getNamespaceIdentifier();
- Bundle bundle = Platform.getBundle(pluginId);
- IConfigurationElement[] configElements = extension.getConfigurationElements();
- for (int j = 0; j < configElements.length; j++) {
- IConfigurationElement configElement = configElements[j];
- try {
- String className = configElement.getAttribute("class"); //$NON-NLS-1$
- if(className != null) {
- Object obj = bundle.loadClass(className).newInstance();
- if (extensionPointName.equals("htmlFormatter")) { //$NON-NLS-1$
- formaters.add((IHTMLFormatter)obj);
- } else if (extensionPointName.equals("htmlParser")) { //$NON-NLS-1$
- parsers.add((IHTMLParser)obj);
- }
- }
- } catch (Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- }
- }
- }
-
- if (formaters.size() > 0) {
- if (formaters.size() == 1) {
- return formaters.get(0);
- }
- return selectExtension(formaters);
- } else if (parsers.size() > 0) {
- if (parsers.size() == 1) {
- return parsers.get(0);
- }
- return selectExtension(parsers);
- }
- }
-
- return null;
- }
-
- private static Object selectExtension(List objs) {
- for (Object obj : objs) {
- String name = obj.getClass().getName();
- if (!(name.equals("org.eclipse.epf.common.html.DefaultHTMLFormatter") //$NON-NLS-1$
- || name.equals("org.eclipse.epf.common.html.DefaultHTMLParser"))) { //$NON-NLS-1$
- return obj;
- }
- }
-
- return null;
- }
-
- public static IMarkerAttributeContributer getMarkerAttributeContributer() {
- IMarkerAttributeContributer ret = (IMarkerAttributeContributer) getExtension(
- CommonPlugin.getDefault().getId(), "markerAttributeContributer");//$NON-NLS-1$
- return ret;
- }
-
- /**
- * Create object based on type and context through extension
- * @param type
- * @param context
- * @return created object or null if no extension is found
- */
- public static Object create(Class type, Object context) {
- IObjectFactory ret = (IObjectFactory) getExtension(
- CommonPlugin.getDefault().getId(), "objectFactory");//$NON-NLS-1$
- if (ret == null) {
- return null;
- }
- return ret.create(type, context);
- }
-
- public static <T>List<T> getExtensions(String namespace, String extensionPointName, Class<T> type) {
- List<T> list = new ArrayList<T>();
- try {
- IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = extensionRegistry.getExtensionPoint(namespace, extensionPointName);
- if (extensionPoint != null) {
- IExtension[] extensions = extensionPoint.getExtensions();
- for (int i = 0; i < extensions.length; i++) {
- IExtension extension = extensions[i];
- String pluginId = extension.getNamespaceIdentifier();
- Bundle bundle = Platform.getBundle(pluginId);
- IConfigurationElement[] configElements = extension
- .getConfigurationElements();
- for (int j = 0; j < configElements.length; j++) {
- IConfigurationElement configElement = configElements[j];
- try {
- String className = configElement.getAttribute("class"); //$NON-NLS-1$
- if(className != null) {
- Object ext = bundle.loadClass(className).newInstance();
- if(type.isInstance(ext)) {
- list.add((T)ext);
- }
- }
- } catch (Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- }
- }
- }
- }
- }
- catch(Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- }
- if(list.isEmpty()) {
- return Collections.<T>emptyList();
- }
- return list;
- }
-
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/FileUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/FileUtil.java
deleted file mode 100644
index bf8c51b2e74..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/FileUtil.java
+++ /dev/null
@@ -1,1285 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.nio.CharBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.channels.OverlappingFileLockException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.epf.common.CommonPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * Utility class for managing directories and files.
- *
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- */
-public class FileUtil {
-
- /**
- * Platform-specific line separator.
- */
- public static final String LINE_SEP = System.getProperty("line.separator"); //$NON-NLS-1$
-
- /**
- * Platform-specific file separator.
- */
- public static final String FILE_SEP = System.getProperty("file.separator"); //$NON-NLS-1$
-
- /**
- * Platform-specific line separator length.
- */
- public static final int LINE_SEP_LENGTH = LINE_SEP.length();
-
- /**
- * UNC path prefix.
- */
- public static final String UNC_PATH_PREFIX = "\\\\"; //$NON-NLS-1$
-
- /**
- * UNC path prefix length.
- */
- public static final int UNC_PATH_PREFIX_LENGTH = UNC_PATH_PREFIX.length();
-
- /**
- * ISO-8859-1 encoding.
- */
- public static final String ENCODING_ISO_8859_1 = "ISO-8859-1"; //$NON-NLS-1$
-
- /**
- * UTF-8 encoding.
- */
- public static final String ENCODING_UTF_8 = "UTF-8";//$NON-NLS-1$
-
- private static Map<File, File> copiedFileMap;
-
- /**
- * Private constructor to prevent this class from being instantiated. All
- * methods in this class should be static.
- */
- private FileUtil() {
- }
-
- /**
- * Returns the absolute path for a file or directory.
- *
- * @param file
- * a file or directory
- * @return the absolute path to the file or directory
- */
- public static String getAbsolutePath(File file) {
- return file.getAbsolutePath().replace('\\', '/');
- }
-
- /**
- * Returns the absolute path for a file or directory.
- *
- * @param path
- * a path to a file or directory
- * @return an absolute path to the file or directory
- */
- public static String getAbsolutePath(String path) {
- return getAbsolutePath(new File(path));
- }
-
- /**
- * Returns the absolute path for a URL.
- *
- * @param url
- * a URL
- * @return the absolute path of the URL
- */
- public static String getAbsolutePath(URL url) {
- String pathName = url.getFile().substring(1);
- String result = NetUtil.decodeUrl(pathName, null);
- return result;
- }
-
- /**
- * Returns the parent directory of a path.
- *
- * @param path
- * a path name
- * @return the name of the parent directory
- */
- public static String getParentDirectory(String path) {
- return (new File(path)).getParent();
- }
-
- /**
- * Returns the file name and extension from a path.
- *
- * @param path
- * a path name
- * @return the file name including the file extension
- */
- public static String getFileName(String path) {
- return getFileName(path, true);
- }
-
- /**
- * Returns the file name from a path, with or without the file extension.
- *
- * @param path
- * a path name
- * @param withExtension
- * if <code>true</code>, include the file extension in the
- * result
- * @return the file name with or without the file extension
- */
- public static String getFileName(String path, boolean withExtension) {
- String normalizedPath = path.replace('\\', '/');
-
- int prefixLength = 0;
- if (normalizedPath.startsWith(NetUtil.FILE_URI_PREFIX)) {
- prefixLength = NetUtil.FILE_URI_PREFIX_LENGTH;
- } else if (normalizedPath.startsWith(NetUtil.HTTP_URI_PREFIX)) {
- prefixLength = NetUtil.HTTP_URI_PREFIX_LENGTH;
- }
-
- String fileName;
- int index = normalizedPath.lastIndexOf("/"); //$NON-NLS-1$
- if (index < prefixLength) {
- fileName = normalizedPath.substring(prefixLength);
- } else {
- fileName = path.substring(index + 1);
- }
-
- if (withExtension) {
- return fileName;
- }
-
- index = fileName.indexOf("."); //$NON-NLS-1$
- return (index > 0) ? fileName.substring(0, index) : fileName;
- }
-
- /**
- * Returns the relative path of a path from a base path.
- *
- * @param path
- * a path
- * @param basePath
- * the base path
- * @return a relative path
- */
- public static String getRelativePathToBase(File path, File basePath) {
- try {
- String dir = path.toURL().toExternalForm();
- String baseDir = basePath.toURL().toExternalForm();
- StringBuffer result = new StringBuffer();
- if (dir.indexOf(baseDir) == 0) {
- String delta = dir.substring(baseDir.length());
- for (int i = 0; i < delta.length(); i++) {
- if (delta.charAt(i) == '/') {
- result.append("../"); //$NON-NLS-1$
- }
- }
- }
- return result.toString();
- } catch (Exception e) {
- return ""; //$NON-NLS-1$
- }
- }
-
- public static String getRelativePath(File path, File basePath) {
- try {
- String dir = path.toURL().toExternalForm();
- String baseDir = appendSeparator(basePath.toURL().toExternalForm(),
- "/"); //$NON-NLS-1$
- StringBuffer result = new StringBuffer();
- while (dir.indexOf(baseDir) == -1) {
- basePath = basePath.getParentFile();
- baseDir = appendSeparator(basePath.toURL().toExternalForm(),
- "/"); //$NON-NLS-1$
- result.append("../"); //$NON-NLS-1$
- }
- if (dir.indexOf(baseDir) == 0) {
- String delta = dir.substring(baseDir.length());
- result.append(delta);
- }
- return result.toString();
- } catch (Exception e) {
- return ""; //$NON-NLS-1$
- }
- }
-
- /**
- * Appends the platform specific path separator to the end of a path.
- *
- * @param path
- * a path name
- * @return the path name appended with the platform specific path separator
- */
- public static String appendSeparator(String path) {
- return appendSeparator(path, File.separator);
- }
-
- /**
- * Appends the given path separator to the end of a path
- *
- * @param path
- * a path name
- * @param separator
- * a path separator
- * @return the path name appended with the given separator
- */
- public static String appendSeparator(String path, String separator) {
- return path.endsWith(separator) ? path : path + separator;
- }
-
- /**
- * Removes the ending path separator from a path.
- *
- * @param path
- * a path name
- * @return the path name minus the platform specific path separator
- */
- public static String removeSeparator(String path) {
- return path.endsWith(File.separator) ? path.substring(0,
- path.length() - 1) : path;
- }
-
- /**
- * Removes the ending path separator from a path.
- *
- * @param path
- * a path name
- * @return the path name minus the path separator "\\" or "/"
- */
- public static String removeAllSeparator(String path) {
- return path.endsWith("/") || path.endsWith("\\") ? path.substring(0, path.length() - 1) : path; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Removes the ending path separator from a path.
- *
- * @param path
- * a path name
- * @param separator
- * a path separator
- * @return the path name minus the separator
- */
- public static String removeSeparator(String path, String separator) {
- return path.endsWith(separator) ? path.substring(0, path.length() - 1)
- : path;
- }
-
- /**
- * Replaces the file name with another in a path.
- *
- * @param path
- * a path name
- * @param oldFileName
- * the old file name
- * @param newFileName
- * the new file name
- * @return the new path name with the new file name
- */
- public static String replaceFileName(String path, String oldFileName,
- String newFileName) {
- int index = path.lastIndexOf(oldFileName);
- return path.substring(0, index) + newFileName;
- }
-
- /**
- * Replaces the file extension with another in a path.
- *
- * @param path
- * a path name
- * @param oldFileExt
- * rhe old file extension
- * @param newFileExt
- * the new file extension
- * @return the new path with the new file extension
- */
- public static String replaceExtension(String path, String oldExt,
- String newExt) {
- int index = path.lastIndexOf(oldExt);
- return path.substring(0, index) + newExt;
- }
-
- /**
- * Returns the locale-specific path of a base path.
- *
- * @param path
- * a base path name
- * @param localeStr
- * a locale string
- * @return the locale-specific path
- */
- public static String getLocalePath(String path, String localeStr) {
- if (StrUtil.isBlank(localeStr)) {
- return path;
- }
- String fileName = getFileName(path);
- return replaceFileName(path, fileName, localeStr + "/" + fileName); //$NON-NLS-1$
- }
-
- /**
- * Returns the locale-specific path of a base path.
- *
- * @param path
- * a base path name
- * @param locale
- * a locale object
- * @return the locale-specific path
- */
- public static String getLocalePath(String path, Locale locale) {
- return locale == null ? path : getLocalePath(path, locale.toString());
- }
-
- /**
- * Writes the given text to a text file.
- *
- * @param fileName
- * the target file name
- * @param text
- * the text to write
- * @return <code>true</code> if the given text is written successfully to
- * file
- */
- public static boolean writeFile(String filename, String text) {
- FileWriter writer = null;
- try {
- writer = new FileWriter(filename);
- writer.write(text);
- writer.flush();
- } catch (IOException e) {
- } finally {
- if (writer != null) {
- try {
- writer.close();
- return true;
- } catch (Exception e) {
- }
- }
- }
- return false;
- }
-
- /**
- * Write the given text to a file with UTF-8 encoding.
- *
- * @param fileName
- * the target file name
- * @param text
- * the text to write
- * @param append
- * if <code>true</code>, append the text to the end of the
- * file, if <code>false</code>, override the file
- * @return <code>true</code> if the given text is written successfully to
- * file
- */
- public static boolean writeUTF8File(String filename, String text) {
- return writeUTF8File(filename, text, false);
- }
-
- /**
- * Write the given text to a file with UTF-8 encoding.
- *
- * @param fileName
- * the target file name
- * @param text
- * the text to write
- * @param append
- * if <code>true</code>, append the text to the end of the
- * file, if <code>false</code>, override the file
- * @return <code>true</code> if the given text is written successfully to
- * file
- */
- public static boolean writeUTF8File(String filename, String text,
- boolean append) {
- OutputStreamWriter writer = null;
- FileOutputStream fileOut = null;
- try {
- fileOut = new FileOutputStream(filename, append);
- writer = new OutputStreamWriter(fileOut, ENCODING_UTF_8);
- writer.write(text);
- writer.flush();
- fileOut.flush();
- } catch (IOException e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- } finally {
- if (writer != null) {
- try {
- writer.close();
- return true;
- } catch (Exception e) {
- }
- }
- if (fileOut != null) {
- try {
- fileOut.close();
- return true;
- } catch (Exception e) {
- }
- }
- }
- return false;
- }
-
- /**
- * Write the content of the given URI to an output stream.
- *
- * @param uri
- * the source URI
- * @param output
- * the output stream
- */
- public static void writeFile(String uri, OutputStream output)
- throws IOException {
- if (uri == null) {
- return;
- }
-
- InputStream input = null;
- try {
- input = NetUtil.getInputStream(uri);
- int bytesRead;
- byte[] buf = new byte[4096];
- while ((bytesRead = input.read(buf, 0, 4096)) > 0) {
- output.write(buf, 0, bytesRead);
- }
- output.flush();
- } finally {
- if (input != null) {
- try {
- input.close();
- } catch (Exception e) {
- }
- }
- }
- }
-
- /**
- * Write the content of the given URI to a <code>PrintWriter</code>.
- *
- * @param uri
- * the source URI
- * @param writer
- * the <code>PrintWriter</code> object
- */
- public static void writeFile(String uri, PrintWriter pw) throws IOException {
- if (uri == null) {
- return;
- }
-
- InputStreamReader input = null;
- try {
- input = new InputStreamReader(NetUtil.getInputStream(uri));
- int charsRead;
- char[] buf = new char[4096];
- while ((charsRead = input.read(buf, 0, 4096)) > 0) {
- pw.write(buf, 0, charsRead);
- }
- pw.flush();
- } finally {
- if (input != null) {
- try {
- input.close();
- } catch (Exception e) {
- }
- }
- }
- }
-
- /**
- * Recursively delete all sub-directories and files in a directory except
- * for the directory itself.
- *
- * @param dir
- * the directory containing the sub-directories and files
- * @return <code>true</code> if the delete operation is successful
- */
- public static boolean deleteAllFiles(String dir) {
- boolean ret = true;
- File targetDir = new File(dir);
- File[] files = targetDir.listFiles();
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- if (files[i].isDirectory()) {
- ret = ret && deleteAllFiles(files[i].getAbsolutePath());
- }
- ret = ret && files[i].delete();
- }
- }
-
- return ret;
- }
-
- public static boolean deleteTree(File file) {
- boolean ret = true;
-
- if (file.isDirectory()) {
- File[] files = file.listFiles();
- if (files != null) {
- for (File f : files) {
- if (!deleteTree(f)) {
- ret = false;
- }
- }
- }
- }
-
- if (!file.delete()) {
- ret = false;
- }
-
- return ret;
- }
-
- /**
- * Recursively delete all sub-directories and files in a directory except
- * for the directory itself and the specified file.
- *
- * @param dir
- * the directory containing the sub-directories and files
- * @param filesNotToDelete
- * a list of files and/or directories that should not be deleted
- * @return <code>true</code> if delete operation is successful
- */
- public static boolean deleteAllFiles(String dir, List<File> filesNotToDelete) {
- boolean ret = true;
- File targetDir = new File(dir);
- File[] files = targetDir.listFiles();
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- if (!filesNotToDelete.contains(files[i])) {
- if (files[i].isDirectory()) {
- ret = ret
- && deleteAllFiles(files[i].getAbsolutePath(),
- filesNotToDelete);
- }
- ret = ret && files[i].delete();
- }
- }
- }
-
- return ret;
- }
-
- /**
- * Copies the content of the source file to the target file. Will overwrite
- * an existing file if it has write permission
- *
- * @param srcFile
- * the source file or path
- * @param tgtFile
- * the target file or path
- */
- public static boolean copyFile(File srcFile, File tgtFile) {
- Map<File, File> map = getCopiedFileMap();
- File keyFile = null;
- File valFile = null;
- if (map != null) {
- try {
- keyFile = tgtFile.getCanonicalFile();
- valFile = srcFile.getCanonicalFile();
- if (valFile.equals(map.get(keyFile))) {
- return true;
- }
- } catch (Exception e) {
- keyFile = valFile = null;
- }
- }
-
- try {
- boolean ret = copyfile(srcFile, tgtFile);
- if (map != null && keyFile != null && valFile != null) {
- map.put(keyFile, valFile);
- }
- return ret;
- } catch (IOException ex) {
- CommonPlugin.getDefault().getLogger().logError(ex);
- return false;
- }
- }
-
- /**
- * Copies the content of the source file to the target file.
- *
- * @param srcFileName
- * the source file name
- * @param tgtFileName
- * the target file name
- */
- public static boolean copyFile(String srcFileName, String tgtFileName) {
- return copyFile(new File(srcFileName), new File(tgtFileName));
- }
-
- /**
- * Copies one file to another.
- * <p>
- * If both source and destination are directories, delegates to
- * copydirectory().
- * <p>
- * source must exist and be readable
- * <p>
- * cannot copy a directory to a file
- * <p>
- * will not copy if timestamps and filesize match, will overwrite otherwise
- *
- * @param source
- * the source file
- * @param dest
- * the destination file
- * @throws IOException
- * if an error occurs during the copy operation
- */
- private static boolean copyfile(File source, File dest) throws IOException {
- if (source.equals(dest))
- // do not copy equal files
- return false;
-
- if (!source.exists() || !source.canRead()) {
- // source does not exist or can't read
- return false;
- }
-
- if (dest.exists() && !dest.canWrite()) {
- // dest exists and cannot be written
- return false;
- }
-
- if (source.isDirectory()) {
- if (dest.isFile()) {
- // can't copy a directory to a file
- return false;
- } else {
- // delegate to copydirectory
- return copydirectory(source, dest);
- }
- } else {
- // source is a file
- if (dest.isDirectory()) {
- String sourceFileName = source.getName();
- return copyfile(source, new File(dest, sourceFileName));
- }
- // both source and dest are files
- boolean needCopy = true;
- if (dest.exists()) {
- needCopy = (dest.lastModified() != source.lastModified())
- || (dest.length() != source.length());
- }
-
- if (needCopy) {
- FileInputStream input = null;
- FileOutputStream output = null;
-
- try {
- input = new FileInputStream(source);
- FileChannel in = input.getChannel();
- if (!dest.exists()) {
- dest.getParentFile().mkdirs();
- }
- output = new FileOutputStream(dest);
- FileChannel out = output.getChannel();
- out.transferFrom(in, 0, source.length());
- dest.setLastModified(source.lastModified());
- return true;
- } finally {
- if (input != null) {
- try {
- input.close();
- } catch (IOException e) {
- }
- }
- if (output != null) {
- try {
- output.close();
- } catch (IOException e) {
- }
- }
- }
- } else {
- // did not copy
- // return true because dest file is same as source
- return true;
- }
- }
- }
-
- /**
- * Copies the content of a directory to another directory.
- *
- * @param srcDirName
- * the source directory name
- * @param tgtDirName
- * the target directory name
- */
- public static boolean copyDir(File srcDir, File tgtDir) {
- try {
- return copydirectory(srcDir, tgtDir);
- } catch (IOException ex) {
- CommonPlugin.getDefault().getLogger().logError(ex);
- return false;
- }
- }
-
- /**
- * Copies the content of a directory to another directory.
- *
- * @param srcDirName
- * the source directory name
- * @param tgtDirName
- * the target directory name
- */
- public static boolean copyDir(String srcDirName, String tgtDirName) {
- return copyDir(new File(srcDirName), new File(tgtDirName));
- }
-
- /**
- * Copies one directory to another - operates ONLY on directories.
- * <p>
- * Both source and dest must exist.
- */
- private static boolean copydirectory(File sourceDir, File destDir)
- throws IOException {
- if (!sourceDir.exists() || !destDir.exists()) {
- return false;
- }
-
- if (!sourceDir.isDirectory() || !destDir.isDirectory()) {
- return false;
- }
-
- File[] files = sourceDir.listFiles();
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- // calc destination name
- String destName = destDir
- + File.separator
- + files[i].getAbsolutePath().substring(
- sourceDir.getAbsolutePath().length() + 1);
- if (files[i].isFile()) {
- // copy the file
- copyfile(files[i], new File(destName));
- } else if (files[i].isDirectory()) {
- // copy directory recursively
- File destFile = new File(destName);
- destFile.mkdirs();
- copydirectory(files[i], destFile);
- }
- }
- }
- return true;
- }
-
- // for some reason, this guy locks the file, if you try to update the file,
- // got the following exception
- // java.io.FileNotFoundException:
- // (The requested operation cannot be performed on a file with a user-mapped
- // section open)
- // need to handle later
- public static CharBuffer readFile(File file) throws IOException {
- FileInputStream input = null;
- CharBuffer charBuffer = null;
- try {
- input = new FileInputStream(file);
- FileChannel inChannel = input.getChannel();
- int length = (int) inChannel.size();
- MappedByteBuffer byteBuffer = inChannel.map(
- FileChannel.MapMode.READ_ONLY, 0, length);
- Charset charset = Charset.forName(ENCODING_ISO_8859_1);
- CharsetDecoder decoder = charset.newDecoder();
- charBuffer = decoder.decode(byteBuffer);
- } finally {
- if (input != null) {
- try {
- input.close();
- } catch (IOException e) {
- }
- }
- }
- return charBuffer;
- }
-
- public static String readInputStream(InputStream input) throws IOException {
- String result = ""; //$NON-NLS-1$
- byte[] readData = new byte[8 * 1024];
- try {
- int bytesRead = 0;
- while ( (bytesRead = input.read(readData)) > 0) {
- result += new String(readData, 0, bytesRead);
- }
- } finally {
- if (input != null) {
- try {
- input.close();
- } catch (IOException e) {
- }
- }
- }
- return result;
- }
-
- public static StringBuffer readFile(File file, String encoding)
- throws IOException {
-
- StringBuffer result = new StringBuffer();
- FileInputStream fis = null;
- InputStreamReader reader = null;
- int size;
- try {
- Charset cs = Charset.forName(encoding);
- CharsetDecoder csd = cs.newDecoder();
- csd.onMalformedInput(CodingErrorAction.REPLACE);
- char[] buffer = new char[1024];
- fis = new FileInputStream(file);
- reader = new InputStreamReader(fis, csd);
- while ((size = reader.read(buffer, 0, 1024)) > 0) {
- result.append(buffer, 0, size);
- }
- } catch (Exception e) {
- // System.out.println(encoding);
- e.printStackTrace();
- } finally {
- if (fis != null) {
- fis.close();
- }
-
- if (reader != null) {
- reader.close();
- }
- }
-
- return result;
- }
-
- public static long getSize(File file) {
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(file);
- return fis.getChannel().size();
- }
- catch (IOException e) {
- //
- }
- finally {
- try {
- fis.close();
- }
- catch(Exception e) {
- //
- }
- }
- return -1;
- }
-
- /**
- * Uses Java 1.4's FileLock class to test for a file lock
- *
- * @param file
- * @return
- */
- public static boolean isFileLocked(File file) {
- boolean isLocked = false;
- FileOutputStream input = null;
- FileLock lock = null;
-
- if (!file.exists()) {
- return false;
- }
- try {
- input = new FileOutputStream(file);
- FileChannel fileChannel = input.getChannel();
-
- lock = fileChannel.tryLock();
-
- if (lock == null)
- isLocked = true;
- else
- lock.release();
- } catch (Exception e) {
- if (e instanceof SecurityException)
- // Can't write to file.
- isLocked = true;
- else if (e instanceof FileNotFoundException)
- isLocked = false;
- else if (e instanceof IOException)
- isLocked = true;
- // OverlappingFileLockException means that this JVM has it locked
- // therefore it is not locked to us
- else if (e instanceof OverlappingFileLockException)
- isLocked = false;
- // Could not get a lock for some other reason.
- else
- isLocked = true;
- } finally {
- if (input != null) {
- try {
- input.close();
- } catch (Exception ex) {
- }
- }
- }
- return isLocked;
- }
-
- /**
- * Locks a file for the current JVM. Will create the file if it does not
- * exist
- *
- * @param file
- * @return a FileLock object, or null if file could not be locked
- */
- public static FileLock lockFile(File file) {
- FileOutputStream input = null;
- FileLock lock = null;
- try {
- input = new FileOutputStream(file);
- FileChannel fileChannel = input.getChannel();
- lock = fileChannel.tryLock();
-
- if (lock.isValid())
- return lock;
- } catch (Exception e) {
- // Could not get a lock for some reason.
- return null;
- } finally {
- try {
- if (input != null && (lock == null || !lock.isValid())) {
- input.close();
- }
- } catch (Exception ex) {
- }
- }
- return null;
- }
-
- /**
- * Gets all files in a specified path.
- *
- * @param path
- * absolute path of a folder
- * @param fileList
- * a list to collect the files
- * @param recursive
- * if <code>true</code>, find the files in sub folders as well
- */
- public static void getAllFiles(File path, List<File> fileList,
- boolean recursive) {
- if (path.isDirectory()) {
- File[] files = path.listFiles();
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- if (files[i].isFile()) {
- fileList.add(files[i]);
- } else if (recursive) {
- getAllFiles(files[i], fileList, recursive);
- }
- }
- }
- }
- }
-
- /**
- * Given a directory and extension, returns all files (recursively) whose
- * extension starts with a given extension.
- *
- * @param file
- * a directory
- * @param extension
- * a file extension
- * @return a colleciton of <code>File</code> with the given extension
- */
- public static List<File> fileList(File f, String extension) {
- extension = extension.toUpperCase();
- List<File> returnList = new ArrayList<File>();
- try {
- if (f.isDirectory()) {
- String[] flist = f.list();
- for (int i = 0; i < flist.length; ++i) {
- File fc = new File(f.getPath(), flist[i]);
- returnList.addAll(fileList(fc, extension));
- }
- } else {
- if (extension != null) {
- String name = f.getName().toUpperCase();
- if (name.lastIndexOf(".") != -1) //$NON-NLS-1$
- if (name
- .substring(name.lastIndexOf(".") + 1).startsWith(extension)) { //$NON-NLS-1$
- returnList.add(f);
- }
- } else
- returnList.add(f);
- }
- } catch (Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- }
- return returnList;
- }
-
- /**
- * Given a directory and extension, returns all files (recursively) whose
- * extension does not starts with a given extension.
- *
- * @param file
- * a directory
- * @param extension
- * a file extension
- * @return a colleciton of <code>File</code> without the given extension
- */
- public static List<File> fileListExcludeExt(File f, String extension) {
- List<File> returnList = new ArrayList<File>();
- try {
- if (f.isDirectory()) {
- String[] flist = f.list();
- for (int i = 0; i < flist.length; ++i) {
- File fc = new File(f.getPath(), flist[i]);
- returnList.addAll(fileListExcludeExt(fc, extension));
- }
- } else {
- if (extension != null) {
- String name = f.getName();
- if (name.lastIndexOf(".") != -1) //$NON-NLS-1$
- if (!(name.substring(name.lastIndexOf(".") + 1).startsWith(extension))) { //$NON-NLS-1$
- returnList.add(f);
- }
- } else
- returnList.add(f);
- }
- } catch (Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- }
- return returnList;
- }
-
- /**
- * Gets all file paths in the specified path.
- *
- * @param path,
- * absolute path of a folder
- * @param recursive
- * if <code>true</code>, find the files in sub folders as well
- */
- public static ArrayList<String> getAllFileAbsolutePaths(File path,
- boolean recursive) {
- ArrayList<File> files = new ArrayList<File>();
- getAllFiles(path, files, recursive);
- ArrayList<String> paths = new ArrayList<String>();
- for (int i = 0; i < files.size(); i++) {
- String absPath = ((File) files.get(i)).getAbsolutePath();
- paths.add(absPath);
- }
- return paths;
- }
-
- /**
- * Moves a file from a directory to another.
- * <p>
- * Attempts to rename the file first. If that fails, will copy the
- * sourceFile to destFile and delete the sourceFile.
- *
- * @param sourceFile
- * the source file
- * @param destFile
- * the destination file
- * @return
- */
- public static boolean moveFile(File sourceFile, File destFile) {
- try {
- doMoveFile(sourceFile, destFile);
- return true;
- } catch (Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- return false;
- }
- }
-
- public static void doMoveFile(File sourceFile, File destFile) throws IOException {
- // Try to rename the source file to the destination file.
- if (!sourceFile.renameTo(destFile)) {
- // Try to copy the source file to the destination file and
- // delete
- // the source file.
- copyfile(sourceFile, destFile);
- sourceFile.delete();
- }
- }
-
- private static Map<File, File> getCopiedFileMap() {
- return copiedFileMap;
- }
-
- public static void setCopiedFileMap(Map<File, File> copiedFileMap) {
- FileUtil.copiedFileMap = copiedFileMap;
- }
-
-
- /**
- * Unzips the contents of a zip file to a directory
- *
- * @param zipfile
- * source zip file
- * @param tgtDir
- * target directory
- */
- public static boolean unzip(File srcZipFile, File tgtDir) {
- if (! srcZipFile.exists() || ! tgtDir.exists()) {
- return false;
- }
-
- if (! tgtDir.isDirectory()) {
- return false;
- }
-
- try {
- ZipFile zipFile = new ZipFile(srcZipFile);
- Enumeration entries = zipFile.entries();
-
- while (entries.hasMoreElements()) {
- ZipEntry entry = (ZipEntry) entries.nextElement();
-
- File tgtFile = new File(tgtDir, entry.getName());
-
- if (entry.isDirectory() && ! tgtFile.exists()) {
- tgtFile.mkdirs();
-
- } else {
- File parentFolder = tgtFile.getParentFile();
- if (! parentFolder.exists()) {
- parentFolder.mkdirs();
- }
-
- copyInputStream(zipFile.getInputStream(entry),
- new BufferedOutputStream(new FileOutputStream(
- new File(tgtDir, entry.getName()))));
- }
- }
-
- zipFile.close();
- } catch (IOException ioe) {
- return false;
- }
- return false;
- }
-
- private static final void copyInputStream(InputStream in, OutputStream out)
- throws IOException {
- byte[] buffer = new byte[1024];
- int len;
-
- while ((len = in.read(buffer)) >= 0)
- out.write(buffer, 0, len);
-
- in.close();
- out.close();
- }
-
- public static class FileChecker {
- public IStatus syncExecCheckModify(List<String> modifiedFiles) {
- return Status.OK_STATUS;
- }
- }
-
- private static FileChecker fileChecker;
- private static void loadDeafultFileChecker() {
- if (fileChecker != null) {
- return;
- }
- Bundle bundle = Platform.getBundle("org.eclipse.epf.import");
- try {
- bundle.start();
- } catch (Exception e) {
- }
- }
- public static void setFileChecker(FileChecker fileChecker) {
- FileUtil.fileChecker = fileChecker;
- }
-
- public static IStatus syncExecCheckModify(List<String> modifiedFiles) {
- loadDeafultFileChecker();
- if (fileChecker != null) {
- return fileChecker.syncExecCheckModify(modifiedFiles);
- }
- return Status.OK_STATUS;
- }
-
- public static boolean binaryEqual(File f1, File f2) {
- BufferedInputStream is1 = null;
- BufferedInputStream is2 = null;
-
- int bufSz = 1024;
- byte buff1[] = new byte[bufSz];
- byte buff2[] = new byte[bufSz];
-
- try {
- is1 = new BufferedInputStream(new FileInputStream(f1));
- is2 = new BufferedInputStream(new FileInputStream(f2));
-
- int read1 = -1;
- int read2 = -1;
-
- do {
- int offset1 = 0;
- while (offset1 < bufSz
- && (read1 = is1.read(buff1, offset1, bufSz - offset1)) >= 0) {
- offset1 += read1;
- }
-
- int offset2 = 0;
- while (offset2 < bufSz
- && (read2 = is2.read(buff2, offset2, bufSz - offset2)) >= 0) {
- offset2 += read2;
- }
- if (offset1 != offset2)
- return false;
- if (offset1 != bufSz) {
- Arrays.fill(buff1, offset1, bufSz, (byte) 0);
- Arrays.fill(buff2, offset2, bufSz, (byte) 0);
- }
- if (!Arrays.equals(buff1, buff2))
- return false;
- } while (read1 >= 0 && read2 >= 0);
- if (read1 < 0 && read2 < 0)
- return true;
- return false;
-
- } catch (Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- return false;
- }
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/I18nUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/I18nUtil.java
deleted file mode 100644
index 9758975d8e3..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/I18nUtil.java
+++ /dev/null
@@ -1,219 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Helper utiltiies for handling internationalization.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class I18nUtil {
-
- /**
- * Private constructor to prevent this class from being instantiated. All
- * methods in this class should be static.
- */
- private I18nUtil() {
- }
-
- /**
- * Returns the localized string associated with a resource key.
- *
- * @param resourceBundle
- * A resource bundle.
- * @param key
- * A resource key.
- * @return A localized string.
- */
- public static String getString(ResourceBundle resourceBundle, String key) {
- if (resourceBundle != null) {
- try {
- return resourceBundle.getString(key);
- } catch (MissingResourceException e) {
- }
- }
- return '[' + key + ']';
- }
-
- /**
- * Returns the localized string associated with a resource key and formatted
- * with a given string.
- *
- * @param resourceBundle
- * A resource bundle.
- * @param key
- * A resource key.
- * @param data
- * An object.
- * @return A formatted localized string.
- */
- public static String formatString(ResourceBundle resourceBundle,
- String key, Object data) {
- if (resourceBundle != null) {
- try {
- String localizedStr = resourceBundle.getString(key);
- return MessageFormat
- .format(localizedStr, new Object[] { data });
- } catch (MissingResourceException e) {
- }
- }
- return '[' + key + ']';
- }
-
- /**
- * Returns the localized string associated with a resource key and formatted
- * with two given string.
- *
- * @param resourceBundle
- * A resource bundle.
- * @param key
- * A resource key.
- * @param data1
- * An object.
- * @param data2
- * An object.
- * @return A formatted localized string.
- */
- public static String formatString(ResourceBundle resourceBundle,
- String key, Object data1, Object data2) {
- if (resourceBundle != null) {
- try {
- String localizedStr = resourceBundle.getString(key);
- return MessageFormat.format(localizedStr, new Object[] { data1,
- data2 });
- } catch (MissingResourceException e) {
- }
- }
- return '[' + key + ']';
- }
-
- /**
- * Returns the localized string associated with a resource key and formatted
- * with a given string.
- *
- * @param resourceBundle
- * A resource bundle.
- * @param key
- * A resource key.
- * @param data
- * An array of objects.
- * @return A formatted localized string.
- */
- public static String formatString(ResourceBundle resourceBundle,
- String key, Object[] data) {
- if (resourceBundle != null) {
- try {
- String localizedStr = resourceBundle.getString(key);
- return MessageFormat.format(localizedStr, data);
- } catch (MissingResourceException e) {
- }
- }
- return '[' + key + ']';
- }
-
- /**
- * Returns the localized integer value associated with a resource key.
- *
- * @param resourceBundle
- * A resource bundle.
- * @param key
- * A resource key.
- * @param defaultValue
- * The default value to return if the resource key cannot be
- * located.
- * @return A localized interger value.
- */
- public static int getInt(String intString,
- int defaultValue) {
- try {
- if (intString != null) {
- return Integer.parseInt(intString);
- }
- } catch (Exception e) {
- }
- return defaultValue;
- }
-
- /**
- * Returns the localized version of a US English resource file.
- *
- * @param path
- * The absolute path to a resource file.
- * @param locale
- * A locale.
- * @return The localized resource file. If none exists, return null.
- */
- public static String getLocalizedFile(String path, Locale locale) {
- if (locale.equals(Locale.US) || path == null) {
- return null;
- }
-
- // Build the locale string array. This is used to construct the
- // localized file names.
- String language = locale.getLanguage();
- String country = locale.getCountry();
- String variant = locale.getVariant();
-
- String[] localeStrs = new String[3];
- if (variant != null && variant.length() > 0) {
- localeStrs[0] = locale.toString();
- }
- if (country != null && country.length() > 0) {
- localeStrs[1] = language + "_" + country; //$NON-NLS-1$
- }
- if (language != null) {
- localeStrs[2] = language;
- }
-
- String dir = path.replace('\\', '/');
- String fileName;
-
- int pathIndex = dir.lastIndexOf("/"); //$NON-NLS-1$
- if (pathIndex > 0) {
- dir = path.substring(0, pathIndex + 1);
- fileName = path.substring(pathIndex + 1);
- } else {
- fileName = dir;
- dir = ""; //$NON-NLS-1$
- }
-
- String fileExt = ""; //$NON-NLS-1$
- int extIndex = fileName.lastIndexOf("."); //$NON-NLS-1$
- if (extIndex > 0) {
- fileExt = fileName.substring(extIndex);
- fileName = fileName.substring(0, extIndex);
- }
-
- fileName = dir + fileName + "_"; //$NON-NLS-1$
-
- // Look for the localized file.
- for (int i = 0; i < 3; i++) {
- if (localeStrs[i] != null) {
- // Gets the localized path name.
- String fname = fileName + localeStrs[i] + fileExt;
- File file = new File(fname);
- if (file.exists()) {
- return fname;
- }
- }
- }
-
- return null;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/IMarkerAttributeContributer.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/IMarkerAttributeContributer.java
deleted file mode 100644
index ceba9ebd156..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/IMarkerAttributeContributer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-//Copyright (c) 2005, 2008 IBM Corporation and others.
-//All rights reserved. This program and the accompanying materials
-//are made available under the terms of the Eclipse Public License v1.0
-//which accompanies this distribution, and is available at
-//http://www.eclipse.org/legal/epl-v10.html
-//
-//Contributors:
-//IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import org.eclipse.core.resources.IMarker;
-
-/**
-* Interface for adding additional attributes to markers
-*
-* @author Weiping Lu
-* @since 1.5
-*/
-public interface IMarkerAttributeContributer {
-
- void addAddtionalAttributes(IMarker marker, Object context);
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/IObjectFactory.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/IObjectFactory.java
deleted file mode 100644
index 21d93d3e722..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/IObjectFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-//------------------------------------------------------------------------------
-//Copyright (c) 2005, 2008 IBM Corporation and others.
-//All rights reserved. This program and the accompanying materials
-//are made available under the terms of the Eclipse Public License v1.0
-//which accompanies this distribution, and is available at
-//http://www.eclipse.org/legal/epl-v10.html
-//
-//Contributors:
-//IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-/**
-* Interface to create object based on type and context
-*
-* @author Weiping Lu
-* @since 1.5
-*/
-public interface IObjectFactory {
-
- Object create(Class type, Object context);
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ImageUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ImageUtil.java
deleted file mode 100644
index 9af9c4fb740..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ImageUtil.java
+++ /dev/null
@@ -1,179 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.MediaTracker;
-import java.awt.font.FontRenderContext;
-import java.awt.font.LineBreakMeasurer;
-import java.awt.font.TextAttribute;
-import java.awt.font.TextLayout;
-import java.awt.geom.Point2D;
-import java.awt.image.BufferedImage;
-import java.text.AttributedCharacterIterator;
-import java.text.AttributedString;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Utility class for creating image files.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class ImageUtil {
-
- // The BufferedImage cache.
- private static HashMap<String, BufferedImage> imageCache = new HashMap<String, BufferedImage>();
-
- /**
- * Private constructor to prevent this class from being instantiated. All
- * methods in this class should be static.
- */
- private ImageUtil() {
- }
-
- /**
- * Creates a <code>BufferedImage</code> from the given image file.
- *
- * @param imageFile
- * an image file
- * @param c
- * an AWT component
- */
- public static BufferedImage getBufferedImage(String imageFile, Component c) {
- if (imageFile == null || c == null) {
- return null;
- }
-
- BufferedImage bufferedImage = (BufferedImage) imageCache.get(imageFile);
- if (bufferedImage != null) {
- return bufferedImage;
- }
-
- Image image = c.getToolkit().getImage(imageFile);
- MediaTracker tracker = new MediaTracker(c);
- tracker.addImage(image, 0);
- try {
- tracker.waitForAll();
- } catch (InterruptedException e) {
- }
-
- bufferedImage = new BufferedImage(image.getWidth(c),
- image.getHeight(c), BufferedImage.TYPE_INT_ARGB);
-
- Graphics2D g2d = bufferedImage.createGraphics();
- g2d.drawImage(image, 0, 0, c);
- imageCache.put(imageFile, bufferedImage);
-
- return bufferedImage;
- }
-
- /**
- * Returns <code>true</code> if the given image is loaded successfully.
- *
- * @param image
- * an AWT image
- * @param c
- * an AWT component
- */
- public static boolean waitForImage(Image image, Component c) {
- MediaTracker tracker = new MediaTracker(c);
- tracker.addImage(image, 0);
- try {
- tracker.waitForAll();
- } catch (InterruptedException ie) {
- }
- return (!tracker.isErrorAny());
- }
-
- /**
- * Draws the given text.
- *
- * @param g2d
- * the <code>Graphics2D</code> context
- * @param text
- * the text to be rendered
- * @param font
- * the font used for rendering the text
- * @param color
- * the color used for rendering the text
- * @param x
- * the horizontal coordinate used for rendering the text
- * @param y
- * the verticalcoordinate used for rendering the text
- */
- public static void drawText(Graphics2D g2d, String text, Font font,
- Color color, int x, int y) {
- if (text == null || text.length() == 0) {
- return;
- }
- g2d.setColor(color);
- FontRenderContext frc = g2d.getFontRenderContext();
- TextLayout textlayout = new TextLayout(text, font, frc);
- textlayout.draw(g2d, x, y);
- }
-
- /**
- * Draws the given text and wraps it based on the given width.
- *
- * @param g2d
- * the <code>Graphics2D</code> context
- * @param text
- * the text to be rendered
- * @param font
- * the font used for rendering the text
- * @param color
- * the color used for rendering the text
- * @param x
- * the horizontal coordinate used for rendering the text
- * @param y
- * the verticalcoordinate used for rendering the text
- * @param width
- * the maximum width used for wrapping the text
- * @param maxLine
- * the maximum number of line of wrapped text
- */
- public static void drawText(Graphics2D g2d, String text, Font font,
- Color color, int x, int y, float width, int maxLine) {
- if (text == null || text.length() == 0) {
- return;
- }
- float maxWrapWidth = width - 10;
- g2d.setColor(color);
- Point2D.Float pen = new Point2D.Float(x, y);
- Map<TextAttribute, Font> attributes = new HashMap<TextAttribute, Font>();
- attributes.put(TextAttribute.FONT, font);
- AttributedCharacterIterator textIterator = new AttributedString(text,
- attributes).getIterator();
- FontRenderContext frc = g2d.getFontRenderContext();
- LineBreakMeasurer measurer = new LineBreakMeasurer(textIterator, frc);
- int line = 1;
- while (line <= maxLine) {
- TextLayout layout = measurer.nextLayout(maxWrapWidth);
- if (layout == null)
- break;
- pen.y += layout.getAscent();
- float dx = 0;
- if (layout.isLeftToRight()) {
- dx = (width - layout.getAdvance());
- }
- layout.draw(g2d, pen.x + dx / 2, pen.y);
- pen.y += layout.getDescent() + layout.getLeading() - 1;
- line++;
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MathUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MathUtil.java
deleted file mode 100644
index 0ad88f943e2..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/MathUtil.java
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-/**
- * Utility class for performing math operations.
- *
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class MathUtil {
-
- public static final long ceil1000(long l) {
- return (l - (l & 7));
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/NetUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/NetUtil.java
deleted file mode 100644
index b12f20edf37..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/NetUtil.java
+++ /dev/null
@@ -1,400 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLDecoder;
-
-/**
- * Implements a utility class for managing URLs and URIs.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class NetUtil {
-
- /**
- * FILE scheme.
- */
- public final static String FILE_SCHEME = "file"; //$NON-NLS-1$
-
- /**
- * File URI prefix.
- */
- public final static String FILE_URI_PREFIX = FILE_SCHEME + ":/"; //$NON-NLS-1$
-
- /**
- * File URI prefix size.
- */
- public final static int FILE_URI_PREFIX_LENGTH = FILE_URI_PREFIX.length();
-
- /**
- * HTTP scheme.
- */
- public final static String HTTP_SCHEME = "http"; //$NON-NLS-1$
-
- /**
- * HTTP URI prefix.
- */
- public final static String HTTP_URI_PREFIX = HTTP_SCHEME + "://"; //$NON-NLS-1$
-
- /**
- * HTTP URI prefix size.
- */
- public final static int HTTP_URI_PREFIX_LENGTH = HTTP_URI_PREFIX.length();
-
- public static final String FILE_PREFIX_2 = "file://"; //$NON-NLS-1$
-
- public static final String FILE_PREFIX_3 = "file:///"; //$NON-NLS-1$
-
- /**
- * A table of hex values.
- */
- private final static String[] HEX_VALUES = {
- "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%28", "%29", "%2A", "%2B", "%2C", "%2D", "%2E", "%2F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%38", "%39", "%3A", "%3B", "%3C", "%3D", "%3E", "%3F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%48", "%49", "%4A", "%4B", "%4C", "%4D", "%4E", "%4F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%58", "%59", "%5A", "%5B", "%5C", "%5D", "%5E", "%5F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%68", "%69", "%6A", "%6B", "%6C", "%6D", "%6E", "%6F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%78", "%79", "%7A", "%7B", "%7C", "%7D", "%7E", "%7F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%88", "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%98", "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%A8", "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%B8", "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%C8", "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%D8", "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%E8", "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- "%F8", "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
- };
-
- public static final String RAW_URL_RAW = "raw_URL_raw"; //$NON-NLS-1$
-
- /**
- * Private constructor to prevent this class from being instantiated. All
- * methods in this class should be static.
- */
- private NetUtil() {
- }
-
- /**
- * Returns the URI for the given file.
- *
- * @param file
- * The input file.
- * @return The URI for the given file.
- * @throws MalformedURLException
- * if an error occur while constructing the URI for the given
- * file.
- */
- public static String getUri(File file) throws MalformedURLException {
- String url = file.toURL().toExternalForm();
- StringBuffer strBuf = new StringBuffer();
- int urlLength = url.length();
- for (int i = 0; i < urlLength; i++) {
- char ch = url.charAt(i);
- switch (ch) {
- case ' ':
- strBuf.append("%20"); //$NON-NLS-1$
- break;
- default:
- strBuf.append(ch);
- break;
- }
- }
- return strBuf.toString();
- }
-
- /**
- * Resolves the given URI using the given the base URI.
- *
- * @param uri
- * The URI to resolve.
- * @param baseUri
- * The base URI.
- * @return A fully formed URI.
- */
- public static String resolveUri(String uri, String baseUri) {
- if (uri == null) {
- return null;
- }
-
- if (uri.startsWith("../")) { //$NON-NLS-1$
- if (baseUri.endsWith("/")) { //$NON-NLS-1$
- baseUri = baseUri.substring(0, baseUri.length() - 1);
- }
- while (uri.startsWith("../")) { //$NON-NLS-1$
- uri = uri.substring(3);
- int index = baseUri.lastIndexOf('/');
- if (index > 0) {
- baseUri = baseUri.substring(0, index);
- }
- }
- uri = "/" + uri; //$NON-NLS-1$
- }
-
- if (uri.startsWith("/")) { //$NON-NLS-1$
- return baseUri.endsWith("/") //$NON-NLS-1$
- ? baseUri + uri.substring(1) : baseUri + uri;
- }
-
- if (uri.startsWith(FILE_URI_PREFIX) || uri.startsWith(HTTP_URI_PREFIX)) {
- return uri;
- }
-
- return baseUri.endsWith("/") ? baseUri + uri : baseUri + '/' + uri; //$NON-NLS-1$
- }
-
- /**
- * Returns the input stream for the given URI.
- *
- * @param uri
- * The source URI.
- * @return The input stream for the given URI.
- * @throw MalformedURLException if a given XML document URI is invalid.
- * @throw IOException if an I/O error occur while accessing the URI.
- */
- public static InputStream getInputStream(String uri)
- throws MalformedURLException, IOException {
- if (uri == null) {
- return null;
- }
-
- if (uri.startsWith(HTTP_URI_PREFIX)) {
- URL url = new URL(uri);
- return url.openStream();
- } else if (uri.startsWith(FILE_URI_PREFIX)) {
- uri = uri.substring(FILE_URI_PREFIX_LENGTH);
- }
-
- return new FileInputStream(NetUtil.decodeUrl(uri, null));
- }
-
- /**
- * Returns the Java string represention (encoded in UTF-16) of the given URL
- * (encoded in the given encoding and ASCII-escaped).
- *
- * @param url
- * The URL to decode.
- * @param encoding
- * The encoding of the URL.
- * @return The Java UTF-16 string respresentation.
- * @throws IllegalArgumentException
- * if the given URL contain improperly escaped characters.
- */
- public static String decodeUrl(String url, String encoding) {
- if (url == null) {
- return url;
- }
-
- int len = url.length();
- if (len == 0) {
- return url;
- }
-
- // Unescape the url.
- StringBuffer strBuf = new StringBuffer();
- for (int i = 0; i < len; i++) {
- char ch = url.charAt(i);
- switch (ch) {
- case '+':
- strBuf.append(' ');
- break;
- case '%':
- try {
- strBuf.append((char) Integer.parseInt(url.substring(i + 1,
- i + 3), 16));
- } catch (NumberFormatException e) {
- throw new IllegalArgumentException();
- }
- i += 2;
- break;
- default:
- strBuf.append(ch);
- break;
- }
- }
-
- // Convert the un-escaped byte values to Java UTF-16 string.
- String result = strBuf.toString();
- if (encoding != null) {
- try {
- byte[] bytes = result.getBytes("8859_1"); //$NON-NLS-1$
- result = new String(bytes, encoding);
- } catch (UnsupportedEncodingException e) {
- }
- }
-
- return result;
- }
-
- /**
- * Returns the ASCII-escaped representation (encoded in the specified
- * encoding) of the given URL (encoded in UTF-16).
- *
- * @param url
- * The URL to encode.
- * @param encoding
- * The encoding of the URL.
- * @return the ASCII-escaped respresentation.
- * @throws IllegalArgumentException
- * if the given URL contain improperly escaped characters.
- * @throws UnsupportedEncodingException
- * if the given coding is unsupport.
- */
- public static String encodeUrl(String url, String encoding)
- throws UnsupportedEncodingException {
- if (url == null) {
- return url;
- }
- int len = url.length();
- if (len == 0) {
- return url;
- }
-
- StringBuffer result = new StringBuffer();
-
- byte[] bytes = url.getBytes(encoding);
- for (int i = 0; i < bytes.length; i++) {
- char ch = (char) bytes[i];
-
- if (ch >= 'a' && ch <= 'z') {
- result.append(ch);
- } else if (ch >= 'A' && ch <= 'Z') {
- result.append(ch);
- } else if (ch >= '0' && ch <= '9') {
- result.append(ch);
- } else {
- switch (ch) {
- case '-':
- case '_':
- case '.':
- case '!':
- case '~':
- case '*':
- case '\'':
- case '(':
- case ')':
- result.append(ch);
- break;
- default:
- result.append(HEX_VALUES[ch & 0xFF]);
- break;
- }
- }
- }
-
- return result.toString();
- }
-
- /**
- * Returns the ASCII-escaped representation of the given file URL.
- *
- * @param fileURL
- * The file URL to encode.
- * @return the ASCII-escaped respresentation.
- */
- public static String encodeFileURL(String fileURL) {
- String url = fileURL;
- StringBuffer strBuf = new StringBuffer();
- int urlLength = url.length();
- for (int i = 0; i < urlLength; i++) {
- char ch = url.charAt(i);
- switch (ch) {
- case ' ':
- strBuf.append("+"); //$NON-NLS-1$
- break;
- default:
- strBuf.append(ch);
- break;
- }
- }
- return strBuf.toString();
- }
-
- /**
- * Returns the ASCII-escaped representation of the given file URL.
- *
- * @param fileURL
- * The file URL to encode.
- * @return the ASCII-escaped respresentation.
- */
- public static String decodedFileUrl(String fileURL) {
- if (isRawUrl(fileURL)) {
- return fileURL;
- }
-
- String url = fileURL;
- StringBuffer strBuf = new StringBuffer();
- int urlLength = url.length();
- for (int i = 0; i < urlLength; i++) {
- char ch = url.charAt(i);
- switch (ch) {
- case '+':
- strBuf.append(' ');
- break;
- case '%':
- try {
- strBuf.append((char) Integer.parseInt(url.substring(i + 1,
- i + 3), 16));
- } catch (NumberFormatException e) {
- throw new IllegalArgumentException();
- }
- i += 2;
- break;
- default:
- strBuf.append(ch);
- break;
- }
- }
- return strBuf.toString();
- }
-
- public static String decodeURL (String url) throws UnsupportedEncodingException {
-// url = url.replaceAll("\\+", "%2B"); //$NON-NLS-1$
- url = URLDecoder.decode(url, "UTF-8"); //$NON-NLS-1$
- return url;
- }
-
- public static boolean isRawUrl(String url) {
- boolean result = false;
-
- if (url.endsWith(RAW_URL_RAW)) {
- result = true;
- }
-
- return result;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ProfilingUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ProfilingUtil.java
deleted file mode 100644
index db94b48b4b1..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ProfilingUtil.java
+++ /dev/null
@@ -1,60 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.PrintStream;
-
-
-/**
- * Utility class for profiling
- *
- * @author Weiping Lu
- * @since 1.0
- */
-
-public class ProfilingUtil {
-
- public static boolean traceFootprint = false;
-
- private static PrintStream output = System.out;
-
- public static void setOutput(PrintStream ps) {
- output = ps;
- }
-
- public static void fullGC() {
- Runtime rt = Runtime.getRuntime();
- long isFree = rt.freeMemory();
- long wasFree;
- do {
- wasFree = isFree;
- rt.runFinalization();
- rt.gc();
- isFree = rt.freeMemory();
- } while (isFree > wasFree);
- }
-
- public static long traceUsedMemory(String location) {
- Runtime rt = Runtime.getRuntime();
- long usedMem = rt.totalMemory() - rt.freeMemory();
- output.println("Footprint> " + location + ": " + usedMem/1000 + " K"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- return usedMem;
- }
-
- public static long traceUsedMemoryDiff(String locationInfo, long currUsed, long PrevUsed) {
- long diff = currUsed - PrevUsed;
- output.println("Footprint> Diff, " + locationInfo + ": " + diff/1000 + " K\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- return diff;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/RestartableJob.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/RestartableJob.java
deleted file mode 100644
index c60e94cc1c6..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/RestartableJob.java
+++ /dev/null
@@ -1,123 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2008 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-
-/**
- * Job class that is re-startable
- *
- * @author Weiping Lu
- * @since 1.5
- */
-
-public abstract class RestartableJob extends Job {
-
- protected static boolean localDebug = false;
-
- private boolean toRestart = true;
- private boolean schedulingLocked = false;
- private boolean enabled = true;
-
- public RestartableJob(String name) {
- super(name);
- }
-
- public final void guardedSchedule(long delay) {
- guardedSchedule(delay, false);
- }
-
- private void guardedSchedule(long delay, boolean inRunCall) {
- if ( ! isEnabled()) {
- return;
- }
- if (!inRunCall && getState() != Job.NONE) {
- return;
- }
- if (isSchedulingLocked()) {
- return;
- }
- if (localDebug) {
- System.out.println("LD> guardedSchedule completed"); //$NON-NLS-1$
- }
- setSchedulingLocked(true);
- schedule(delay);
- }
-
- protected final IStatus run(IProgressMonitor monitor) {
- if (localDebug) {
- System.out.println("LD> RestartableJob.run"); //$NON-NLS-1$
- }
- setSchedulingLocked(false);
- setToRestart(false);
- IStatus status = Status.OK_STATUS;
- try {
- status = restartableRun(monitor);
- } catch (RestartInterruptException e) {
- guardedSchedule(e.getDelay(), true);
- }
-
- return Status.OK_STATUS;
- }
-
- protected abstract IStatus restartableRun(IProgressMonitor monitor) throws RestartInterruptException;
- protected abstract void resetToRestart();
-
- private synchronized boolean isSchedulingLocked() {
- return schedulingLocked;
- }
-
- private synchronized void setSchedulingLocked(boolean schedulingLocked) {
- this.schedulingLocked = schedulingLocked;
- }
-
- private synchronized boolean isToRestart() {
- return toRestart;
- }
-
- private synchronized void setToRestart(boolean toRestart) {
- this.toRestart = toRestart;
- }
-
- public void enableToRestart() {
- setToRestart(true);
- }
-
- public void checkRestartInterruptException(long delay) throws RestartInterruptException {
- if (isToRestart()) {
- resetToRestart();
- throw new RestartInterruptException(delay);
- }
- }
-
- public static class RestartInterruptException extends Exception {
- private long delay = 0;
- public RestartInterruptException(long delay) {
- this.delay = delay;
- }
-
- public long getDelay() {
- return delay;
- }
- }
-
- public synchronized boolean isEnabled() {
- return enabled;
- }
-
- public synchronized void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StrUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StrUtil.java
deleted file mode 100644
index b4fd0c17f65..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StrUtil.java
+++ /dev/null
@@ -1,676 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.CommonPlugin;
-
-import com.ibm.icu.lang.UCharacter;
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * A helper class for manuipulating strings.
- *
- * @author Kelvin Low
- * @author Jinhua Xi
- * @since 1.0
- */
-public class StrUtil {
- public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
- public static final String TAB = "\t"; //$NON-NLS-1$
-
- private static final String REGEXP_ANY_SPECIAL_CHARS = "(`|~|!|@|#|\\$|%|\\^|&|\\*|\\(|\\)|\\+|=|\\[|\\]|\\||\\:|\"|<|>|\\?|/|'|\\s|\\\\)+"; //$NON-NLS-1$
-
- private static final String REGEXP_INVALID_PUBLISHED_PATH_CHARS = "(\\[|#|\\*|\\?|\"|<|>|\\||!|%|/|\\])+"; //$NON-NLS-1$
-
- private static final String REGEXP_INVALID_PUBLISHED_PATH_CHARS_LINUX = "(\\[|#|\\*|\\?|\"|<|>|\\||!|%|\\])+"; //$NON-NLS-1$
-
- private static final String REGEXP_INVALID_FILENAME_CHARS = "(\\[|#|/|\\\\|\\:|\\*|\\?|\"|<|>|\\||\\]|\\s)+"; //$NON-NLS-1$
-
- private static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5',
- '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
- public static final String LINE_FEED = System.getProperty("line.separator"); //$NON-NLS-1$
-
- public static final String ESCAPED_LF = "&#xA;"; //$NON-NLS-1$
-
- public static final String ESCAPED_CR = "&#xD;"; //$NON-NLS-1$
-
- public static final String ESCAPED_LINE_FEED = LINE_FEED.replace(
- "\n", ESCAPED_LF).replace("\r", ESCAPED_CR); //$NON-NLS-1$ //$NON-NLS-2$
-
- public static final String LINE_FEED_REGEX = LINE_FEED.replaceAll(
- "\\\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
-
- public static final String ESCAPED_LINE_FEED_REGEX = ESCAPED_LINE_FEED;
-
- public static final String HTML_BREAK = "<br/>";//$NON-NLS-1$
-
- public static final String HTML_COPY = "&copy;";//$NON-NLS-1$
-
- public static final String HTML_EURO = "&euro;";//$NON-NLS-1$
-
- public static final String HTML_REG = "&reg;";//$NON-NLS-1$
-
- public static final String HTML_TRADEMARK = "&trade;";//$NON-NLS-1$
-
- public static boolean during_migration = false;
-
- private static StrUtilOptions options;
-
- /**
- * Private constructor to prevent this class from being instantiated. All
- * methods in this class should be static.
- */
- private StrUtil() {
- }
-
- /**
- * Tests for null string.
- * <p>
- * A null string is defined as one that has an empty reference or has zero
- * length.
- *
- * @param str
- * a string
- * @return <code>true</code> if the given string is a null string
- */
- public static boolean isNull(String str) {
- return str == null || str.length() == 0;
- }
-
- /**
- * Tests for blank string.
- * <p>
- * A blank string is defined as one that has an empty reference or has zero
- * length after the leading and trailing space characters are trimmed.
- *
- * @param str
- * a string
- * @return <code>true</code> if the given string is a blank string
- */
- public static boolean isBlank(String str) {
- return str == null || str.trim().length() == 0;
- }
-
- /**
- * Removes the leading and trailing space characters from a string.
- *
- * @param str
- * a string
- * @return a string with no leading and trailing space characters
- */
- public static String trim(String str) {
- return str == null ? null : str.trim();
- }
-
- /**
- * Removes whitespace characters (TAB, CR, LF and SPACE) from a string.
- *
- * @param str
- * a string
- * @return a string with whitespace characters removed
- */
- public static String removeWhiteSpaceChars(String str) {
- int len = (str == null) ? 0 : str.length();
- for (int i = 0; i < len; i++) {
- switch (str.charAt(i)) {
- case '\t':
- case '\r':
- case '\n':
- case ' ':
- break;
- default:
- return str;
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Removes CR, LF from a string.
- *
- * @param str
- * a string
- * @return a string with CR, LF removed
- */
- public static String removeNewlines(String str) {
- StringBuffer sb = new StringBuffer();
- int len = (str == null) ? 0 : str.length();
- for (int i = 0; i < len; i++) {
- char c = str.charAt(i);
- switch (c) {
- case '\r':
- case '\n':
- break;
- default:
- sb.append(c);
- }
- }
- return sb.toString();
- }
-
- /**
- * Splits a string into an array of string tokens.
- *
- * @param str
- * a string
- * @param sep
- * a string containing the string separators
- * @param count
- * the desired number of string tokens
- * @return an array of string tokens
- */
- public static String[] split(String str, String sep, int count) {
- if (str == null || count == 0 || count < -1) {
- return null;
- }
-
- StringTokenizer tokenizer = new StringTokenizer(str, sep,
- count == -1 ? false : true);
-
- if (count == -1) {
- count = tokenizer.countTokens();
- }
-
- String[] result = new String[count];
- int i = 0;
- while (tokenizer.hasMoreTokens()) {
- String t = tokenizer.nextToken();
- if (i < count) {
- if ((t.length() == 1) && (sep.indexOf(t) != -1)) {
- continue;
- }
- result[i++] = t;
- } else {
- result[count - 1] += t;
- }
- }
- return result;
- }
-
- /**
- * Splits a string into an array of string tokens.
- *
- * @param str
- * a string
- * @param sep
- * a string containing the string separators
- * @return an array of string tokens
- */
- public static String[] split(String str, String sep) {
- return split(str, sep, -1);
- }
-
- /**
- * Replaces a substring within a string with another substring.
- * <p>
- * Note: Only the first occurrence of the substring will be replaced.
- *
- * @param str
- * a string
- * @param src
- * the substring to replace
- * @param tgt
- * the substring to use for the replacement
- * @return a string with the first substring replaced
- *
- * TODO: Review implementation. Call String.replaceFirst() instead?
- */
- public static String replace(String str, String src, String tgt) {
- if ((str == null || str.length() == 0)
- || (src == null || src.length() == 0)) {
- return str;
- }
-
- String tmpStr = str;
- int index;
- while ((index = tmpStr.indexOf(src)) != -1) {
- tmpStr = tmpStr.substring(0, index) + tgt
- + tmpStr.substring(index + src.length());
- }
- return tmpStr;
- }
-
- /**
- * Returns the integer value of a string.
- *
- * @param str
- * a string
- * @param defaultValue
- * a default integer value for the string
- * @return the integer value of the given string
- */
- public static int getIntValue(String str, int defaultValue) {
- if (StrUtil.isBlank(str)) {
- return defaultValue;
- }
-
- try {
- return Integer.parseInt(str);
- } catch (NumberFormatException e) {
- return defaultValue;
- }
- }
-
- /**
- * Returns an array of bytes representing the UTF-8 encoding of a string.
- *
- * @param str
- * a string
- * @return a byte array containing the UTF-8 encoding of the given string
- */
- public static byte[] getUTF8Bytes(String str) {
- char[] c = str.toCharArray();
- int len = c.length;
- int count = 0;
- for (int i = 0; i < len; i++) {
- int ch = c[i];
- if (ch <= 0x7f) {
- count++;
- } else if (ch <= 0x7ff) {
- count += 2;
- } else {
- count += 3;
- }
- }
-
- byte[] b = new byte[count];
- int off = 0;
- for (int i = 0; i < len; i++) {
- int ch = c[i];
- if (ch <= 0x7f) {
- b[off++] = (byte) ch;
- } else if (ch <= 0x7ff) {
- b[off++] = (byte) ((ch >> 6) | 0xc0);
- b[off++] = (byte) ((ch & 0x3f) | 0x80);
- } else {
- b[off++] = (byte) ((ch >> 12) | 0xe0);
- b[off++] = (byte) (((ch >> 6) & 0x3f) | 0x80);
- b[off++] = (byte) ((ch & 0x3f) | 0x80);
- }
- }
- return b;
- }
-
- /**
- * Returns the hexidecimal character representation for an integer.
- *
- * @param value
- * an integer
- * @return the hexidecimal representation
- */
- private static char toHex(int value) {
- return HEX_DIGITS[(value & 0xF)];
- }
-
- /**
- * Returns the escaped Unicode representation of a string.
- *
- * @param str
- * a string
- * @param skipASCII
- * if <code>true</code>, avoid escaping the ASCII characters
- * @return the escaped Unicode representation of the given string
- */
- public static String toEscapedUnicode(String str, boolean skipASCII) {
- int len = str.length();
- StringBuffer result = new StringBuffer(len * 2);
-
- for (int i = 0; i < len; i++) {
- char ch = str.charAt(i);
-
- if (skipASCII && ch < 0x007E) {
- result.append(ch);
- } else {
- result.append("\\u"); //$NON-NLS-1$
- result.append(toHex((ch >> 12) & 0xF));
- result.append(toHex((ch >> 8) & 0xF));
- result.append(toHex((ch >> 4) & 0xF));
- result.append(toHex(ch & 0xF));
- }
- }
-
- return result.toString();
- }
-
- /**
- * Returns the escaped HTML representation of a string.
- *
- * @param html
- * a HTML string
- * @return the escaped Unicode representation of the given HTML string
- */
- public static String getEscapedHTML(String html) {
- if (html == null || html.length() == 0) {
- return ""; //$NON-NLS-1$
- }
-
- StrUtilOptions options = getOptions();
- StringBuffer result = new StringBuffer();
- int length = html.length();
- for (int i = 0; i < length; i++) {
- char ch = html.charAt(i);
- switch (ch) {
- case '%':
- if (i + 4 < length) {
- String hexStr = html.substring(i + 1, i + 5);
- boolean validHextStr = true;
-
- for (int j = 0; j < hexStr.length(); j++) {
- char c = hexStr.charAt(j);
- if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'))) {
- validHextStr = false;
- break;
- }
- }
-
- if (options == null) {
- //code below will treat "%20de" as " de"
- //this may lose some double bytes character(e.g. Chinese), which start with %20, but keep all url links
- //so far open this convertion not only during library migration to support file like "my design.gif"
- if (/*during_migration && */validHextStr) {
- if (hexStr.startsWith("20")) { //$NON-NLS-1$
- result.append("%20"); //$NON-NLS-1$
- i += 2;
- break;
- }
- }
- } else {
- int ix = options.getRteUrlDecodingOption();
- if (ix == 1) {
- validHextStr = false;
- } else if (ix == 2) {
- String key = getHexStr("%" + hexStr);
- if (key != null && options.getRteUrlDecodingHexMap().containsKey(key)) {
- validHextStr = false;
- }
- }
- }
-
- if (validHextStr) {
- try {
- int codePoint = Integer.parseInt(hexStr, 16);
- char[] c = UCharacter.toChars(codePoint);
- result.append(c);
- i += 4;
- break;
- } catch (NumberFormatException e) {
- // wasn't a valid hex string..
- // fall through to the result.append(ch)
- } catch (Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- }
- }
- }
- result.append(ch);
- break;
- case '\u00a9':
- result.append(HTML_COPY);
- break;
- case '\u00ae':
- result.append(HTML_REG);
- break;
- case '\u20ac':
- result.append(HTML_EURO);
- break;
- case '\u2122':
- result.append(HTML_TRADEMARK);
- break;
- default:
- result.append(ch);
- break;
- }
- }
- return result.toString();
- }
-
- /**
- * Returns the plain text from HTML text.
- * <p>
- * Note: All HTML tags will be stripped.
- *
- * @param html
- * the HTML text.
- * @return the plain text representation of the given HTML text
- */
- public static String getPlainText(String html) {
- if (html == null) {
- return ""; //$NON-NLS-1$
- }
-
- final Pattern p_plaintext_filter = Pattern.compile(
- "<[^>]*?>", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
- final Pattern p_plaintext_filter2 = Pattern.compile(
- "&.{1,5}[^;];", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
- final Pattern p_plaintext_filter3 = Pattern.compile(
- "\\s+", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-
- String result = html.replaceAll(p_plaintext_filter.pattern(), " ") //$NON-NLS-1$
- .replaceAll(p_plaintext_filter2.pattern(), " ") //$NON-NLS-1$
- .replaceAll(p_plaintext_filter3.pattern(), " "); //$NON-NLS-1$
- return result;
- }
-
- /**
- * Converts a string into a valid file name.
- *
- * @param str
- * a string
- * @return a valid file name derived from the given string
- */
- public static String makeValidFileName(String str) {
- if (str == null) {
- return ""; //$NON-NLS-1$
- }
- return getPlainText(str)
- .replaceAll(REGEXP_INVALID_FILENAME_CHARS, " ").trim(); //$NON-NLS-1$
- }
-
- public static String removeSpecialCharacters(String str) {
- if (str == null) {
- return ""; //$NON-NLS-1$
- }
- return getPlainText(str)
- .replaceAll(REGEXP_ANY_SPECIAL_CHARS, " ").trim(); //$NON-NLS-1$
- }
-
- /**
- * Returns true if the path does not contain any invalid filename
- * characters.
- *
- * @param path
- * the file path
- * @return <code>true</code> if the given path contains only valid
- * filename characters
- */
- public static boolean isValidPublishPath(String path) {
- // return path.replaceAll(invalidPublishPathCharsRegExp,
- // "").equals(path);
-
- if (Platform.getOS().equals(Platform.WS_WIN32)) {
- return path
- .replaceAll(REGEXP_INVALID_PUBLISHED_PATH_CHARS, "").equals(path); //$NON-NLS-1$
- }
-
- // else default to Linux
- return path
- .replaceAll(REGEXP_INVALID_PUBLISHED_PATH_CHARS_LINUX, "").equals(path); //$NON-NLS-1$
- }
-
- /**
- * Returns the lower-case of str unless the current locale is German
- *
- * @param str
- * @return
- */
- public static String toLower(String str) {
- if (Platform.getNL().startsWith("de")) { //$NON-NLS-1$
- return str;
- }
- return str.toLowerCase();
- }
-
- /**
- * escape the " and '
- *
- * @param str
- * @return
- */
- public static String escape(String str) {
- return str.replaceAll("'", "\\\\\'").replaceAll("\"", "\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-
- /**
- * Converts a <code>List</code> to an String array.
- *
- * @param list
- * a <code>List</code>
- * @return a String array
- */
- public static String[] convertListToStrArray(List list) {
- if (list != null) {
- int cnt = list.size();
- String[] strArray = new String[cnt];
-
- for (int i = 0; i < cnt; i++) {
- String str = (String) list.get(i);
- strArray[i] = new String(str);
- }
- return strArray;
- } else {
- return null;
- }
- }
-
- public static boolean isValidName(String name) {
- return name.replaceAll(REGEXP_ANY_SPECIAL_CHARS, "").equals(name); //$NON-NLS-1$
- }
-
- /**
- * added some test code
- *
- * @param args
- */
- public static void main(String[] args) {
-
- String text = "A&% `&# $~!@#$%^&*()_-+={}[\"]:|\\:;\"'<,>.?/ \t\r\nZ"; //$NON-NLS-1$
-
- System.out.println("[" + text + "] <== text"); //$NON-NLS-1$ //$NON-NLS-2$
- System.out.println("[" + text.replaceAll(REGEXP_ANY_SPECIAL_CHARS, " ") //$NON-NLS-1$ //$NON-NLS-2$
- + "] <== All"); //$NON-NLS-1$
- System.out.println("[" //$NON-NLS-1$
- + text.replaceAll(REGEXP_INVALID_FILENAME_CHARS, " ") //$NON-NLS-1$
- + "] <== File Name"); //$NON-NLS-1$
- System.out.println("[" //$NON-NLS-1$
- + text.replaceAll(REGEXP_INVALID_PUBLISHED_PATH_CHARS, " ") //$NON-NLS-1$
- + "] <== path"); //$NON-NLS-1$
- System.out.println("[" //$NON-NLS-1$
- + text.replaceAll(REGEXP_INVALID_PUBLISHED_PATH_CHARS_LINUX,
- " ") + "] <== path, Linux"); //$NON-NLS-1$ //$NON-NLS-2$
-
- System.out.println(""); //$NON-NLS-1$
- }
-
- /**
- * Converts the platform line-separator (\n or \n\r or \r) to &lt;br/&gt;
- *
- * @param text
- * @return
- */
- public static String convertNewlinesToHTML(String text) {
- if (text != null) {
- text = text.replaceAll(LINE_FEED_REGEX, HTML_BREAK + LINE_FEED);
- text = text.replaceAll(ESCAPED_LINE_FEED_REGEX, HTML_BREAK
- + ESCAPED_LINE_FEED);
- }
- return text;
- }
-
- public static URI toURI(String pathStr) {
- if (pathStr != null && pathStr.length() > 0) {
- IPath path = Path.fromOSString(pathStr);
- try {
- return path.toFile().toURI();
- } catch (Exception e) {
- CommonPlugin.getDefault().getLogger().logError(e);
- }
- }
- return null;
- }
-
- public static String escapeChar(String text, char c) {
- int i=text.indexOf(c);
- if ( i < 0 ) {
- return text;
- }
-
- int start = 0;
- StringBuffer buffer = new StringBuffer();
- while ( i > start ) {
- buffer.append(text.substring(start, i)).append("\\"); //$NON-NLS-1$
- start = i;
- i=text.indexOf(c, start+1);
- }
-
- buffer.append(text.substring(start));
-
- return buffer.toString();
- }
-
- public static String getHexStr(String str) {
- if (str.length() < 3) {
- return null;
- }
- if (str.charAt(0) != '%') {
- return null;
- }
- StringBuffer b = new StringBuffer();
- b.append('%');
- for (int i = 1 ; i <= 2; i++) {
- char c = str.charAt(i);
- if (c >= 'a' && c <= 'z') {
- c -= 'a';
- c += 'A';
- }
- boolean valid = (c >= '0' && c <= '9') ||
- (c >= 'A' && c <= 'F');
- if (!valid) {
- return null;
- }
- b.append(c);
- }
-
- return b.toString();
- }
-
- public interface StrUtilOptions {
- int getRteUrlDecodingOption();
- Map<String, String> getRteUrlDecodingHexMap();
- }
-
- public static StrUtilOptions getOptions() {
- return options;
- }
-
- public static void setOptions(StrUtilOptions options) {
- StrUtil.options = options;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StringMatcher.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StringMatcher.java
deleted file mode 100644
index 4a0b4b443aa..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/StringMatcher.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.epf.common.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-/**
- * A string pattern matcher. Supports '*' and '?' wildcards.
- */
-public class StringMatcher {
- protected String fPattern;
- protected int fLength; // pattern length
- protected boolean fIgnoreWildCards;
- protected boolean fIgnoreCase;
- protected boolean fHasLeadingStar;
- protected boolean fHasTrailingStar;
- protected String fSegments[]; //the given pattern is split into * separated segments
-
- /* boundary value beyond which we don't need to search in the text */
- protected int fBound= 0;
-
-
- protected static final char fSingleWildCard= '\u0000';
-
- public static class Position {
- int start; //inclusive
- int end; //exclusive
- public Position(int start, int end) {
- this.start= start;
- this.end= end;
- }
- public int getStart() {
- return start;
- }
- public int getEnd() {
- return end;
- }
- }
- /**
- * StringMatcher constructor takes in a String object that is a simple
- * pattern. The pattern may contain '*' for 0 and many characters and
- * '?' for exactly one character.
- *
- * Literal '*' and '?' characters must be escaped in the pattern
- * e.g., "\*" means literal "*", etc.
- *
- * Escaping any other character (including the escape character itself),
- * just results in that character in the pattern.
- * e.g., "\a" means "a" and "\\" means "\"
- *
- * If invoking the StringMatcher with string literals in Java, don't forget
- * escape characters are represented by "\\".
- *
- * @param pattern the pattern to match text against
- * @param ignoreCase if true, case is ignored
- * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
- * (everything is taken literally).
- */
- public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards) {
- if (pattern == null)
- throw new IllegalArgumentException();
- fIgnoreCase= ignoreCase;
- fIgnoreWildCards= ignoreWildCards;
- fPattern= pattern;
- fLength= pattern.length();
-
- if (fIgnoreWildCards) {
- parseNoWildCards();
- } else {
- parseWildCards();
- }
- }
- /**
- * Find the first occurrence of the pattern between <code>start</code)(inclusive)
- * and <code>end</code>(exclusive).
- * @param text the String object to search in
- * @param start the starting index of the search range, inclusive
- * @param end the ending index of the search range, exclusive
- * @return an <code>StringMatcher.Position</code> object that keeps the starting
- * (inclusive) and ending positions (exclusive) of the first occurrence of the
- * pattern in the specified range of the text; return null if not found or subtext
- * is empty (start==end). A pair of zeros is returned if pattern is empty string
- * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
- * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
- */
- public StringMatcher.Position find(String text, int start, int end) {
- if (text == null)
- throw new IllegalArgumentException();
-
- int tlen= text.length();
- if (start < 0)
- start= 0;
- if (end > tlen)
- end= tlen;
- if (end < 0 ||start >= end )
- return null;
- if (fLength == 0)
- return new Position(start, start);
- if (fIgnoreWildCards) {
- int x= posIn(text, start, end);
- if (x < 0)
- return null;
- return new Position(x, x+fLength);
- }
-
- int segCount= fSegments.length;
- if (segCount == 0)//pattern contains only '*'(s)
- return new Position (start, end);
-
- int curPos= start;
- int matchStart= -1;
- int i;
- for (i= 0; i < segCount && curPos < end; ++i) {
- String current= fSegments[i];
- int nextMatch= regExpPosIn(text, curPos, end, current);
- if (nextMatch < 0 )
- return null;
- if(i == 0)
- matchStart= nextMatch;
- curPos= nextMatch + current.length();
- }
- if (i < segCount)
- return null;
- return new Position(matchStart, curPos);
- }
- /**
- * match the given <code>text</code> with the pattern
- * @return true if matched eitherwise false
- * @param text a String object
- */
- public boolean match(String text) {
- return match(text, 0, text.length());
- }
- /**
- * Given the starting (inclusive) and the ending (exclusive) positions in the
- * <code>text</code>, determine if the given substring matches with aPattern
- * @return true if the specified portion of the text matches the pattern
- * @param text a String object that contains the substring to match
- * @param start marks the starting position (inclusive) of the substring
- * @param end marks the ending index (exclusive) of the substring
- */
- public boolean match(String text, int start, int end) {
- if (null == text)
- throw new IllegalArgumentException();
-
- if (start > end)
- return false;
-
- if (fIgnoreWildCards)
- return (end - start == fLength) && fPattern.regionMatches(fIgnoreCase, 0, text, start, fLength);
- int segCount= fSegments.length;
- if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar)) // pattern contains only '*'(s)
- return true;
- if (start == end)
- return fLength == 0;
- if (fLength == 0)
- return start == end;
-
- int tlen= text.length();
- if (start < 0)
- start= 0;
- if (end > tlen)
- end= tlen;
-
- int tCurPos= start;
- int bound= end - fBound;
- if ( bound < 0)
- return false;
- int i=0;
- String current= fSegments[i];
- int segLength= current.length();
-
- /* process first segment */
- if (!fHasLeadingStar){
- if(!regExpRegionMatches(text, start, current, 0, segLength)) {
- return false;
- } else {
- ++i;
- tCurPos= tCurPos + segLength;
- }
- }
- if ((fSegments.length == 1) && (!fHasLeadingStar) && (!fHasTrailingStar)) {
- // only one segment to match, no wildcards specified
- return tCurPos == end;
- }
- /* process middle segments */
- while (i < segCount) {
- current= fSegments[i];
- int currentMatch;
- int k= current.indexOf(fSingleWildCard);
- if (k < 0) {
- currentMatch= textPosIn(text, tCurPos, end, current);
- if (currentMatch < 0)
- return false;
- } else {
- currentMatch= regExpPosIn(text, tCurPos, end, current);
- if (currentMatch < 0)
- return false;
- }
- tCurPos= currentMatch + current.length();
- i++;
- }
-
- /* process final segment */
- if (!fHasTrailingStar && tCurPos != end) {
- int clen= current.length();
- return regExpRegionMatches(text, end - clen, current, 0, clen);
- }
- return i == segCount ;
- }
-
- /**
- * This method parses the given pattern into segments seperated by wildcard '*' characters.
- * Since wildcards are not being used in this case, the pattern consists of a single segment.
- */
- private void parseNoWildCards() {
- fSegments= new String[1];
- fSegments[0]= fPattern;
- fBound= fLength;
- }
- /**
- * Parses the given pattern into segments seperated by wildcard '*' characters.
- */
- private void parseWildCards() {
- if(fPattern.startsWith("*"))//$NON-NLS-1$
- fHasLeadingStar= true;
- if(fPattern.endsWith("*")) {//$NON-NLS-1$
- /* make sure it's not an escaped wildcard */
- if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
- fHasTrailingStar= true;
- }
- }
-
- Vector<String> temp= new Vector<String>();
-
- int pos= 0;
- StringBuffer buf= new StringBuffer();
- while (pos < fLength) {
- char c= fPattern.charAt(pos++);
- switch (c) {
- case '\\':
- if (pos >= fLength) {
- buf.append(c);
- } else {
- char next= fPattern.charAt(pos++);
- /* if it's an escape sequence */
- if (next == '*' || next == '?' || next == '\\') {
- buf.append(next);
- } else {
- /* not an escape sequence, just insert literally */
- buf.append(c);
- buf.append(next);
- }
- }
- break;
- case '*':
- if (buf.length() > 0) {
- /* new segment */
- temp.addElement(buf.toString());
- fBound += buf.length();
- buf.setLength(0);
- }
- break;
- case '?':
- /* append special character representing single match wildcard */
- buf.append(fSingleWildCard);
- break;
- default:
- buf.append(c);
- }
- }
-
- /* add last buffer to segment list */
- if (buf.length() > 0) {
- temp.addElement(buf.toString());
- fBound += buf.length();
- }
-
- fSegments= new String[temp.size()];
- temp.copyInto(fSegments);
- }
- /**
- * @param text a string which contains no wildcard
- * @param start the starting index in the text for search, inclusive
- * @param end the stopping point of search, exclusive
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int posIn(String text, int start, int end) {//no wild card in pattern
- int max= end - fLength;
-
- if (!fIgnoreCase) {
- int i= text.indexOf(fPattern, start);
- if (i == -1 || i > max)
- return -1;
- return i;
- }
-
- for (int i= start; i <= max; ++i) {
- if (text.regionMatches(true, i, fPattern, 0, fLength))
- return i;
- }
-
- return -1;
- }
- /**
- * @param text a simple regular expression that may only contain '?'(s)
- * @param start the starting index in the text for search, inclusive
- * @param end the stopping point of search, exclusive
- * @param p a simple regular expression that may contains '?'
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int regExpPosIn(String text, int start, int end, String p) {
- int plen= p.length();
-
- int max= end - plen;
- for (int i= start; i <= max; ++i) {
- if (regExpRegionMatches(text, i, p, 0, plen))
- return i;
- }
- return -1;
- }
-
-
- protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
- while (plen-- > 0) {
- char tchar= text.charAt(tStart++);
- char pchar= p.charAt(pStart++);
-
- /* process wild cards */
- if (!fIgnoreWildCards) {
- /* skip single wild cards */
- if (pchar == fSingleWildCard) {
- continue;
- }
- }
- if (pchar == tchar)
- continue;
- if (fIgnoreCase) {
- if (Character.toUpperCase(tchar) == Character.toUpperCase(pchar))
- continue;
- // comparing after converting to upper case doesn't handle all cases;
- // also compare after converting to lower case
- if (Character.toLowerCase(tchar) == Character.toLowerCase(pchar))
- continue;
- }
- return false;
- }
- return true;
- }
- /**
- * @param text the string to match
- * @param start the starting index in the text for search, inclusive
- * @param end the stopping point of search, exclusive
- * @param p a string that has no wildcard
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int textPosIn(String text, int start, int end, String p) {
-
- int plen= p.length();
- int max= end - plen;
-
- if (!fIgnoreCase) {
- int i= text.indexOf(p, start);
- if (i == -1 || i > max)
- return -1;
- return i;
- }
-
- for (int i= start; i <= max; ++i) {
- if (text.regionMatches(true, i, p, 0, plen))
- return i;
- }
-
- return -1;
- }
-
- public static String[] convertFromString(String patterns, String separator) {
- StringTokenizer tokenizer= new StringTokenizer(patterns, separator, true);
- int tokenCount= tokenizer.countTokens();
- List<String> result= new ArrayList<String>(tokenCount);
- boolean escape= false;
- boolean append= false;
- while (tokenizer.hasMoreTokens()) {
- String token= tokenizer.nextToken().trim();
- if (separator.equals(token)) {
- if (!escape)
- escape= true;
- else {
- addPattern(result, separator);
- append= true;
- }
- } else {
- if (!append)
- result.add(token);
- else
- addPattern(result, token);
- append= false;
- escape= false;
- }
- }
- return (String[])result.toArray(new String[result.size()]);
- }
-
- private static void addPattern(List<String> list, String pattern) {
- if (list.isEmpty())
- list.add(pattern);
- else {
- int index= list.size() - 1;
- list.set(index, ((String)list.get(index)) + pattern);
- }
- }
-
- public static String convertToString(String[] patterns, String separator) {
- int length= patterns.length;
- StringBuffer strBuf= new StringBuffer();
- if (length > 0)
- strBuf.append(escapeSeparator(patterns[0], separator));
- else
- return ""; //$NON-NLS-1$
- int i= 1;
- while (i < length) {
- strBuf.append(separator);
- strBuf.append(" "); //$NON-NLS-1$
- strBuf.append(escapeSeparator(patterns[i++], separator));
- }
- return strBuf.toString();
- }
-
- private static String escapeSeparator(String pattern, String separator) {
- int length= pattern.length();
- StringBuffer buf= new StringBuffer(length);
- for (int i= 0; i < length; i++) {
- char ch= pattern.charAt(i);
- if (separator.equals(String.valueOf(ch)))
- buf.append(ch);
- buf.append(ch);
- }
- return buf.toString();
-
- }
-
- public static String[] convertFromString(String patterns) {
- return convertFromString(patterns, SEPARATOR);
- }
-
- private static final String SEPARATOR= ","; //$NON-NLS-1$
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ThreadUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ThreadUtil.java
deleted file mode 100644
index 4faf4ee29d7..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ThreadUtil.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-/**
- * Utility class for handling threads.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class ThreadUtil {
-
- /**
- * Private constructor to prevent this class from being instantiated. All
- * methods in this class should be static.
- */
- private ThreadUtil() {
- }
-
- /**
- * Puts the current thread to sleep for a given duration.
- *
- * @param time
- * The duration in milliseconds.
- */
- public static void pause(long time) {
- try {
- Thread.sleep(time);
- } catch (InterruptedException e) {
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/Timer.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/Timer.java
deleted file mode 100644
index c0dc6361254..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/Timer.java
+++ /dev/null
@@ -1,49 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-import com.ibm.icu.util.Calendar;
-
-/**
- * A simple timer for tracking time.
- *
- * @author Jinhua Xi
- * @since 1.0
- */
-public class Timer {
-
- private long initTime;
-
- private long startTime;
-
- private long endTime;
-
- public Timer() {
- start();
- initTime = startTime;
- }
-
- public void start() {
- startTime = Calendar.getInstance().getTimeInMillis();
- }
-
- public void stop() {
- endTime = Calendar.getInstance().getTimeInMillis();
- }
-
- public int getTime() {
- return (int) (endTime - startTime);
- }
-
- public int getTotalTime() {
- return (int) (endTime - initTime);
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/WarUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/WarUtil.java
deleted file mode 100644
index ccd8a0a2c20..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/WarUtil.java
+++ /dev/null
@@ -1,57 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.War;
-import org.apache.tools.ant.types.FileSet;
-
-
-public class WarUtil {
-
- /**
- * Creates a war file.
- *
- * @param outputWarFile
- * an absolute path to the target war file
- * @param webAppDirectory
- * an absolute path to a directory containing the files and sub
- * directories to be wared
- * @param monitor
- * a progress monitor
- * @throws IOException
- * if an error occurs while creating the zip file
- */
- public static void buildWarFile(String outputWarFile, String webAppDirectory,
- IProgressMonitor monitor) throws IOException {
-
- try {
- Project antProject = new Project();
- antProject.init();
- War warTask = new War();
- warTask.setProject(antProject);
- warTask.setDestFile(new File(outputWarFile));
- warTask.setWebxml(new File(webAppDirectory + File.separator + "WEB-INF" //$NON-NLS-1$
- + File.separator + "web.xml")); //$NON-NLS-1$
- FileSet webFiles = new FileSet();
- webFiles.setDir(new File(webAppDirectory));
- warTask.addFileset(webFiles);
- warTask.execute();
- } catch (Exception e) {
- throw new IOException(e.getMessage());
- }
- }
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/XMLUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/XMLUtil.java
deleted file mode 100644
index 100ed59ca33..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/XMLUtil.java
+++ /dev/null
@@ -1,666 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXParseException;
-
-/**
- * Utility class for processing XML documents.
- *
- * @author Kelvin Low
- * @author Jinhua Xi
- * @author Phong Nguyen Le
- * @since 1.0
- */
-public class XMLUtil {
-
- /**
- * XML declaration.
- */
- public final static String XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; //$NON-NLS-1$
-
- /**
- * XML Escape characters.
- */
- public final static String XML_AMP = "&amp;"; //$NON-NLS-1$
-
- public final static String XML_BACKSLASH = "&#92;"; //$NON-NLS-1$
-
- public final static String XML_APOS = "&apos;"; //$NON-NLS-1$
-
- public final static String XML_CR = "&#13;"; //$NON-NLS-1$
-
- public final static String XML_GT = "&gt;"; //$NON-NLS-1$
-
- public final static String XML_LT = "&lt;"; //$NON-NLS-1$
-
- public final static String XML_LF = "&#10;"; //$NON-NLS-1$
-
- public final static String XML_QUOT = "&quot;"; //$NON-NLS-1$
-
- public final static String XML_TAB = "&#9;"; //$NON-NLS-1$
-
- private static final String CRLF = "\r\n"; //$NON-NLS-1$
-
- private static final byte[] CRLF_BYTES = CRLF.getBytes();
-
- /**
- * Private constructor to prevent this class from being instantiated. All
- * methods in this class should be static.
- */
- private XMLUtil() {
- }
-
- /**
- * Clones the given DOM node into the given DOM document.
- *
- * @param node
- * The DOM node to clone.
- * @param doc
- * The target DOM document.
- * @return The cloned node in the target DOM document.
- */
- public static Node cloneNode(Node node, Document doc) {
- Node clone = null;
- switch (node.getNodeType()) {
- case Node.ELEMENT_NODE:
- clone = doc.createElement(node.getNodeName());
- NamedNodeMap attrs = node.getAttributes();
- for (int i = 0; i < attrs.getLength(); i++) {
- Node attrNode = attrs.item(i);
- Attr attrClone = doc.createAttribute(attrNode.getNodeName());
- attrClone.setNodeValue(attrNode.getNodeValue());
- ((Element) clone).setAttributeNode(attrClone);
- }
-
- // Iterate through each child nodes.
- NodeList childNodes = node.getChildNodes();
- if (childNodes != null) {
- for (int i = 0; i < childNodes.getLength(); i++) {
- Node childNode = childNodes.item(i);
- Node childClone = cloneNode(childNode, doc);
- clone.appendChild(childClone);
- }
- }
- break;
-
- case Node.TEXT_NODE:
- case Node.CDATA_SECTION_NODE:
- clone = doc.createTextNode(node.getNodeName());
- clone.setNodeValue(node.getNodeValue());
- break;
- }
- return clone;
- }
-
- /**
- * Escapes a XML attribute to make it XML parser friendly.
- *
- * @param str
- * The XML attribute string.
- * @return The escaped string.
- */
- public static String escapeAttr(String str) {
- if (str == null || str.length() == 0)
- return ""; //$NON-NLS-1$
- StringBuffer sb = new StringBuffer();
- int len = str.length();
- for (int i = 0; i < len; i++) {
- char ch = str.charAt(i);
- switch (ch) {
- case '<':
- sb.append(XML_LT);
- break;
- case '&':
- sb.append(XML_AMP);
- break;
- case '"':
- sb.append(XML_QUOT);
- break;
- default:
- sb.append(ch);
- break;
- }
- }
- return sb.toString();
- }
-
- /**
- * Escapes the given string to make it XML parser friendly.
- *
- * @param str
- * The source string.
- * @return The escaped string.
- */
- public static String escape(String str) {
- if (str == null || str.length() == 0)
- return ""; //$NON-NLS-1$
- StringBuffer sb = new StringBuffer();
- int len = str.length();
- for (int i = 0; i < len; i++) {
- char ch = str.charAt(i);
- switch (ch) {
- case '<':
- sb.append(XML_LT);
- break;
- case '>':
- sb.append(XML_GT);
- break;
- case '&':
- sb.append(XML_AMP);
- break;
- case '"':
- sb.append(XML_QUOT);
- break;
- case '\'':
- sb.append(XML_APOS);
- break;
- case '\r':
- sb.append(XML_CR);
- break;
- case '\n':
- sb.append(XML_LF);
- break;
- case '\\':
- sb.append(XML_BACKSLASH);
- break;
- default:
- sb.append(ch);
- break;
- }
- }
- return sb.toString();
- }
-
- /**
- * Escapes the given string to make it XML parser friendly.
- *
- * @param str
- * The source string.
- * @param ignoreCRLF
- * If true, do not escape the CR and LF characters.
- * @return The escaped string.
- */
- public static String escape(String str, boolean ignoreCRLF) {
- if (str == null || str.length() == 0)
- return ""; //$NON-NLS-1$
- StringBuffer sb = new StringBuffer();
- int len = str.length();
- for (int i = 0; i < len; i++) {
- char ch = str.charAt(i);
- switch (ch) {
- case '<':
- sb.append(XML_LT);
- break;
- case '>':
- sb.append(XML_GT);
- break;
- case '&':
- // This is to avoid the double escaping (see Bugzilla 179921)
- if (!str.startsWith(XML_LT+"p/", i) && !str.startsWith(XML_APOS, i) //$NON-NLS-1$
- && !str.startsWith(XML_AMP, i))
- sb.append(XML_AMP);
- else
- sb.append(ch);
- break;
- case '"':
- sb.append(XML_QUOT);
- break;
- case '\'':
- sb.append(XML_APOS);
- break;
- case '\r':
- if (ignoreCRLF)
- sb.append(ch);
- else
- sb.append(XML_CR);
- break;
- case '\n':
- if (ignoreCRLF)
- sb.append(ch);
- else
- sb.append(XML_LF);
- break;
- default:
- sb.append(ch);
- break;
- }
- }
- return sb.toString();
- }
-
- /**
- * Unescapes the given XML string.
- *
- * @param str
- * The source string.
- * @return The escaped string.
- */
- public static String unescape(String str) {
- if (str == null || str.length() == 0)
- return ""; //$NON-NLS-1$
- StringBuffer sb = new StringBuffer();
- int len = str.length();
- for (int i = 0; i < len; i++) {
- char ch = str.charAt(i);
- switch (ch) {
- case '&':
- if (str.startsWith(XML_LT, i)) {
- sb.append('<');
- i += 3;
- } else if (str.startsWith(XML_GT, i)) {
- sb.append('>');
- i += 3;
- } else if (str.startsWith(XML_AMP, i)) {
- sb.append('&');
- i += 4;
- } else if (str.startsWith(XML_QUOT, i)) {
- sb.append('"');
- i += 5;
- } else if (str.startsWith(XML_APOS, i)) {
- sb.append("\'"); //$NON-NLS-1$
- i += 5;
- } else if (str.startsWith(XML_CR, i)) {
- sb.append('\r');
- i += 4;
- } else if (str.startsWith(XML_LF, i)) {
- sb.append('\n');
- i += 4;
- } else {
- sb.append(ch);
- }
- break;
- default:
- sb.append(ch);
- break;
- }
- }
- return sb.toString();
- }
-
- /**
- * Writes the content of the given DOM document to the output stream.
- *
- * @param xmlDoc
- * The DOM document.
- * @param output
- * The output stream.
- * @throws IOException
- * if an I/O error occur while accessing the output stream.
- */
- public static void writeDocument(Document xmlDoc, OutputStream output)
- throws IOException {
- DataOutputStream out = new DataOutputStream(output);
- writeNode(xmlDoc, "", out); //$NON-NLS-1$
- out.flush();
- }
-
- /**
- * Writes the content of the given DOM document to the PrintWriter.
- *
- * @param xmlDoc
- * The DOM document.
- * @param pw
- * The PrintWriter object.
- * @throws IOException
- * if an I/O error occur while accessing the output stream.
- */
- public static void writeDocument(Document xmlDoc, PrintWriter pw)
- throws IOException {
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- DataOutputStream out = new DataOutputStream(os);
- writeNode(xmlDoc, "", out); //$NON-NLS-1$
- out.flush();
- // FIXME! Need to specify encoding?
- String s = os.toString();
- pw.write(s);
- pw.flush();
- }
-
- /**
- * Saves the content of the given DOM document to file.
- *
- * @param xmlDoc
- * The DOM document.
- * @param xmlFile
- * The XML file.
- * @throws IOException
- * if an I/O error occur while accessing the output stream.
- */
- public static void saveDocument(Document xmlDoc, String xmlFile)
- throws IOException {
- DataOutputStream out = new DataOutputStream(new FileOutputStream(
- xmlFile));
- writeNode(xmlDoc, "", out); //$NON-NLS-1$
- out.flush();
- out.close();
- }
-
- /**
- * Saves the given XML string to the given file.
- *
- * @param xmlStr
- * The XML string.
- * @param xmlFile
- * The XML file.
- * @throws IOException
- * if an I/O error occur while accessing the output stream.
- */
- public static void saveDocument(String xmlStr, String xmlFile)
- throws IOException {
- DataOutputStream out = new DataOutputStream(new FileOutputStream(
- xmlFile));
- out.write(xmlStr.getBytes());
- out.flush();
- out.close();
- }
-
- /**
- * Writes the given DOM tree node to the given output stream.
- *
- * @param node
- * The DOM node.
- * @param indent
- * The string indentation (containing space characters).
- * @param out
- * The output stream.
- * @throws IOException
- * if an I/O error occur while accessing the output stream.
- */
- private static void writeNode(Node node, String indent, DataOutputStream out)
- throws IOException {
- String text;
-
- switch (node.getNodeType()) {
- case Node.DOCUMENT_NODE:
- // Write the XML file signature.
- out.write(StrUtil.getUTF8Bytes(XML_DECLARATION));
- out.write(CRLF_BYTES);
-
- // Iterate through each child nodes.
- NodeList nodes = node.getChildNodes();
- if (nodes != null) {
- for (int i = 0; i < nodes.getLength(); i++) {
- writeNode(nodes.item(i), "", out); //$NON-NLS-1$
- }
- }
- break;
-
- case Node.ELEMENT_NODE:
- String name = node.getNodeName();
- out.write(StrUtil.getUTF8Bytes(indent + "<" + name)); //$NON-NLS-1$
- NamedNodeMap attrs = node.getAttributes();
- for (int i = 0; i < attrs.getLength(); i++) {
- Node attrNode = attrs.item(i);
- out.write(StrUtil.getUTF8Bytes(" " + attrNode.getNodeName() //$NON-NLS-1$
- + "=\"" + escape(attrNode.getNodeValue()) + "\"")); //$NON-NLS-1$ //$NON-NLS-2$
- }
- out.write(StrUtil.getUTF8Bytes(">")); //$NON-NLS-1$
- out.write(CRLF_BYTES);
-
- // Iterate through each child nodes.
- NodeList childNodes = node.getChildNodes();
- if (childNodes != null) {
- for (int i = 0; i < childNodes.getLength(); i++) {
- writeNode(childNodes.item(i), indent, out);
- }
- }
- out.write(StrUtil.getUTF8Bytes(indent + "</" + name + ">")); //$NON-NLS-1$ //$NON-NLS-2$
- out.write(CRLF_BYTES);
-
- break;
-
- case Node.TEXT_NODE:
- text = StrUtil.removeWhiteSpaceChars(node.getNodeValue());
- if (text.length() > 0) {
- out.write(StrUtil.getUTF8Bytes(escape(text)));
- }
- break;
-
- case Node.CDATA_SECTION_NODE:
- text = StrUtil.removeWhiteSpaceChars(node.getNodeValue());
- if (text.length() > 0) {
- out.write(StrUtil.getUTF8Bytes("<![CDATA[")); //$NON-NLS-1$
- out.write(StrUtil.getUTF8Bytes(text));
- out.write(StrUtil.getUTF8Bytes("]]>")); //$NON-NLS-1$
- out.write(CRLF_BYTES);
- }
- break;
-
- case Node.PROCESSING_INSTRUCTION_NODE:
- out.write(StrUtil.getUTF8Bytes("<?" + node.getNodeName() //$NON-NLS-1$
- + " " + node.getNodeValue() + "?>")); //$NON-NLS-1$ //$NON-NLS-2$
- out.write(CRLF_BYTES);
- break;
-
- case Node.ENTITY_REFERENCE_NODE:
- out.write(StrUtil.getUTF8Bytes("&" + node.getNodeName() + ";")); //$NON-NLS-1$ //$NON-NLS-2$
- break;
- }
- }
-
- /**
- * Returns the file location where the given SAX exception occurred.
- *
- * @param e
- * The SAX parse exception.
- * @return A string containing the file location where the exception
- * occurred.
- */
- public static String getLocationOfException(SAXParseException e) {
- StringBuffer sb = new StringBuffer();
- sb.append("row "); //$NON-NLS-1$
- sb.append(e.getLineNumber());
- sb.append(", col "); //$NON-NLS-1$
- sb.append(e.getColumnNumber());
-
- String systemId = e.getSystemId();
- if (systemId != null) {
- int index = systemId.lastIndexOf('/');
- if (index != -1) {
- systemId = systemId.substring(index + 1);
- }
- sb.append(" of XML document "); //$NON-NLS-1$
- sb.append(systemId);
- }
-
- return sb.toString();
- }
-
- public static Document loadXml(File file) throws Exception {
- DocumentBuilderFactory builderFactory = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder builder = builderFactory.newDocumentBuilder();
-
- return builder.parse(file);
- }
-
- public static Document createDocument() throws Exception {
- DocumentBuilderFactory builderFactory = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder builder = builderFactory.newDocumentBuilder();
- return builder.newDocument();
- }
-
- /**
- * text of a leaf node, without child element
- *
- * @param tag
- * @return String
- */
- public static String getNodeText(Element tag) {
- String text = tag.toString();
- int i = text.indexOf(">"); //$NON-NLS-1$
- int j = text.lastIndexOf("</"); //$NON-NLS-1$
- if (i < 0 || j < 0 || j < i) {
- return ""; //$NON-NLS-1$
- }
-
- return text.substring(i + 1, j);
- }
-
- public static String getChildText(Element tag, String childTagName) {
- Element child = getFirstChild(tag, childTagName);
- if (child != null) {
- return getNodeText(child);
- }
-
- return ""; //$NON-NLS-1$
- }
-
- public static Element getFirstChild(Element tag, String childTagName) {
- NodeList nodes = tag.getElementsByTagName(childTagName);
- if (nodes == null || nodes.getLength() == 0) {
- return null;
- }
-
- return (Element) nodes.item(0);
- }
-
- /**
- * iterator of all the children of the element
- *
- * @param tag
- * @return Iterator
- */
- public static Iterator childIterator(Element tag) {
- NodeList nodes = tag.getChildNodes();
-
- // NodeList contains no Element nodes such as text nodes, ignore those
- List<Node> elements = new ArrayList<Node>();
- if (nodes != null) {
- int size = nodes.getLength();
- for (int i = 0; i < size; i++) {
- Node node = nodes.item(i);
- if (node instanceof Element) {
- elements.add(node);
- }
- }
- }
-
- return elements.iterator();
- }
-
- private static class NodeIterator implements Iterator {
- int currentIndex = -1;
-
- int size = 0;
-
- NodeList nodes = null;
-
- public NodeIterator(NodeList nodes) {
- this.nodes = nodes;
- if (nodes != null)
- size = nodes.getLength();
- }
-
- public void remove() {
- // Do nothing, this is a readonly iterator.
- }
-
- public boolean hasNext() {
- return currentIndex + 1 < size;
- }
-
- public Object next() {
- if (hasNext()) {
- return nodes.item(++currentIndex);
- }
-
- return null;
- }
- }
-
- /**
- * iterator of all the children of the element
- *
- * @param tag
- * @return Iterator
- */
- public static Iterator childIterator(Element tag, String childTagName) {
- NodeList nodes = tag.getElementsByTagName(childTagName);
- return new NodeIterator(nodes);
- }
-
- /**
- * Gets the list of immediate child elements with the given tag name.
- *
- * @param element
- * @param tagName
- * @return list of {@link Element} objects
- */
- public static List<Element> getChildElementsByTagName(Element element, String tagName) {
- List<Element> elements = new ArrayList<Element>();
- NodeList list = element.getChildNodes();
- int size = list.getLength();
- if(size > 0) {
- for (int i = 0; i < size; i++) {
- Node node = list.item(i);
- if(node instanceof Element) {
- Element e = (Element) node;
- if(e.getTagName().equals(tagName)) {
- elements.add(e);
- }
- }
- }
- }
- return elements;
- }
-
- /**
- * Gets the first element with the given tag name in the immediate child elements.
- *
- * @param element
- * @param tagName
- * @return
- */
- public static Element getFirstChildElementByTagName(Node element, String tagName) {
- NodeList list = element.getChildNodes();
- int size = list.getLength();
- if(size > 0) {
- for (int i = 0; i < size; i++) {
- Node node = list.item(i);
- if(node instanceof Element) {
- Element e = (Element) node;
- if(e.getTagName().equals(tagName)) {
- return e;
- }
- }
- }
- }
- return null;
- }
-
- public static String removeBOM(String xml) {
- return xml.trim().replaceFirst("^([\\W]+)<", "<"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ZipUtil.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ZipUtil.java
deleted file mode 100644
index 5396843191e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/ZipUtil.java
+++ /dev/null
@@ -1,106 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * Utility class for reading and writing zip files.
- *
- * @author Kelvin Low
- * @since 1.2
- */
-public class ZipUtil {
-
- /**
- * Creates a zip file.
- *
- * @param zipFilePath
- * an absolute path to the target zip file
- * @param contentPath
- * an absolute path to a directory containing the files and sub
- * directories to be zipped
- * @param monitor
- * a progress monitor
- * @throws IOException
- * if an error occurs while creating the zip file
- */
- public static void createZipFile(String zipFilePath, String contentPath,
- IProgressMonitor monitor) throws IOException {
- ZipOutputStream out = null;
- try {
- out = new ZipOutputStream(new FileOutputStream(
- zipFilePath));
- File contentDir = new File(contentPath);
- populateZipFile(out, contentDir.getAbsolutePath(), contentDir,
- monitor);
- } catch (IOException e) {
- throw e;
- } catch (Exception e) {
- throw new IOException(e.getMessage());
- }
- finally {
- if (out != null) {
- try {
- out.close();
- }
- catch (Exception e) {
- }
- }
- }
- }
-
- /**
- * Populates a zip file with directories and files.
- *
- * @param out
- * a zip file output stream
- * @param rootPath
- * a root path that is used to compute the relative paths of the
- * zip content
- * @param file
- * a file or directory
- * @param monitor
- * a progress monitor
- */
- public static void populateZipFile(ZipOutputStream out, String rootPath,
- File file, IProgressMonitor monitor) throws IOException {
- File[] files = file.listFiles();
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- if (files[i].isDirectory()) {
- populateZipFile(out, rootPath, files[i], monitor);
- } else {
- String filePath = files[i].getAbsolutePath();
- FileInputStream in = new FileInputStream(filePath);
- String relativePath = filePath
- .substring(rootPath.length() + 1);
- out.putNextEntry(new ZipEntry(relativePath));
- byte[] buffer = new byte[1024];
- int len;
- while ((len = in.read(buffer)) > 0) {
- out.write(buffer, 0, len);
- }
- out.closeEntry();
- in.close();
- }
- }
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/package.html b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/package.html
deleted file mode 100644
index 164d717abc6..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/utils/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides common clipboard, file, I18N, image, networking, string manipulation and threading services.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/AbstractSAXParser.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/AbstractSAXParser.java
deleted file mode 100644
index 13218b004d5..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/AbstractSAXParser.java
+++ /dev/null
@@ -1,216 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.xml;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.common.utils.NetUtil;
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.common.utils.XMLUtil;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * An abstract SAX parser that can be used to parse a single XML file or a
- * directory of XML files.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public abstract class AbstractSAXParser extends DefaultHandler {
-
- /**
- * The logger used for logging warnings, errors and exceptions.
- */
- protected Logger logger;
-
- /**
- * The name of the current XML file being parsed.
- */
- protected String xmlFile;
-
- /**
- * The String buffer for accumulating text.
- */
- protected StringBuffer strBuf;
-
- /**
- * The XML validating flag.
- */
- private boolean validating;
-
- /**
- * Creates a new <code>AbstractSaxParser</code> given the validating flag.
- *
- * @param logger
- * The logger for logging warnings and errors.
- * @param validating
- * If true, validate the XML document.
- */
- public AbstractSAXParser(Logger logger, boolean validating) {
- this.logger = logger;
- this.validating = validating;
- }
-
- /**
- * Parses the given XML directory or file.
- *
- * @param xmlPath
- * The XML directory or file.
- */
- public void parse(String xmlPath) {
- String pathName = StrUtil.replace(xmlPath, "%20", " "); //$NON-NLS-1$ //$NON-NLS-2$
- File path = new File(pathName);
- File[] files = path.isFile() ? new File[] { path } : path.listFiles();
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- if (!files[i].isDirectory()) {
- try {
- parseFile(files[i].getAbsoluteFile());
- } catch (Exception e) {
- if (logger != null) {
- logger
- .logError(
- "Failed to parse \"" + files[i].getAbsolutePath() + '"', e); //$NON-NLS-1$
- }
- }
- }
- }
- }
- }
-
- /**
- * Parses the given XML file.
- *
- * @param xmlFile
- * The XML file.
- */
- protected void parseFile(File xmlFile) throws ParserConfigurationException,
- IOException, SAXException {
- // Create the SAX parser factory.
- SAXParserFactory spf = SAXParserFactory.newInstance();
-
- // Set the XML validating flag.
- spf.setValidating(validating);
-
- // Create the SAX parser.
- SAXParser saxParser = spf.newSAXParser();
-
- // Get the SAX XML reader.
- XMLReader xmlReader = saxParser.getXMLReader();
-
- // Set the SAX parser handlers to this class.
- xmlReader.setContentHandler(this);
- xmlReader.setErrorHandler(this);
-
- // Instruct the SAX parser to parse the given XML file.
- this.xmlFile = xmlFile.getAbsolutePath();
- xmlReader.parse(NetUtil.getUri(xmlFile));
- }
-
- /**
- * Called when the XML parser starts to parse the document.
- */
- public void startDocument() {
- strBuf = new StringBuffer();
- }
-
- /**
- * Called when the the XML parser encounters the chararacter data within a
- * text element.
- */
- public void characters(char[] buffer, int start, int length) {
- strBuf.append(buffer, start, length);
- }
-
- /**
- * Called when the parser starts to parse each new element.
- */
- public abstract void startElement(String namespaceURL, String localName,
- String qname, Attributes attributes);
-
- /**
- * Called when the XML parser reaches the end of the an element.
- */
- public abstract void endElement(String namespaceURL, String localName,
- String qname);
-
- /**
- * Called when the XML parser reaches the end of the document.
- */
- public void endDocument() {
- }
-
- /**
- * Logs the SAX parsing warning.
- *
- * @param e
- * The SAX parse exception.
- */
- public void warning(SAXParseException e) {
- if (logger != null) {
- logger
- .logWarning("SAX parsing warning encountered at " //$NON-NLS-1$
- + XMLUtil.getLocationOfException(e)
- + ": " + e.getMessage()); //$NON-NLS-1$
- }
- }
-
- /**
- * Logs the SAX parsing error.
- *
- * @param e
- * The SAX parse exception.
- */
- public void error(SAXParseException e) {
- if (logger != null) {
- logger
- .logError("SAX parsing error encountered at " //$NON-NLS-1$
- + XMLUtil.getLocationOfException(e)
- + ": " + e.getMessage()); //$NON-NLS-1$
- }
- }
-
- /**
- * Logs the SAX non-recoverable error and exits.
- *
- * @param e
- * The SAX parse exception.
- */
- public void fatalError(SAXParseException e) throws SAXException {
- if (logger != null) {
- logger
- .logError("SAX parsing fatal error encountered at " //$NON-NLS-1$
- + XMLUtil.getLocationOfException(e)
- + ": " + e.getMessage()); //$NON-NLS-1$
- logger.logError(e);
- }
- }
-
- /**
- * Returns the current XML file that is being parsed.
- *
- * @return The name of the XML file.
- */
- public String getXMLFile() {
- return xmlFile;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/XSLTProcessor.java b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/XSLTProcessor.java
deleted file mode 100644
index a595850fbec..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/XSLTProcessor.java
+++ /dev/null
@@ -1,449 +0,0 @@
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.common.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.epf.common.CommonPlugin;
-
-/**
- * A wrapper over the XSLT processor bundled with the JRE.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class XSLTProcessor {
-
- // If true, cache the compiled the XSL transformer with the compiled XSL
- // templates.
- private static boolean cacheXSL;
-
- // Caches the XSL transformers.
- private static Map<String, CachedTransformer> transformerCache;
-
- static {
- String cacheXSLProperty = CommonPlugin.getDefault().getString(
- "cacheXSL"); //$NON-NLS-1$
- if (cacheXSLProperty != null && !cacheXSLProperty.startsWith("[")) { //$NON-NLS-1$
- cacheXSL = Boolean.getBoolean(cacheXSLProperty);
- } else {
- cacheXSL = true;
- }
- if (cacheXSL) {
- transformerCache = new HashMap<String, CachedTransformer>();
- }
-
- // Increase the entity expansion line limit to handle a larger number of
- // XML entities.
- System.setProperty("entityExpansionLimit", "1000000"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Default private constructor to prevent this class from being
- * instantiated.
- */
- private XSLTProcessor() {
- }
-
- /**
- * Executes the XSL transformation given the XSL source, XML source, target
- * output and encoding.
- *
- * @param xslSource
- * The XSL source.
- * @param xmlSource
- * The XML source.
- * @param output
- * The output target.
- * @param params
- * The parameters for the XSL transformation.
- * @param encoding
- * The target encoding.
- */
- public static void transform(Source xslSource, Source xmlSource,
- Writer output, Properties params, String encoding) throws Exception {
- if (xslSource != null && xmlSource != null) {
- Transformer transformer = null;
- String xslFile = xslSource.getSystemId();
- if (cacheXSL && xslFile != null) {
- CachedTransformer cachedTransformer = null;
- synchronized (transformerCache) {
- cachedTransformer = transformerCache.get(xslFile);
- if (cachedTransformer == null) {
- TransformerFactory factory = TransformerFactory
- .newInstance();
- transformer = factory.newTransformer(xslSource);
- transformerCache.put(xslFile, new CachedTransformer(
- transformer, params));
- } else {
- cachedTransformer.setParams(params);
- transformer = cachedTransformer.getTransformer();
- }
- }
- } else {
- TransformerFactory factory = TransformerFactory.newInstance();
- transformer = factory.newTransformer(xslSource);
-
- if (params != null && params.size() > 0) {
- for (Iterator<Object> i = params.keySet().iterator(); i
- .hasNext();) {
- String paramName = (String) i.next();
- String paramValue = params.getProperty(paramName);
- transformer.setParameter(paramName, paramValue);
- }
- }
- }
-
- if (encoding != null && encoding.length() > 0) {
- transformer.setOutputProperty("encoding", encoding); //$NON-NLS-1$
- } else {
- transformer.setOutputProperty("encoding", "utf-8"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- transformer.transform(xmlSource, new StreamResult(output));
- }
- }
-
- /**
- * Executes the XSL transformation given the XSL source, XML source, target
- * output and encoding.
- *
- * @param xslSource
- * The XSL source.
- * @param xmlSource
- * The XML source.
- * @param output
- * The output target.
- * @param encoding
- * The target encoding.
- */
- public static void transform(Source xslSource, Source xmlSource,
- Writer output, String encoding) throws Exception {
- transform(xslSource, xmlSource, output, null, encoding);
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML source,
- * target output and encoding.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML source.
- * @param output
- * The output target.
- * @param params
- * The parameters for the XSL transformation.
- * @param encoding
- * The target encoding.
- */
- public static void transform(String xslUri, Source xmlSource,
- Writer output, Properties params, String encoding) throws Exception {
- InputStream xslInput = getXslInputStream(xslUri);
- if (xslInput != null) {
- StreamSource xslSource = new StreamSource(xslInput);
- xslSource.setSystemId(new File(xslUri));
- transform(xslSource, xmlSource, output, params, encoding);
- try {
- xslInput.close();
- } catch (Exception e) {
- }
- }
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML source,
- * target output and encoding.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML source.
- * @param output
- * The output target.
- * @param encoding
- * The target encoding.
- */
- public static void transform(String xslUri, Source xmlSource,
- Writer output, String encoding) throws Exception {
- transform(xslUri, xmlSource, output, null, encoding);
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML string,
- * target output and encoding.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML string.
- * @param output
- * The output target.
- * @param params
- * The parameters for the XSL transformation.
- * @param encoding
- * The target encoding.
- */
- public static void transform(String xslUri, String xmlStr, Writer output,
- Properties params, String encoding) throws Exception {
- InputStream xslInput = getXslInputStream(xslUri);
- if (xslInput != null) {
- StreamSource xslSource = new StreamSource(xslInput);
- xslSource.setSystemId(new File(xslUri));
-
- byte[] xml = xmlStr.getBytes("utf-8"); //$NON-NLS-1$
- ByteArrayInputStream xmlInput = new ByteArrayInputStream(xml);
- StreamSource xmlSource = new StreamSource(xmlInput);
-
- transform(xslSource, xmlSource, output, params, encoding);
-
- try {
- xslInput.close();
- xmlInput.close();
- } catch (Exception e) {
- }
- }
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML string,
- * target output and encoding.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML string.
- * @param output
- * The output target.
- * @param encoding
- * The target encoding.
- */
- public static void transform(String xslUri, String xmlStr, Writer output,
- String encoding) throws Exception {
- transform(xslUri, xmlStr, output, null, encoding);
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML string,
- * target output and encoding.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML string.
- * @param file
- * The output file.
- * @param params
- * The parameters for the XSL transformation.
- * @param encoding
- * The target encoding.
- */
- public static void transform(String xslUri, String xmlStr, File file,
- Properties params, String encoding) throws Exception {
- FileWriter output = new FileWriter(file);
- if (output != null) {
- transform(xslUri, xmlStr, output, params, encoding);
- try {
- output.close();
- } catch (Exception e) {
- }
- }
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML string,
- * target output and encoding.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML string.
- * @param file
- * The output file.
- * @param encoding
- * The target encoding.
- */
- public static void transform(String xslUri, String xmlStr, File file,
- String encoding) throws Exception {
- transform(xslUri, xmlStr, file, null, encoding);
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML source
- * and target output.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML source.
- * @param params
- * The parameters for the XSL transformation.
- * @param output
- * The output target.
- */
- public static void transform(String xslUri, Source xmlSource,
- Properties params, Writer output) throws Exception {
- transform(xslUri, xmlSource, output, params, null);
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML source
- * and target output.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML source.
- * @param output
- * The output target.
- */
- public static void transform(String xslUri, Source xmlSource, Writer output)
- throws Exception {
- transform(xslUri, xmlSource, output, null, null);
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML string
- * and target output.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML string.
- * @param params
- * The parameters for the XSL transformation.
- * @param output
- * The output target.
- */
- public static void transform(String xslUri, String xmlStr,
- Properties params, Writer output) throws Exception {
- transform(xslUri, xmlStr, output, params, null);
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML string
- * and target output.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML string.
- * @param output
- * The output target.
- */
- public static void transform(String xslUri, String xmlStr, Writer output)
- throws Exception {
- transform(xslUri, xmlStr, output, null, null);
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML string
- * and target output file.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML string.
- * @param params
- * The parameters for the XSL transformation.
- * @param output
- * The output target.
- */
- public static void transform(String xslUri, String xmlStr,
- Properties params, File file) throws Exception {
- transform(xslUri, xmlStr, file, params, null);
- }
-
- /**
- * Executes the XSL transformation given the XSL stylesheet URI, XML string
- * and target output file.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- * @param xmlStr
- * The XML string.
- * @param output
- * The output target.
- */
- public static void transform(String xslUri, String xmlStr, File file)
- throws Exception {
- transform(xslUri, xmlStr, file, null, null);
- }
-
- /**
- * Returns the XSL input stream given the XSL stylesheet URI.
- *
- * @param xslURI
- * The XSL stylesheet URI.
- */
- private static InputStream getXslInputStream(String xslUri) {
- InputStream xslInput = null;
- try {
- xslInput = new FileInputStream(xslUri);
- } catch (Exception e) {
- if (xslInput == null) {
- xslInput = XSLTProcessor.class.getClassLoader()
- .getResourceAsStream(xslUri);
- }
- }
- return xslInput;
- }
-
-}
-
-/**
- * A cached XSL Transformer object.
- */
-class CachedTransformer {
-
- private Transformer transformer;
- private Properties params;
-
- public CachedTransformer(Transformer transformer, Properties params) {
- this.transformer = transformer;
- setParams(params);
- }
-
- public Transformer getTransformer() {
- return transformer;
- }
-
- public Properties getParams() {
- return params;
- }
-
- public void setParams(Properties params) {
- if (params != this.params) {
- transformer.clearParameters();
- for (Iterator<Object> i = params.keySet().iterator(); i.hasNext();) {
- String paramName = (String) i.next();
- String paramValue = params.getProperty(paramName);
- transformer.setParameter(paramName, paramValue);
- }
- this.params = params;
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/package.html b/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/package.html
deleted file mode 100644
index 6e3c33ecf8e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.common/src/org/eclipse/epf/common/xml/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides XML and XSLT processing services.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/.project b/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/.project
deleted file mode 100644
index ec6c14be74a..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.epf.richtext.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/build.properties b/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/build.properties
deleted file mode 100644
index 77afc5688a0..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- license.html,\
- epl-v10.html
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/epl-v10.html b/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/epl-v10.html
deleted file mode 100644
index cb1073a4bad..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- }
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- }
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
-
- }
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/feature.properties b/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/feature.properties
deleted file mode 100644
index 6d29802becd..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/feature.properties
+++ /dev/null
@@ -1,141 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-# "featureName" property - name of the feature
-featureName=EPF Richtext
-
-# "providerName" property - name of the company that provides the feature
-providerName=EPF Project
-
-# "description" property - description of the feature
-description=
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/feature.xml b/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/feature.xml
deleted file mode 100644
index 7431296412a..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/feature.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.epf.richtext.feature"
- label="%featureName"
- version="1.6.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2009 IBM Corporation and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import plugin="com.ibm.icu"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.apache.ant"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.osgi"/>
- <import plugin="org.eclipse.swt"/>
- <import plugin="org.eclipse.ui.forms"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- </requires>
-
- <plugin
- id="org.eclipse.epf.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epf.common.html"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epf.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epf.common.win32.win32.x86"
- os="win32"
- arch="x86"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epf.common.win32.win32.x86_64"
- os="win32"
- arch="x86_64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.epf.richtext"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/license.html b/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/license.html
deleted file mode 100644
index a9b560f44cd..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
- modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/.classpath b/extraplugins/epf-richtext/org.eclipse.epf.richtext/.classpath
deleted file mode 100644
index 04683904632..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/.project b/extraplugins/epf-richtext/org.eclipse.epf.richtext/.project
deleted file mode 100644
index 92c4c271e3e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.epf.richtext</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/META-INF/MANIFEST.MF b/extraplugins/epf-richtext/org.eclipse.epf.richtext/META-INF/MANIFEST.MF
deleted file mode 100644
index 03a85b447db..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.epf.richtext;singleton:=true
-Bundle-Version: 1.6.0.qualifier
-Bundle-ClassPath: richtext.jar
-Bundle-Activator: org.eclipse.epf.richtext.RichTextPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
- org.eclipse.ui;visibility:=reexport,
- org.eclipse.ui.forms;visibility:=reexport,
- org.eclipse.jface.text;visibility:=reexport,
- org.eclipse.ui.workbench.texteditor;visibility:=reexport,
- org.eclipse.epf.common.ui;visibility:=reexport
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.epf.richtext,
- org.eclipse.epf.richtext.actions,
- org.eclipse.epf.richtext.dialogs,
- org.eclipse.epf.richtext.html,
- org.eclipse.epf.richtext.preferences
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.html b/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.html
deleted file mode 100644
index 04a6d65fb9f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.ini b/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.ini
deleted file mode 100644
index 46909d4b218..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2004, 2005 IBM Corporation. All Rights Reserved.
-#-------------------------------------------------------------------------------
-
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=application_32.gif
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.mappings b/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.mappings
deleted file mode 100644
index 2c7deba835c..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.mappings
+++ /dev/null
@@ -1,7 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-# Usually generated at build time.
-
-0=1.5.0.4
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.properties b/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.properties
deleted file mode 100644
index cbb1618b0af..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/about.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-# NLS_ENCODING=UNICODE
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#-------------------------------------------------------------------------------
-# Copyright (c) 2000, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial implementation
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-featureName=EPF Richtext
-
-featureText=EPF Richtext\n\
-\n\
-Version: {0} \n\
-\n\
-(c) Copyright Eclipse contributors and others 2000, 2008. All Rights Reserved.\n\
-\n\
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/application_32.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/application_32.gif
deleted file mode 100644
index e6ad7ccd75b..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/application_32.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/build.properties b/extraplugins/epf-richtext/org.eclipse.epf.richtext/build.properties
deleted file mode 100644
index 2bbb410e56e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.richtext.jar = src/
-output.richtext.jar = bin/
-bin.includes = richtext.jar,\
- icons/,\
- META-INF/,\
- rte/,\
- plugin.xml,\
- plugin.properties,\
- about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- application_32.gif
-
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddCode.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddCode.gif
deleted file mode 100644
index 9ff24e339c2..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddCode.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddImage.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddImage.gif
deleted file mode 100644
index 4308a8a2ec7..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddImage.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddLink.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddLink.gif
deleted file mode 100644
index 7b111960867..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddLink.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddOrderedList.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddOrderedList.gif
deleted file mode 100644
index f9ae4154b12..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddOrderedList.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddTable.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddTable.gif
deleted file mode 100644
index 20884628895..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddTable.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddUnorderedList.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddUnorderedList.gif
deleted file mode 100644
index 9c44ec645ae..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/AddUnorderedList.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Bold.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Bold.gif
deleted file mode 100644
index 2dc59878356..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Bold.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/ClearContent.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/ClearContent.gif
deleted file mode 100644
index 9ff6416063d..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/ClearContent.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Copy.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Copy.gif
deleted file mode 100644
index e9bc65e32a0..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Copy.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Cut.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Cut.gif
deleted file mode 100644
index bd43144729a..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Cut.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/FindReplace.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/FindReplace.gif
deleted file mode 100644
index c8f88716c46..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/FindReplace.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Indent.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Indent.gif
deleted file mode 100644
index 436e15369b7..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Indent.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Italic.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Italic.gif
deleted file mode 100644
index c9b5a4483a7..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Italic.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Outdent.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Outdent.gif
deleted file mode 100644
index edcda3eea36..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Outdent.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Paste.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Paste.gif
deleted file mode 100644
index 1c7668db98e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Paste.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/PastePlainText.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/PastePlainText.gif
deleted file mode 100644
index d01a2297af7..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/PastePlainText.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Subscript.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Subscript.gif
deleted file mode 100644
index a7b31aa064e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Subscript.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Superscript.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Superscript.gif
deleted file mode 100644
index e4b266c5e53..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Superscript.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/TidyHTML.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/TidyHTML.gif
deleted file mode 100644
index 36bc9df8e50..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/TidyHTML.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Underline.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Underline.gif
deleted file mode 100644
index e2a96469cee..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/dtool16/Underline.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddCode.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddCode.gif
deleted file mode 100644
index bdb813fc270..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddCode.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddImage.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddImage.gif
deleted file mode 100644
index 0545213fbaa..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddImage.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddLine.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddLine.gif
deleted file mode 100644
index 7f08dcf651e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddLine.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddLink.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddLink.gif
deleted file mode 100644
index e99194adefd..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddLink.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddOrderedList.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddOrderedList.gif
deleted file mode 100644
index b6814c10a08..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddOrderedList.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddTable.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddTable.gif
deleted file mode 100644
index d368859b9e6..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddTable.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddUnorderedList.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddUnorderedList.gif
deleted file mode 100644
index a4fdfc9e461..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/AddUnorderedList.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Bold.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Bold.gif
deleted file mode 100644
index 00df9e553e5..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Bold.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/ClearContent.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/ClearContent.gif
deleted file mode 100644
index 255832653fd..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/ClearContent.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Copy.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Copy.gif
deleted file mode 100644
index f32aceebb3e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Copy.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Cut.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Cut.gif
deleted file mode 100644
index 7e8635c8ab4..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Cut.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/FindReplace.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/FindReplace.gif
deleted file mode 100644
index 11257ecd23b..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/FindReplace.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Indent.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Indent.gif
deleted file mode 100644
index 78195d0743e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Indent.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Italic.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Italic.gif
deleted file mode 100644
index ad0cd11add5..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Italic.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyCenter.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyCenter.gif
deleted file mode 100644
index eeabf0513de..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyCenter.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyFull.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyFull.gif
deleted file mode 100644
index a90a3b8b141..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyFull.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyLeft.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyLeft.gif
deleted file mode 100644
index e85469b5d7a..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyLeft.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyRight.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyRight.gif
deleted file mode 100644
index 0005af11ea1..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/JustifyRight.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Outdent.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Outdent.gif
deleted file mode 100644
index 406b94f2840..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Outdent.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Paste.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Paste.gif
deleted file mode 100644
index 94d39a1af5c..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Paste.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/PastePlainText.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/PastePlainText.gif
deleted file mode 100644
index d8f9895833e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/PastePlainText.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/StrikeThrough.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/StrikeThrough.gif
deleted file mode 100644
index a1035459470..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/StrikeThrough.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Subscript.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Subscript.gif
deleted file mode 100644
index 1c0f7133c7d..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Subscript.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Superscript.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Superscript.gif
deleted file mode 100644
index 32866349b8f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Superscript.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/TidyHTML.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/TidyHTML.gif
deleted file mode 100644
index adf2410fa60..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/TidyHTML.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Underline.gif b/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Underline.gif
deleted file mode 100644
index e6476d6f45b..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/icons/full/etool16/Underline.gif
+++ /dev/null
Binary files differ
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/messages.properties b/extraplugins/epf-richtext/org.eclipse.epf.richtext/messages.properties
deleted file mode 100644
index 1eeeb7bc043..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/messages.properties
+++ /dev/null
@@ -1,160 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#-------------------------------------------------------------------------------
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial implementation.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-################################################################################
-# BEGIN NO TRANSLATION
-###############################################################################
-# !! DO NOT TRANSLATE THE FOLLOWING LINE !!
-fontNameAction_CSS_Default=arial, helvetica, sans-serif
-# !! DO NOT TRANSLATE THE FOLLOWING LINE !!
-fontNameAction_CSS_Default_Mozilla=arial,helvetica,sans-serif
-################################################################################
-# END NO TRANSLATION
-################################################################################
-
-
-
-# Font Style Names
-fontStyle_normal=Normal
-fontStyle_sectionHeading=Section Heading
-fontStyle_subsectionHeading=Subsection Heading
-fontStyle_subSubsectionHeading=Sub Subsection Heading
-fontStyle_quote=Quote
-fontStyle_codeSample=Code Sample
-
-# HTML Block Tags
-blockTag_paragraph=Paragraph
-blockTag_heading1=Heading 1
-blockTag_heading2=Heading 2
-blockTag_heading3=Heading 3
-blockTag_heading4=Heading 4
-blockTag_heading5=Heading 5
-blockTag_heading6=Heading 6
-blockTag_address=Address
-blockTag_preformattedText=Preformatted Text
-
-# HTML Font Names
-fontName_default=Default
-fontName_arial=Arial
-fontName_courierNew=Courier New
-fontName_timesNewRoman=Times New Roman
-fontName_verdana=Verdana
-
-# Rich Text Editor Tool Buttons
-addHorizontalBarAction_toolTipText=Add Horizontal Bar
-addImageAction_toolTipText=Add Image
-addLineAction_toolTipText=Add Line
-addLinkAction_toolTipText=Add Link
-addOrderedListAction_toolTipText=Add Ordered List
-addTableAction_toolTipText=Add Table
-addUnorderedListAction_toolTipText=Add Unordered List
-boldAction_toolTipText=Bold
-clearContentAction_toolTipText=Clear Content
-copyAction_toolTipText=Copy
-cutAction_toolTipText=Cut
-findReplaceAction_toolTipText=Find/Replace
-indentAction_toolTipText=Indent
-italicAction_toolTipText=Italic
-justifyCenterAction_toolTipText=Justify Center
-justifyFullAction_toolTipText=Justify Full
-justifyLeftAction_toolTipText=Justify Left
-justifyRightAction_toolTipText=Justify Right
-outdentAction_toolTipText=Outdent
-pasteAction_toolTipText=Paste
-pastePlainTextAction_toolTipText=Paste as plain text
-subscriptAction_toolTipText=Subscript
-superscriptAction_toolTipText=Superscript
-underlineAction_toolTipText=Underline
-tidy_clean_text=Default Clean
-tidy_cleaner_text=Clean MS HTML
-tidy_cleanest_text=Clean Word 2000 HTML
-tidy_clean_toolTipText=Clean with JTidy using default options
-tidy_cleaner_toolTipText=Clean HTML of MS HTML
-tidy_cleanest_toolTipText=Clean Word 2000 HTML
-addCodeAction_toolTipText=Insert custom html (javascript or video)
-
-# Rich Text Editor Comboboxes
-fontStyleAction_toolTipText=Set Font Style
-blockTagAction_toolTipText=Set Block Tag
-fontNameAction_toolTipText=Set Font
-fontNameAction_DefaultFontName=Default font
-fontSizeAction_toolTipText=Set Font Size
-
-# Rich Text Editor Context Menu Items
-cutAction_text=&Cut
-copyAction_text=C&opy
-pasteAction_text=&Paste
-pastePlainTextAction_text=Paste &as plain text
-
-# Rich Text Editor Tabs
-richTextTab_text=Rich Text
-richTextTab_toolTipText=Edit content in rich text
-htmlTab_text=HTML
-htmlTab_toolTipText=Edit content in HTML
-
-# Add Dialogs
-addImageDialog_title=Add Image
-addLinkDialog_title=Add Link
-addTableDialog_title=Add Table
-findReplaceDialog_title=Find/Replace
-urlLabel_text=URL:
-summaryLabel_text=Summary:
-captionLabel_text=Caption:
-rowsLabel_text=Rows:
-columnsLabel_text=Columns:
-widthLabel_text=Width:
-tableStyleLabel_text=Style:
-tableHeaderNone_text=Table with no headers
-tableHeaderCols_text=Table with column headers
-tableHeaderRows_text=Table with row headers
-tableHeaderBoth_text=Table with column and row headers
-browseButton_text=Browse...
-addCodeDialog_title=Insert Custom Html
-addCodeDialog_Msg=Input your html for javascript or video:
-
-# Clear Editor Content Dialog
-clearContentDialog_title=Clear Editor Content Confirmation
-clearContentDialog_text=Do you really want to clear the content of this rich text editor?
-
-# Find/Replace Dialog
-findLabel_text=Find:
-replaceLabel_text=Replace with:
-optionsGroup_text=Options
-caseSensitiveCheckbox_text=Case sensitive
-wholeWordCheckbox_text=Whole word
-directionGroup_text=Direction
-forwardRadioButton_text=Forward
-backwardRadioButton_text=Backward
-findButton_text=Find
-replaceButton_text=Replace
-replaceFindButton_text=Replace/Find
-replaceallButton_text=Replace All
-# taken from org.eclipse.ui.workbench.texteditor
-FindReplace_Status_noMatch_label=String Not Found
-
-# Preference Page
-maxCharsPerLineLabel_text=Maximum characters per line:
-indentHTMLCheckbox_text=Indent HTML tags
-indentSizeLabel_text=Indent Size:
-urlDisplayNameLabel_text=URL Display Name:
-
-
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/plugin.properties b/extraplugins/epf-richtext/org.eclipse.epf.richtext/plugin.properties
deleted file mode 100644
index 3d5028ae5c0..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/plugin.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#-------------------------------------------------------------------------------
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial implementation.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-# Plug-in
-pluginName=EPF Rich Text
-providerName=Eclipse.org
-
-################################################################################
-# THE FOLLOWING PROPERTIES SHOULD NOT BE TRANSLATED!!!
-################################################################################
-
-# The HTML file used to render the Rich Text Editor.
-RichText.editorHTML=rte.htm
-
-
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/blank.htm b/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/blank.htm
deleted file mode 100644
index 765d74505d5..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/blank.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-<head>
- <title></title>
-</head>
-<body>
-</body>
-</html>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.css b/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.css
deleted file mode 100644
index 4912b2cb390..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.css
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- *
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- */
-
-body {
- background-image: none;
- background-color: #ffffff;
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- margin: 3px;
- padding: 0px;
-}
-
-p {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
-}
-
-h1 {
- font-family: arial, helvetica, sans-serif;
- font-size: large;
-}
-
-h2 {
- font-family: arial, helvetica, sans-serif;
- font-size: 150%;
-}
-
-h3 {
- font-family: arial, helvetica, sans-serif;
-}
-
-h4, h5, h6 {
- font-family: arial, helvetica, sans-serif;
-}
-
-a:link {
- color: #003399;
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- text-decoration: none;
-}
-
-a:active {
- color: #003399;
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- text-decoration: underline;
-}
-
-a:visited {
- color: #003399;
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- text-decoration: none;
-}
-
-a:hover {
- color: #ff0000;
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- text-decoration: underline;
-}
-
-ol {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- list-style-type: decimal;
- margin-left: 30px;
-}
-
-ol li {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- text-align: left
-}
-
-ul {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- list-style-type: disc;
- margin-left: 30px;
- margin-top: 0px;
-}
-
-ul li {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- text-align: left;
-}
-
-table {
- background-image: none;
- background: #ffffff;
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
-}
-
-tbody {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- valign: baseline;
-}
-
-th {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- text-align: left;
-}
-
-td {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
-}
-
-td ul {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- margin-bottom: 0px;
- margin-left: 30px;
-}
-
-.pageTitle {
- background: #9999cc;
- color: #ffffff;
- font-size: 12pt;
- font-weight: bold;
- padding-bottom: 5px;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 5px;
- text-align: left;
-}
-
-.pageTitleSeparator {
- background-color: #000000;
- padding: 0px;
-}
-
-.tab {
- background-color: #5c81a7;
- color: #ffffff;
- font-family: verdana, arial, sans-serif;
- font-size: 11px;
- font-weight: bold;
-}
-
-.activeTab {
- background-color: #c8d7e3;
- color: #293d6b;
- font-family: verdana, arial, sans-serif;
- font-size: 11px;
- font-weight: bold;
-}
-
-a.tab:link, a.tab:active, a.tab:visited {
- color: #ffffff;
- font-family: verdana, arial, sans-serif;
- font-size: 11px;
- font-weight: bold;
-}
-
-a.tab:hover {
- text-decoration: underline;
-}
-
-.overview {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- font-weight: normal;
- padding-bottom: 10px;
- padding-left: 20px;
- padding-right: 0px;
- padding-top: 10px;
-}
-
-.overviewTable {
- background: #ffffff;
- width: 100%;
-}
-
-.overviewTable td {
- padding-bottom: 5px;
- padding-left: 5px;
- padding-right: 5px;
- padding-top: 5px;
-}
-
-.overviewSeparator {
- background-color: #000000;
- padding: 0px;
-}
-
-.expandCollapseText {
- font-family: verdana, arial, sans-serif;
- font-size: 8pt;
- padding-left: 5px;
- padding-right: 5px;
-}
-
-.expandCollapseLink {
- color: #333333;
- padding-bottom: 5px;
- text-decoration: none;
-}
-
-.expandCollapseLink:hover {
- color: #0000ff;
- text-decoration: underline;
-}
-
-.expandCollapseLink:visited {
- color: #333333;
-}
-
-.sectionHeading {
- background-color: #98b1c4;
- color: #ffffff;
- cursor: hand;
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- font-weight: bold;
- padding-bottom: 2px;
- padding-left: 2px;
- padding-top: 2px;
- text-decoration: none;
-}
-
-.sectionContent {
- padding-bottom: 0px;
- padding-left: 0px;
- padding-right: 0px;
- padding-top: 0px;
- text-align: right;
-}
-
-.sectionTable {
- border-bottom: #ccc solid 0px;
- border-left: #ccc solid 1px;
- border-right: #ccc solid 0px;
- border-top: #ccc solid 1px;
- padding-bottom: 10px;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 10px;
- width: 100%;
-}
-
-.sectionTableHeading {
- background: #eee;
- border-bottom: #ccc solid 1px;
- border-left: #ccc solid 0px;
- border-right: #ccc solid 1px;
- border-top: #ccc solid 0px;
- color: #333333;
- height: 20;
- text-align: left;
- width: 20%;
-}
-
-.sectionTableCell {
- border-bottom: #ccc solid 1px;
- border-left: #ccc solid 0px;
- border-right: #ccc solid 1px;
- border-top: #ccc solid 0px;
-}
-
-.breakdownTable {
- border-bottom: #ccc solid 0px;
- border-left: #ccc solid 1px;
- border-right: #ccc solid 0px;
- border-top: #ccc solid 1px;
- padding-bottom: 0px;
- padding-left: 0px;
- padding-right: 0px;
- padding-top: 0px;
- width: 100%;
-}
-
-.breakdownTable th {
- background: #eee;
- border-bottom: #ccc solid 1px;
- border-left: #ccc solid 0px;
- border-right: #ccc solid 1px;
- border-top: #ccc solid 0px;
- color: #333333;
- height: 20;
- text-align: left;
-}
-
-.breakdownTable td {
- border-bottom: #ccc solid 1px;
- border-left: #ccc solid 0px;
- border-right: #ccc solid 1px;
- border-top: #ccc solid 0px;
-}
-
-.defaultTable {
- border-bottom: #ccc solid 0px;
- border-left: #ccc solid 0px;
- border-right: #ccc solid 0px;
- border-top: #ccc solid 0px;
- padding-bottom: 0px;
- padding-left: 0px;
- padding-right: 0px;
- padding-top: 0px;
- width: 100%;
-}
-
-.defaultTable td {
- border-bottom: #ccc solid 0px;
- border-left: #ccc solid 0px;
- border-right: #ccc solid 0px;
- border-top: #ccc solid 0px;
- text-align: left;
-}
-
-.subSectionHeading {
- color: #333333;
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- font-weight: bold;
- text-decoration: none;
-}
-
-.subSectionContent {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- text-decoration: none;
-}
-
-.stepHeading {
- background-color: #ffffff;
- color: #293d6b;
- cursor: hand;
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- font-weight: bold;
- padding-bottom: 2px;
- padding-left: 2px;
- padding-top: 2px;
- text-decoration: none;
-}
-
-.stepContent {
- border-bottom: #ccc solid 0px;
- border-left: #ccc solid 0px;
- border-right: #ccc solid 0px;
- border-top: #ccc solid 0px;
- padding-bottom: 5px;
- padding-left: 0px;
- padding-right: 0px;
- padding-top: 0px;
- text-align: right;
-}
-
-.stepTable {
- border-bottom: #999999 solid 1px;
- border-left: #999999 solid 0px;
- border-right: #999999 solid 0px;
- border-top: #999999 solid 0px;
- padding-bottom: 20px;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 10px;
- width: 100%;
-}
-
-.stepTable td {
- border: #ccc solid 0px;
-}
-
-.stepSeparator {
- background-color: #cccccc;
- padding: 0px;
-}
-
-.backToTopLink {
- color: #fffff;
- font-family: verdana, arial, sans-serif;
- font-size: 8pt;
- font-weight: normal;
- margin: 0px;
- padding-bottom: 10px;
- text-align: middle;
- text-decoration: none;
-}
-
-.backToTopLink:hover {
- color: #969;
- text-decoration: underline;
-}
-
-.backToTopLink:visited {
- color: #5c81a7;
- text-decoration: none;
-}
-
-.copyright {
- color: #7080b0;
- font-family: verdana, arial, sans-serif;
- font-size: 8pt;
- font-weight: normal;
- padding-left: 0px;
- padding-right: 10px;
- padding-top: 25px;
- text-align: left;
- width: 100%;
-}
-
-.versionInfo {
- color: #7080b0;
- font-family: verdana, arial, sans-serif;
- font-size: 8pt;
- font-weight: normal;
- padding-left: 10px;
- padding-right: 0px;
- padding-top: 25px;
- text-align: right;
-}
-
-.quote {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- font-style: italic;
-}
-
-.codeSample {
- font-family: courier;
- font-size: 10pt;
-}
-
-.elementLink {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- color: #0000ff;
-}
-
-.elementLinkWithType {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- color: #0000ff;
-}
-
-.elementLinkWithUserText {
- font-family: arial, helvetica, sans-serif;
- font-size: 10pt;
- color: #0000ff;
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.html b/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.html
deleted file mode 100644
index 1c7c52e643e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<!--
- Copyright (c) 2005, 2006 IBM Corporation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
- Contributors:
- IBM Corporation - initial implementation
--->
- <head>
- <script language="JavaScript" type="text/javascript" src="rte.js"></script>
- </head>
- <body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0" scroll="no" style="overflow: hidden">
- <iframe id="rte" name="rte" style="border: none;" frameborder="0" scrolling="auto" width="100%" height="100%"></iframe>
- <script type="text/javascript">
- initEditor('rte', 'rte.css', null);
- </script>
- </body>
-</html>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.js b/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.js
deleted file mode 100644
index 5d6d34da6ee..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.js
+++ /dev/null
@@ -1,1490 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-// Note: Mozilla/Firefox does not allow unprivileged scripts to invoke the cut,
-// copy and paste commands. The Javascript must either be signed
-// (see http://www.mozilla.org/projects/security/components/signed-scripts.html),
-// or the users must change their preferences
-// (see http://www.mozilla.org/editor/midasdemo/securityprefs.html).
-// Alternatively, the users can use the ctrl-x, ctrl-c and ctrl-v keys.
-//------------------------------------------------------------------------------
-// Note: The SWT component in eclipse 3.4.X and above has a bug that
-// keyReleased event can't be notified to listener. See (https://bugs.eclipse.org/bugs/show_bug.cgi?id=280146).
-// This issue has blocked EPF upgrade to 1.5.0.5. As a workaround, capture keyReleased event in
-// Javascript. Once this issue is resolved in SWT, we need to resume it
-var STATUS_NOP = 0;
-var STATUS_INITIALIZED = 1;
-var STATUS_MODIFIED = 2;
-var STATUS_GET_TEXT = 3;
-var STATUS_KEY_DOWN = 4;
-var STATUS_KEY_UP = 5;
-var STATUS_SELECT_TEXT = 6;
-var STATUS_SELECT_CONTROL = 7;
-var STATUS_SELECT_NONE = 8;
-var STATUS_EXEC_CMD = 9;
-var STATUS_REFORMAT_LINKS = 10;
-
-var KEY_ARROW_DOWN = 40;
-var KEY_ARROW_LEFT = 37;
-var KEY_ARROW_RIGHT = 39;
-var KEY_ARROW_UP = 38;
-var KEY_BACKSPACE = 8;
-var KEY_END = 35;
-var KEY_HOME = 36;
-var KEY_PAGE_DOWN = 34;
-var KEY_PAGE_UP = 33;
-var KEY_TAB = 9;
-
-var KEY_B = 66;
-var KEY_U = 85;
-var KEY_I = 73;
-var KEY_C = 67;
-var KEY_F = 70;
-var KEY_S = 83;
-var KEY_V = 86;
-var KEY_X = 88;
-var KEY_Z = 90;
-
-var CMD_COPY = "copy";
-var CMD_CUT = "cut";
-var CMD_FIND_TEXT = "findText";
-var CMD_PASTE = "paste";
-var CMD_SAVE = "save";
-var CMD_SAVE_ALL = "saveAll";
-
-var TABLE_HEADERS_NONE = 0;
-var TABLE_HEADERS_COLS = 1;
-var TABLE_HEADERS_ROWS = 2;
-var TABLE_HEADERS_BOTH = 3;
-
-var BOLD = 1;
-var ITALIC = BOLD << 1;
-var UNDERLINE = ITALIC << 1;
-var SUBSCRIPT = UNDERLINE << 1;
-var SUPERSCRIPT = SUBSCRIPT << 1;
-
-
-var editorId;
-var editorCSS;
-var baseHREF;
-var supportRichTextEditing = true;
-var editorDoc;
-var selection;
-var selectionRange;
-var readOnly = false;
-var initialized = false;
-var modified = false;
-var checkResizeElement;
-var selectionInfo = null;
-
-// Initializes the editor.
-function initEditor(id, css, baseURL) {
- editorId = id;
- editorCSS = css;
- baseHREF = baseURL;
- try {
- enableRichTextEditing('');
- initialized = true;
- setStatus(STATUS_INITIALIZED, null);
- }
- catch (e) {
- supportRichTextEditing = false;
- }
-}
-
-var excludeModify = new Array(16, KEY_ARROW_DOWN, KEY_ARROW_LEFT,
- KEY_ARROW_RIGHT, KEY_ARROW_UP, KEY_END, KEY_HOME, KEY_PAGE_DOWN,
- KEY_PAGE_UP, KEY_TAB);
-
-function keyReleased(event) {
- var keyCode = event.keyCode;
- if (keyCode == 0 && !document.all) {
- keyCode = event.charCode;
- switch (keyCode) {
- case 98:
- keyCode = KEY_B;
- break;
- case 99:
- keyCode = KEY_C;
- break;
- case 102:
- keyCode = KEY_F;
- break;
- case 105:
- keyCode = KEY_I;
- break;
- case 115:
- keyCode = KEY_S;
- break;
- case 117:
- keyCode = KEY_U;
- break;
- case 118:
- keyCode = KEY_V;
- break;
- case 120:
- keyCode = KEY_X;
- break;
- case 122:
- keyCode = KEY_Z;
- break;
- }
- }
- var ctrlKey = event.ctrlKey;
- var shiftKey = event.shiftKey;
- var altKey = event.altKey;
-
- if ( !ctrlKey && !altKey ) {
- var modified = true;
- for (var i = 0; i < excludeModify.length; i++ ) {
- if ( keyCode == excludeModify[i] ) {
- modified = false;
- break;
- }
- }
- if ( modified == true ) {
- setTimeout("setStatus(STATUS_MODIFIED, null);", 10);
- }
- }
-}
-
-// Handles the key events.
-function keyPressed(event) {
- var keyCode = event.keyCode;
- if (keyCode == 0 && !document.all) {
- keyCode = event.charCode;
- switch (keyCode) {
- case 98:
- keyCode = KEY_B;
- break;
- case 99:
- keyCode = KEY_C;
- break;
- case 102:
- keyCode = KEY_F;
- break;
- case 105:
- keyCode = KEY_I;
- break;
- case 115:
- keyCode = KEY_S;
- break;
- case 117:
- keyCode = KEY_U;
- break;
- case 118:
- keyCode = KEY_V;
- break;
- case 120:
- keyCode = KEY_X;
- break;
- case 122:
- keyCode = KEY_Z;
- break;
- }
- }
- var ctrlKey = event.ctrlKey;
- var shiftKey = event.shiftKey;
-
- switch(keyCode) {
- case KEY_ARROW_DOWN:
- case KEY_ARROW_LEFT:
- case KEY_ARROW_RIGHT:
- case KEY_ARROW_UP:
- case KEY_END:
- case KEY_HOME:
- case KEY_PAGE_DOWN:
- case KEY_PAGE_UP:
- break;
- case KEY_TAB:
- if ( readOnly || !ctrlKey)
- break;
-
- var editorWindow = document.getElementById(editorId).contentWindow;
- var editorDocument = editorWindow.document;
- var tabText = "&nbsp;&nbsp;&nbsp;&nbsp;";
-
- if(document.all ){
- event.keyCode = -1;
- event.returnValue=false; //IE: cancel the default behavior
- var rng=editorDocument.selection.createRange();
- rng.pasteHTML(tabText); //insert 4 spaces for one tab key
- } else {
- event.preventDefault();
- editorDoc.execCommand("insertHTML","",tabText);
- }
-
- setTimeout("setStatus(STATUS_MODIFIED, null);", 10);
- break;
- case KEY_BACKSPACE:
- if (!readOnly) {
- setTimeout("setStatus(STATUS_MODIFIED, null);", 10);
- }
- break;
- case KEY_B:
- case KEY_U:
- case KEY_I:
- if (!readOnly && ctrlKey) {
- setTimeout("setStatus(STATUS_MODIFIED, null);",10);
- }
- break;
- case KEY_C:
- if (ctrlKey) {
- setStatus(STATUS_KEY_DOWN, CMD_COPY);
- }
- else if (!document.all && readOnly) {
- event.preventDefault();
- }
- break;
- case KEY_F:
- if (ctrlKey) {
- if (document.all) {
- event.keyCode = -1;
- event.returnValue = false;
- }
- else {
- event.preventDefault();
- }
- setStatus(STATUS_KEY_DOWN, CMD_FIND_TEXT);
- }
- else if (!document.all && readOnly) {
- event.preventDefault();
- }
- break;
- case KEY_S:
- if (!readOnly && ctrlKey) {
- if (document.all) {
- event.keyCode = -1;
- event.returnValue = false;
- }
- else {
- event.preventDefault();
- }
- if (shiftKey) {
- setStatus(STATUS_KEY_DOWN, CMD_SAVE_ALL);
- }
- else {
- setStatus(STATUS_KEY_DOWN, CMD_SAVE);
- }
- }
- else if (!document.all && readOnly) {
- event.preventDefault();
- }
- break;
- case KEY_V:
- if (ctrlKey) {
- if (document.all) {
- event.keyCode = -1;
- event.returnValue = false;
- if (!readOnly) {
- setStatus(STATUS_KEY_DOWN, CMD_PASTE);
- }
- }
- else {
- if (!readOnly) {
- // Workaround Mozilla/Firefox paste issues.
- setTimeout("setStatus(STATUS_KEY_DOWN, CMD_PASTE);", 10);
- }
- else {
- event.preventDefault();
- }
- }
- }
- else if (!document.all && readOnly) {
- event.preventDefault();
- }
- break;
- case KEY_X:
- if (ctrlKey) {
- setStatus(STATUS_KEY_DOWN, CMD_CUT);
- }
- else if (!document.all && readOnly) {
- event.preventDefault();
- }
- break;
- case KEY_Z:
- if (!readOnly && ctrlKey) {
- setTimeout("setStatus(STATUS_MODIFIED, null);", 10);
- }
- else if (!document.all && readOnly) {
- event.preventDefault();
- }
- break;
- default:
- if (!document.all && readOnly) {
- event.preventDefault();
- }
- }
-}
-
-function selChanged(event) {
- updateSelection();
-}
-
-function enableRichTextEditing(html) {
- var doc = document.getElementById(editorId).contentWindow.document;
- doc.designMode = "on";
-
- var htmlSrc = '<html><head><title></title>';
-
- if (editorCSS != null && editorCSS != '') {
- htmlSrc += '<link rel="StyleSheet" href="' + editorCSS + '" type="text/css"/>';
- }
-
- if (baseHREF != null && baseHREF != '') {
- htmlSrc += '<base href="' + baseHREF + '"/>';
- }
-
- if (!document.all && html == '') {
- // Mozilla/Firefox will only display the caret if <br/> is added to the HTML body.
- // Adding <br/> also enables the backspace and delete key by default. Otherwise, the
- // user need to enter some text before these 2 keys start to function.
- html = "<br />";
- }
-
- htmlSrc += '</head><body>' + html + '</body></html>';
-
- doc.open();
- doc.write(htmlSrc);
- doc.close();
-
- modified = false;
-
- if ("attachEvent" in doc) {
- doc.attachEvent("onkeydown", keyPressed);
- doc.attachEvent("onkeyup", keyReleased);
- doc.attachEvent("onselectionchange", selChanged);
- // for DnD (internal)
- doc.body.attachEvent("ondrop", checkModified);
- // for image/table resizing:
- doc.body.attachEvent("onresizeend", checkModified);
- }
- if ("addEventListener" in doc) {
- doc.addEventListener("keypress", keyPressed, true);
- doc.addEventListener("keyrelease", keyReleased, true);
- doc.addEventListener("keypress", selChanged, false);
- doc.addEventListener("mouseup", selChanged, false);
- doc.addEventListener("dragdrop", checkModified, false);
-
- // check mouseup event for image/table resizing
- doc.addEventListener("mouseup", checkModified, false);
- }
-
- setStatus(STATUS_EXEC_CMD, 1);
-}
-
-// this one is for modification check on drag n drop within the RTE
-// checkModified listener
-function checkModified(event) {
- setTimeout("setStatus(STATUS_MODIFIED, null);", 10);
-}
-
-// Sets the height of the editor.
-function setHeight(height) {
- if (initialized) {
- document.getElementById(editorId).height = height + "px";
- }
-}
-
-// Sets the status.
-// Note: By default, Firefox disables changes to the status bar. For this to work, the user
-// must set the global preference "dom.disable_window_status_change" to false.
-// For Firefox 1.0.x, this setting can be made in /usr/firefox-1.0.7/defaults/pref/firefox.js.
-function setStatus(type, value) {
- var status = '$$$' + type;
- if (value != null && value != '') {
- status += ('$' + value);
- }
- window.status = status;
- window.status = '$$$' + STATUS_NOP;
-}
-
-// Returns the HTML source.
-function getHTML() {
- var html = document.getElementById(editorId).contentWindow.document.body.innerHTML;
- if (html == "<P>&nbsp;</P>") {
- html = "";
- }
- if (html != null && html != '') {
- var regEx = new RegExp("\"file\:([^=]*)(/resources/)([^\"]+)\"", "g");
- html = html.replace(regEx, "\"./resources/$3\"");
- regEx = new RegExp("\"file\:([^=]*)/#([^\"]+)\"", "g");
- html = html.replace(regEx, "\"#$2\"");
- }
- return html;
-}
-
-//Returns the HTML source to the Java layer
-function getText() {
- var html = getHTML();
- setStatus(STATUS_GET_TEXT, html);
- return html;
-}
-
-function setInnerHTML(html) {
- if (document.all) {
- // IE has problem setting complex HTML set via doc.body.innerHTML.
- enableRichTextEditing(html);
- }
- else {
- if (html == '') {
- // Mozilla/Firefox will only display the caret if <br/> is added to the HTML body.
- html = "<br/>";
- }
- var doc = document.getElementById(editorId).contentWindow.document;
- if (doc.body != null) {
- doc.body.innerHTML = html;
- }
- else {
- // Mozilla/Firefox can take a while to initialize document.body
- // after document.write().
- try {
- setTimeout("setInnerHTML('" + html + "');", 10);
- }
- catch (e) {
- }
- }
- }
-}
-
-// Sets the HTML source.
-function setText(html) {
- if (supportRichTextEditing) {
- html = decodeString(html);
- selectionInfo = getSelectionInfo();
- setInnerHTML(html);
- if (selectionInfo != null) {
- setTimeout("setSelection(selectionInfo);", 10);
- }
- modified = false;
- setStatus(STATUS_EXEC_CMD, 1);
- }
-}
-
-function setSelection(selectionInfo) {
- if (!supportRichTextEditing) {
- return;
- }
-
- contentWindow = document.getElementById(editorId).contentWindow;
- editorDoc = contentWindow.document;
-
- try {
- if (document.all) {
- var startOffset = selectionInfo.start;
- var len = selectionInfo.len;
- if (startOffset == 0 && len == 0) {
- return;
- }
- var tempRange = editorDoc.body.createTextRange();
- tempRange.moveStart('character', startOffset);
- tempRange.collapse();
- tempRange.moveEnd('character', len);
- tempRange.select();
- tempRange.scrollIntoView();
- } else {
- selection = this.window.getSelection();
- var startContainer = selectionInfo.startContainer;
- var start = selectionInfo.start;
- var endContainer = selectionInfo.endContainer;
- var end = selectionInfo.end;
- var tempRange = document.createRange();
- tempRange.setStart(startContainer, start);
- tempRange.setEnd(endContainer, end);
- selection.removeAllRanges();
- selection.addRange(tempRange);
- contentWindow.focus();
- }
- } catch (e) {
- }
-}
-
-function getSelectionInfo() {
- if (!supportRichTextEditing) {
- return null;
- }
-
- contentWindow = document.getElementById(editorId).contentWindow;
- editorDoc = contentWindow.document;
-
- var tempSelRange;
- try {
- if (document.all) {
- selection = editorDoc.selection;
- if (selection != null) {
- tempSelRange = selection.createRange();
- }
- // length of selection
- var tempSelLen = tempSelRange.text.length;
- // create new range
- var tempRange = editorDoc.body.createTextRange();
- // set end of new range to start of selection
- // this will throw an exception if tempSelRange is not in editor.doc.body (ie, at the start of the RTE).
- tempRange.setEndPoint("EndToStart", tempSelRange);
- // length of new range is the start offset
- var tempText = tempRange.text;
- // IE counts newlines as 2 characters for length property, but they count as 1 when using moveStart so remove the \r to make the count the same
- tempText = tempText.replace(/\r/g, "");
- var startOffset = tempText.length;
-
- return {start:startOffset, len:tempSelLen};
- } else {
- selection = contentWindow.getSelection();
- if (selection != null) {
- tempSelRange = selection.getRangeAt(selection.rangeCount - 1).cloneRange();
- }
- return {startContainer: tempSelRange.startContainer, start:tempSelRange.startOffset,
- endContainer: tempSelRange.endContainer, end:tempSelRange.endOffset};
- }
- } catch (e) {
- return null;
- }
-}
-
-// Decodes the HTML passed from the Java layer.
-function decodeString(str) {
- if (str != null && str != '') {
- if (document.all) {
- str = str.replace(/%sq%/g, "'");
- str = str.replace(/%EOL%/g, "\n");
- }
- else {
- str = str.replace(/%sq%/g, "&apos;");
- str = str.replace(/%EOL%/g, "");
- str = str.replace(/\n/g, "");
- }
- }
- return str;
-}
-
-// updates selection without notifying the Java layer of the selection state
-function internalUpdateSelection() {
- if (!supportRichTextEditing) {
- return false;
- }
-
- contentWindow = document.getElementById(editorId).contentWindow;
- editorDoc = contentWindow.document;
-
- if (document.all) {
- selection = editorDoc.selection;
- if (selection != null) {
- selectionRange = selection.createRange();
- reformatElementLinks();
- }
- }
- else {
- selection = contentWindow.getSelection();
- if (selection != null) {
- selectionRange = selection.getRangeAt(selection.rangeCount - 1).cloneRange();
- if (selectionRange.startContainer.nodeName == "HTML" &&
- selectionRange.endContainer.nodeName == "HTML") {
- // Mozilla selects the whole document when there's no RTE content, so select just the body
- selectionRange = editorDoc.createRange();
- selectionRange.setStart(editorDoc.body, 0);
- selectionRange.setEnd(editorDoc.body, 0);
- }
- }
- }
- return true;
-}
-
-// Updates the current selection and selection range.
-function updateSelection() {
- if (!supportRichTextEditing) {
- return false;
- }
-
- contentWindow = document.getElementById(editorId).contentWindow;
- editorDoc = contentWindow.document;
-
- var tempSelRange;
- var selOffsetStart = 0;
- var selectedText = "";
- var fontName = "";
- var fontSize = "";
- var blockStyle = "";
- var textFlags = 0;
-
-
- if (document.all) {
- selection = editorDoc.selection;
- if (selection != null) {
- selectionRange = selection.createRange();
- if (selectionRange != null && selection.type != "Control") {
- tempSelRange = selectionRange.duplicate();
- }
- reformatElementLinks();
- }
- }
- else {
- selection = contentWindow.getSelection();
- if (selection != null) {
- selectionRange = selection.getRangeAt(selection.rangeCount - 1).cloneRange();
- tempSelRange = selectionRange.cloneRange();
- }
- }
- if (tempSelRange != null) {
- try {
- if (document.all) {
- if (selectionRange.text) {
- selectedText = selectionRange.text;
- }
- /* for getting selection offset - commented because we can't select the
- * proper location in the HTML source tab because JTidy's reformatting of the HTML
- var html = getHTML();
- var tempSelLen = tempSelRange.htmlText.length;
- tempSelRange.moveStart('character', -html.length);
- selOffsetStart = tempSelRange.htmlText.length - tempSelLen;
- */
- var selParent = tempSelRange.parentElement();
- fontName = tempSelRange.queryCommandValue('fontName');
- fontSize = tempSelRange.queryCommandValue('fontSize');
- blockStyle = tempSelRange.queryCommandValue('formatBlock');
- if (blockStyle == "Normal") {
- if (selParent.className == "quote") {
- blockStyle = "<quote>";
- } else if (selParent.className == "codeSample") {
- blockStyle = "<code>";
- } else {
- blockStyle = "<p>";
- }
- } else if (blockStyle == "Heading 3") {
- blockStyle = "<h3>";
- } else if (blockStyle == "Heading 4") {
- blockStyle = "<h4>";
- } else if (blockStyle == "Heading 5") {
- blockStyle = "<h5>";
- } else if (blockStyle == "" || blockStyle == null) {
- blockStyle = "<p>";
- }
- if (tempSelRange.queryCommandValue('bold') == true) {
- textFlags |= BOLD;
- }
- if (tempSelRange.queryCommandValue('italic') == true) {
- textFlags |= ITALIC;
- }
- if (tempSelRange.queryCommandValue('underline') == true) {
- textFlags |= UNDERLINE;
- }
- if (tempSelRange.queryCommandValue('subscript') == true) {
- textFlags |= SUBSCRIPT;
- }
- if (tempSelRange.queryCommandValue('superscript') == true) {
- textFlags |= SUPERSCRIPT;
- }
- setStatus(STATUS_SELECT_TEXT, /* selOffsetStart + "$" + */
- fontName + "$" + fontSize + "$" + blockStyle + "$" + textFlags + "$" + selectedText);
- } else {
- if (selectionRange != null) {
- selectedText = selectionRange.toString();
- }
- var selParent = selection.focusNode;
- fontName = editorDoc.queryCommandValue('fontName');
- if (fontName == "") {
- fontName = "default";
- }
- fontSize = editorDoc.queryCommandValue('fontSize');
- if (fontSize == "") {
- fontSize = "default";
- }
- blockStyle = editorDoc.queryCommandValue('formatBlock');
- if (blockStyle == "p") {
- if (selParent.parentNode.className == "quote") {
- blockStyle = "<quote>";
- } else if (selParent.parentNode.className == "codeSample") {
- blockStyle = "<code>";
- } else {
- blockStyle = "<p>";
- }
- } else if (blockStyle == "h3") {
- blockStyle = "<h3>";
- } else if (blockStyle == "h4") {
- blockStyle = "<h4>";
- } else if (blockStyle == "h5") {
- blockStyle = "<h5>";
- } else if (blockStyle == "") {
- blockStyle = "<p>";
- }
- if (editorDoc.queryCommandState('bold') == true) {
- textFlags |= BOLD;
- }
- if (editorDoc.queryCommandState('italic') == true) {
- textFlags |= ITALIC;
- }
- if (editorDoc.queryCommandState('underline') == true) {
- textFlags |= UNDERLINE;
- }
- if (editorDoc.queryCommandState('subscript') == true) {
- textFlags |= SUBSCRIPT;
- }
- if (editorDoc.queryCommandState('superscript') == true) {
- textFlags |= SUPERSCRIPT;
- }
- setStatus(STATUS_SELECT_TEXT, /* selOffsetStart + "$" + */
- fontName + "$" + fontSize + "$" + blockStyle + "$" + textFlags + "$" + selectedText);
- }
- } catch (e) { }
- }
-
- return true;
-}
-
-// Sets focus to this editor.
-function setFocus() {
- if (!supportRichTextEditing) {
- return;
- }
- if (document.all) {
- iframe = document.getElementById(editorId);
- iframe.focus();
- } else {
- contentWindow = document.getElementById(editorId).contentWindow;
- contentWindow.focus();
- }
- setStatus(STATUS_EXEC_CMD, 1);
-}
-
-// Reformats element links created via drag & drop.
-function reformatElementLinks() {
- var linksReformatted = 0;
- var elements = editorDoc.getElementsByTagName('A');
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
- if (element.className.toLowerCase() == 'elementlink' ||
- element.className.toLowerCase() == 'elementlinkwithtype' ||
- element.className.toLowerCase() == 'elementlinkwithusertext') {
- if (element.firstChild != null && element.firstChild.firstChild != null &&
- element.firstChild.firstChild.firstChild != null) {
- var linkText = element.firstChild.firstChild.firstChild.nodeValue;
- element.removeChild(element.firstChild);
- element.appendChild(editorDoc.createTextNode(linkText));
- linksReformatted++;
- }
- }
- }
- if (linksReformatted > 0) {
- setStatus(STATUS_REFORMAT_LINKS, null);
- }
-}
-
-// Formats the selected text.
-function formatText(command, option) {
- if (!readOnly && internalUpdateSelection()) {
- if (editorDoc.execCommand(command, false, option)) {
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
- }
- }
-}
-
-// Adds HTML.
-function addHTML(html) {
- if (!readOnly && html != "") {
- html = decodeString(html);
- if (internalUpdateSelection()) {
- if (document.all) {
- if (selectionRange.text != null) {
- selectionRange.pasteHTML(html);
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
- }
- }
- else {
- selectionRange.deleteContents();
- var documentFragment = selectionRange.createContextualFragment(html);
- selectionRange.insertNode(documentFragment);
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
- }
- }
- }
-}
-
-// Adds an image.
-function addImage(url, height, width, alt) {
- if (internalUpdateSelection()) {
- if (document.all) {
- if (url != null && url != '') {
- formatText('insertimage', url);
- }
- if (selection != null && selection.type == 'Control' && selectionRange != null) {
- if (height != null && height != '') selectionRange.item().height = height;
- if (width != null && width != '') selectionRange.item().width = width;
- if (alt != null) selectionRange.item().alt = alt;
- }
- } else {
- var START_MARKER = "A_-_-_";
- var END_MARKER = ":.:.:";
- // mark img links with START_MARKER + id + END_MARKER in the id, for later recovery
- var elements = editorDoc.getElementsByTagName('img');
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
- element.id = START_MARKER + element.id + END_MARKER;
- }
- if (url != null && url != '') {
- formatText('insertimage', url);
- }
- if (internalUpdateSelection()) {
- var regExID = new RegExp(START_MARKER + "(.*?)" + END_MARKER);
- var elements = editorDoc.getElementsByTagName('img');
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
- var id = element.id;
- if (id != null && id != '') {
- RegExp.lastIndex=0;
- var matchArray = id.match(regExID);
- if (matchArray != null && matchArray.length > 0) {
- var newId = matchArray[1];
- if (newId.length > 0) {
- element.id = newId;
- } else {
- element.removeAttribute('id');
- }
- }
- } else {
- // no id, must be the new img
- if (height != null && height != '') element.height = height;
- if (width != null && width != '') element.width = width;
- if (alt != null) element.alt = alt;
- }
- }
- }
- }
- setStatus(STATUS_MODIFIED, null);
- }
-}
-
-// Adds a horizontal line.
-function addLine() {
- formatText('inserthorizontalrule', null);
-}
-
-// Adds a link.
-function addLink(url) {
- if (!readOnly && url != null && url != '' && internalUpdateSelection()) {
- if (document.all) {
- if (selectionRange.text == null || selectionRange.text == '') {
- selectionRange.text = url;
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
- }
- else if (selectionRange.execCommand('createlink', false, url)) {
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
- }
- }
- else {
- if (selection == null || selection == "") {
- var urlTextNode = editorDoc.createTextNode(url);
- insertNodeAtSelection(document.getElementById(editorFrameId).contentWindow, urlTextNode);
- }
- if (editorDoc.execCommand('createlink', false, url)) {
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
- }
- }
- }
-}
-
-// Adds an ordered list.
-function addOrderedList() {
- formatText('insertorderedlist', null);
-}
-
-// Adds a table.
-function addTable(rows, cols, width, summary, caption, tableheaders) {
- if (readOnly) return;
- if (rows == 0) rows = 2;
- if (cols == 0) cols = 2;
- if (width == 0) width = "85%";
- if (internalUpdateSelection()) {
- var table = editorDoc.createElement("table");
- table.cellPadding = "2";
- table.cellSpacing = "0";
- table.border = "1";
- table.width = width;
- table.title = "";
- if (summary != null && summary != '') {
- table.summary = summary;
- }
- if (caption != null && caption != '') {
- table.title = caption;
- table.createCaption();
- var captionNode = editorDoc.createTextNode(caption);
- table.caption.appendChild(captionNode);
- }
- tbody = editorDoc.createElement("tbody");
- for (var i = 0; i < rows; i++) {
- tr = editorDoc.createElement("tr");
- for (var j = 0; j < cols; j++) {
- if (i == 0 && (tableheaders == TABLE_HEADERS_COLS || tableheaders == TABLE_HEADERS_BOTH)) {
- th = editorDoc.createElement("th");
- th.scope = "col";
- th.id = "";
- th.abbr = th.id;
- var headerNode = editorDoc.createTextNode(th.id);
- th.appendChild(headerNode);
- if (!document.all) {
- br = editorDoc.createElement("br");
- th.appendChild(br);
- }
- tr.appendChild(th);
- }
- else if (j == 0 && (tableheaders == TABLE_HEADERS_ROWS || tableheaders == TABLE_HEADERS_BOTH)) {
- th = editorDoc.createElement("th");
- th.scope = "row";
- th.id = "";
- th.abbr = th.id;
- var headerNode = editorDoc.createTextNode(th.id);
- th.appendChild(headerNode);
- if (!document.all) {
- br = editorDoc.createElement("br");
- th.appendChild(br);
- }
- tr.appendChild(th);
- }
- else {
- td = editorDoc.createElement("td");
- if (!document.all) {
- br = editorDoc.createElement("br");
- td.appendChild(br);
- }
- tr.appendChild(td);
- }
- }
- tbody.appendChild(tr);
- }
- table.appendChild(tbody);
- if (document.all) {
- selectionRange.parentElement().appendChild(table);
- }
- else {
- selectionRange.insertNode(table);
- }
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
- }
-}
-
-// Adds an unordered list.
-function addUnorderedList() {
- formatText('insertunorderedlist', null);
-}
-
-// Sets the background color of the selected text.
-function backColor(color) {
- if (color != null && color != '') {
- formatText('backcolor', color);
- }
-}
-
-// Toggles the 'bold' attribute of the selected text.
-function bold() {
- formatText('bold', null);
-}
-
-// Copies the selected text to the clipboard.
-function copy() {
- if (internalUpdateSelection()) {
- if (editorDoc.execCommand('copy', false, null)) {
- setStatus(STATUS_EXEC_CMD, 1);
- }
- }
-}
-
-// Cuts the selected text to the clipboard.
-function cut() {
- formatText('cut', null);
-}
-
-// Deletes the selected text.
-function deleteText() {
- formatText('delete', null);
-}
-
-// Finds text.
-function findText(text, dir, options) {
- if (text == null || text == "") {
- return;
- }
- else {
- text = decodeString(text);
- }
-
- if (internalUpdateSelection()) {
- if (document.all) {
- selectionRange.collapse(dir < 0);
- if (selectionRange.findText(text, dir, options)) {
- selectionRange.scrollIntoView();
- selectionRange.select();
- selectionRange.collapse(dir < 0);
- setStatus(STATUS_EXEC_CMD, 1);
- }
- }
- else {
- // find(text, caseSensitive, backwards, wrapAround, wholeWord, searchInFrames, showDialog)
- var caseSensitive = true;
- var backwards = false;
- var wholeWord = true;
- if ((options & 4) == 0) caseSensitive = false;
- if (dir == -1) backwards = true;
- if ((options & 2) == 0) wholeWord = false;
-
- if ( wholeWord )
- {
- while ( contentWindow.find(text, caseSensitive, backwards, false, wholeWord, false, false) )
- {
- var ffSelection = contentWindow.getSelection();
- selectionRange = ffSelection.getRangeAt(0).cloneRange();
- if (selectionRange.startOffset > 0 )
- selectionRange.setStart(selectionRange.startContainer, selectionRange.startOffset -1);
- if (selectionRange.endOffset < selectionRange.endContainer.length )
- {
- selectionRange.setEnd(selectionRange.endContainer, selectionRange.endOffset+1);
- }
- var newText = selectionRange.toString();
- var regex = new RegExp("\\b"+text+"\\b");
-
- if ( newText.match(regex))
- {
- setStatus(STATUS_EXEC_CMD, 1);
- break;
- }
- }
- } else if ( contentWindow.find(text, caseSensitive, backwards, false, wholeWord, false, false) ) {
- setStatus(STATUS_EXEC_CMD, 1);
- }
- }
- }
-}
-
-// Sets the foreground color of the selected text.
-function foreColor(color) {
- if (color != null && color != '') {
- formatText('forecolor', color);
- }
-}
-
-// Formats the selected text using the given HTML heading tag.
-function formatBlock(tag) {
- if (tag != null && tag != '') {
- formatText('formatblock', tag);
- }
-}
-
-
-var INDENTED_LIST_BAD_HTML_IE = "</li>.*<li style=\"list-style: none\">";
-var INDENTED_LIST_BAD_HTML_MOZ = "</li>.*<li style=\"list-style-type: none; list-style-image: none; list-style-position: outside;\">";
-
-// Indents the selected text.
-function indent() {
- formatText('indent', null);
- // fix for sub-lists
- var html = document.getElementById(editorId).contentWindow.document.body.innerHTML;
- if (document.all) {
- html = html.replace(INDENTED_LIST_BAD_HTML_IE, "");
- } else {
- // firefox sometimes puts the same as IE, sometimes more junk
- html = html.replace(INDENTED_LIST_BAD_HTML_IE, "");
- html = html.replace(INDENTED_LIST_BAD_HTML_MOZ, "");
- }
- setText(html);
-}
-
-// Toggles the 'italic' attribute of the selected text.
-function italic() {
- formatText('italic', null);
-}
-
-// Center justifies the selected text.
-function justifyCenter() {
- formatText('justifycenter', null);
-}
-
-// Fully justifies the selected text.
-function justifyFull() {
- formatText('justifyfull', null);
-}
-
-// Left justifies the selected text.
-function justifyLeft() {
- formatText('justifyleft', null);
-}
-
-// Right justifies the selected text.
-function justifyRight() {
- formatText('justifyright', null);
-}
-
-// Outdents the selected text.
-function outdent() {
- formatText('outdent', null);
-}
-
-// Pastes text from the clipboard.
-function paste(sourceURL) {
- if (sourceURL == null) {
- sourceURL = "";
- }
- else {
- sourceURL = decodeString(sourceURL);
- }
- if (document.all) {
- var START_MARKER = "A_-_-_";
- var END_MARKER = ":.:.:";
- // mark img and <a /> links with START_MARKER + src/href + END_MARKER in the id, for later recovery
- var elements = editorDoc.getElementsByTagName('img');
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
- var id = element.id;
- element.id = START_MARKER + element.src + END_MARKER + id;
- }
- var elements = editorDoc.getElementsByTagName('a');
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
- var id = element.id;
- element.id = START_MARKER + element.href + END_MARKER + id;
- }
-
- // change the <base> of the document
- var oldBaseHREF = editorDoc.getElementsByTagName('base')[0].href;
- editorDoc.getElementsByTagName('base')[0].href = sourceURL;
-
- formatText('paste', null);
-
- // restore <base>
- editorDoc.getElementsByTagName('base')[0].href = oldBaseHREF;
- }
- else {
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
- }
- if (internalUpdateSelection()) {
- try {
- var regExRes = new RegExp("file\:([^=]+)(/resources/)(.+)", "g");
- var regExRef = new RegExp("(.+)(#.+)");
- var regEx = new RegExp("file\:([^=]+)/([^/]+)", "g");
- var regExID = new RegExp(START_MARKER + "(.*?)" + END_MARKER + "(.*?)");
- var elements = editorDoc.getElementsByTagName('img');
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
- var id = element.id;
- if (id != null && id != '') {
- RegExp.lastIndex=0;
- var matchArray = id.match(regExID);
- if (matchArray != null && matchArray.length > 1) {
- element.src = matchArray[1];
- if (matchArray.length > 2 && matchArray[2].length > 0) {
- element.id = matchArray[2];
- }
- else {
- element.removeAttribute('id');
- }
- continue;
- }
- }
- var src = element.src;
- if (src != null && src != '') {
- if (src.indexOf('about:./resources') != -1) {
- // fix for IE 7 when pasting from another RTE
- // IE7 resolves these as "about:./resources/<file>"
- // so remove the "about:."
- src = src.replace("about:", "");
- }
- if (src.indexOf('about:resources') != -1) {
- // fix for IE 7 when pasting from another RTE
- // IE7 sometimes resolves these as "about:resources/<file>"
- // so remove the "about:" and put in "./"
- src = src.replace("about:", "./");
- }
- if (src.indexOf('resources') != -1) {
- element.src = src.replace(regExRes, "./resources/$3");
- }
- else {
- element.src = src.replace(regEx, "./resources/$2");
- }
- }
- }
- var elements = editorDoc.getElementsByTagName('a');
- for (var i = 0; i < elements.length; i++) {
- var element = elements[i];
- var id = element.id;
- if (id != null && id != '') {
- RegExp.lastIndex=0;
- var matchArray = id.match(regExID);
- if (matchArray != null && matchArray.length > 1) {
- element.href = matchArray[1];
- if (matchArray.length > 2 && matchArray[2].length > 0) {
- element.id = matchArray[2];
- }
- else {
- element.removeAttribute('id');
- }
- continue;
- }
- }
- var href = element.href;
- if (href != null && href != '') {
- // fix self-referencing hrefs
- if (href.indexOf('#') != -1) {
- RegExp.lastIndex=0;
- var matchArray = href.match(regExRef);
- if (matchArray != null && matchArray.length > 2) {
- var hrefFile = matchArray[1];
- var ref = matchArray[2];
- if (hrefFile == sourceURL) {
- element.href = ref;
- continue;
- }
- }
- }
- // fix hrefs already in resources
- if (href.indexOf('resources') != -1) {
- element.href = href.replace(regExRes, "./resources/$3");
- }
- // fix hrefs not in resources
- else {
- element.href = href.replace(regEx, "./resources/$2");
- }
- }
- }
- }
- catch (e) {
- }
- }
-}
-
-// Redo the previous command.
-function redo() {
- formatText('redo', null);
-}
-
-// Redo the previous command.
-function removeFormat() {
- formatText('removeformat', null);
-}
-
-
-
-function _replaceAllText(findText, replaceText, options) {
- // this is IE only
- if (document.all) {
- var tempRange = document.getElementById(editorId).contentWindow.document.body.createTextRange();
- tempRange.moveStart('character', -10000000000);
- do {
- tempRange.collapse();
- if (tempRange.findText(findText, 10000000000, options)) {
- tempRange.text = replaceText;
- tempRange.select();
- } else {
- break;
- }
- } while (true);
- }
-}
-
-// Replaces all text.
-function replaceAllText(findText, replaceText, options) {
- if (readOnly || findText == null || findText == "") {
- return;
- }
- else {
- findText = decodeString(findText);
- }
- if (replaceText == null) {
- replaceText = "";
- }
- else {
- replaceText = decodeString(replaceText);
- }
-
- if (document.all) {
- // TODO: Move the insertion point to the start of the HTML
- // and perform a search and replace in the forward direction.
- _replaceAllText(findText, replaceText, options);
- }
- else {
- // TODO: Emulate the IE implementation.
- var html = document.getElementById(editorId).contentWindow.document.body.innerHTML;
- var optionStr = "/g";
- if ((options & 4) == 0) {
- optionStr += "i";
- }
- var regExp = eval("/" + findText + optionStr);
- html = html.replace(regExp, replaceText);
- setText(html);
- }
-
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
-}
-
-// Replaces text.
-function replaceText(replaceText, dir, options) {
- if (readOnly || !internalUpdateSelection()) {
- return;
- }
- if (replaceText == null) {
- replaceText = "";
- }
- else {
- replaceText = decodeString(replaceText);
- }
- if (document.all) {
- selectionRange.text = replaceText;
- if (replaceText != "") {
- selectionRange.moveStart("word", -1);
- selectionRange.select();
- selectionRange.collapse(dir < 0);
- }
- }
- else {
- selectionRange.deleteContents();
- selectionRange.insertNode(editorDoc.createTextNode(replaceText));
- }
- setStatus(STATUS_EXEC_CMD, 1);
- setStatus(STATUS_MODIFIED, null);
-}
-
-// Selects all text.
-function selectAll() {
- if (internalUpdateSelection()) {
- if (editorDoc.execCommand('selectall', false, null)) {
- if ( !document.all )
- {
- updateSelection();
- }
- setStatus(STATUS_EXEC_CMD, 1);
- }
- }
-}
-
-// Sets the font name for the selected text.
-function setFontName(name) {
- if (internalUpdateSelection()) {
- if (name != null) {
- if (name == '') {
- formatText('removeFormat');
- } else {
- formatText('fontname', name);
- }
- }
- }
-}
-
-// Sets the font size for the selected text.
-function setFontSize(size) {
- if (internalUpdateSelection()) {
- if (size != null) {
- if (size == '') {
- formatText('removeFormat');
- } else {
- formatText('fontsize', size);
- }
- }
- }
-}
-
-// Sets the font style for the selected text.
-function setFontStyle(style) {
- if (!readOnly && style != null && style != '' && internalUpdateSelection()) {
- try {
- if (document.all) {
- selectionRange.execCommand("removeformat");
- selectionRange.parentElement().removeAttribute("className");
- }
- }
- catch (e) {
- }
- if (style == "<quote>") {
- formatText('formatblock', '<p>');
- if (document.all) {
- selectionRange.parentElement().className = "quote";
- }
- else {
- selection.focusNode.parentNode.className = "quote";
- }
- }
- else if (style == "<code>") {
- formatText('formatblock', '<p>');
- if (document.all) {
- selectionRange.parentElement().className = "codeSample";
- }
- else {
- selection.focusNode.parentNode.className = "codeSample";
- }
- }
- else {
- if (!document.all && style == "<p>") {
- // A hack to get rid of the "className" attribute in Mozilla/Firefox.
- formatText('formatblock', '<h4>');
- }
- formatText('formatblock', style);
- }
- }
-}
-
-// Sets whether the content can be edited.
-function setEditable(editable) {
- var doc = document.getElementById(editorId).contentWindow.document;
- if (editable != null && editable == 'true') {
- if (document.all) {
- doc.body.contentEditable = "true";
- }
- else {
- doc.designMode = "on";
- }
- readOnly = false;
- }
- else {
- if (document.all) {
- doc.body.contentEditable = "false";
- }
- else {
- doc.designMode = "off";
- }
- readOnly = true;
- }
- setStatus(STATUS_EXEC_CMD, 1);
-}
-
-// Toggles the 'strike-through' attribute of the selected text.
-function strikeThrough() {
- formatText('strikethrough', size);
-}
-
-// Toggles the 'subscript' attribute of the selected text.
-function subscript() {
- formatText('subscript', null);
-}
-
-// Toggles the 'superscript' attribute of the selected text.
-function superscript() {
- formatText('superscript', null);
-}
-
-// Toggles the 'underline' attribute of the selected text.
-function underline() {
- formatText('underline', null);
-}
-
-// Converts a link to normal text.
-function unlink() {
- formatText('unlink', null);
-}
-
-function ObjToString(object) {
- var ret = "Object " + object.name + " is [\n";
- for (var prop in object) {
- ret += " " + prop + " is " + object[prop] + ";\n";
- }
- return ret + "]";
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.xsl b/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.xsl
deleted file mode 100644
index fc35948be50..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/rte/rte.xsl
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005, 2006 IBM Corporation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
- Contributors:
- IBM Corporation - initial implementation
--->
-
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-<xsl:template match="/rte">
- <xsl:variable name="rte_id"><xsl:value-of select="@id"/></xsl:variable>
- <xsl:variable name="rte_js"><xsl:value-of select="@js"/></xsl:variable>
- <html>
- <head>
- <script language="JavaScript" type="text/javascript" src="{$rte_js}"></script>
- </head>
- <body leftMargin="0" topMargin="0" marginheight="0" marginwidth="0" scroll="no" style="overflow: hidden">
- <iframe id="{$rte_id}" name="{$rte_id}" style="border: none;" frameborder="0" scrolling="auto" width="100%" height="100%"></iframe>
- <script language="JavaScript" type="text/javascript">
- initEditor('<xsl:value-of select="@id"/>', '<xsl:value-of select="@css"/>', '<xsl:value-of select="@baseURL"/>');
- </script>
- </body>
- </html>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichText.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichText.java
deleted file mode 100644
index 68d20796988..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichText.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.epf.richtext;
-
-import java.net.URL;
-import java.util.Iterator;
-
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.HelpListener;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * The interface for a rich text control.
- * <p>
- * A rich text control is an editable user interface object that displays rich
- * text and images.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public interface IRichText {
-
- public static final String PROPERTY_NAME = "richText"; //$NON-NLS-1$
-
- /**
- * Returns this rich text control.
- *
- * @return this rich text control
- */
- public Control getControl();
-
- /**
- * Sets the layout data.
- *
- * @param layoutData
- * the layout data to set
- */
- public void setLayoutData(Object layoutData);
-
- /**
- * Returns the layout data.
- *
- * @return this control's layout data
- */
- public Object getLayoutData();
-
- /**
- * Sets focus to this control.
- */
- public void setFocus();
-
- /**
- * Tells the control it does not have focus.
- */
- public void setBlur();
-
- /**
- * Checks whether this control has focus.
- *
- * @return <code>true</code> if this control has the user-interface focus
- */
- public boolean hasFocus();
-
- /**
- * Returns the base path used for resolving text and image links.
- *
- * @return the base path used for resolving links in this control
- */
- public String getBasePath();
-
- /**
- * Returns the editable state.
- *
- * @return <code>true</code> if the content is ediatble
- */
- public boolean getEditable();
-
- /**
- * Sets the editable state.
- *
- * @param editable
- * the editable state
- */
- public void setEditable(boolean editable);
-
- /**
- * Checks whether the content has been modified.
- *
- * @return <code>true</code> if the content has been modified
- */
- public boolean getModified();
-
- /**
- * Sets the modified state.
- *
- * @param modified
- * the modified state
- */
- public void setModified(boolean modified);
-
- /**
- * Returns the rich text content.
- *
- * @return the rich text content formatted in a markup language
- */
- public String getText();
-
- /**
- * Sets the rich text content.
- *
- * @param text
- * the rich text content formatted in a markup language
- */
- public void setText(String text);
-
- /**
- * Restores the rich text content back to the initial value.
- */
- public void restoreText();
-
- /**
- * Checks whether the editor content has been modified. If it has been
- * modified, notify the modify listeners.
- */
- public void checkModify();
-
- /**
- * Returns an object that describes the current selection
- *
- * @return a <code>RichTextSelection</code> object
- */
- public RichTextSelection getSelected();
-
- /**
- * Returns an application specific property value.
- *
- * @param key
- * the name of the property
- * @return the value of the property or <code>null</code> if it has not
- * been set
- */
- public Object getData(String key);
-
- /**
- * Sets an application specific property name and value.
- *
- * @param key
- * the name of the property
- * @param value
- * the property value
- */
- public void setData(String key, Object value);
-
- /**
- * Executes the given rich text command. The supported command strings are
- * defined in <code>RichTextCommand<code>.
- *
- * @param command a rich text command string
- * @return a status code returned by the executed command
- */
- public int executeCommand(String command);
-
- /**
- * Executes the given rich text command with a single parameter. The
- * supported command strings are defined in <code>RichTextCommand<code>.
- *
- * @param command a rich text command string
- * @param param a parameter for the command or <code>null</code>
- * @return a status code returned by the executed command
- */
- public int executeCommand(String command, String param);
-
- /**
- * Executes the given rich text command with an array of parameters. The
- * supported command strings are defined in <code>RichTextCommand<code>.
- *
- * @param command a rich text command string
- * @param params an array of parameters for the command or <code>null</code>
- * @return a status code returned by the executed command
- */
- public int executeCommand(String command, String[] params);
-
- /**
- * Returns the modify listeners attached to this control.
- *
- * @return an iterator for retrieving the modify listeners
- */
- public Iterator<ModifyListener> getModifyListeners();
-
- /**
- * Adds a listener to the collection of listeners who will be notified when
- * keys are pressed and released within this control.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addKeyListener(KeyListener listener);
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when keys are pressed and released within this control.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeKeyListener(KeyListener listener);
-
- /**
- * Adds a listener to the collection of listeners who will be notified when
- * the content of this control is modified.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addModifyListener(ModifyListener listener);
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when the content of this control is modified.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeModifyListener(ModifyListener listener);
-
- /**
- * Adds the listener to the collection of listeners who will be notifed when
- * this control is disposed.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addDisposeListener(DisposeListener listener);
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when this control is disposed.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeDisposeListener(DisposeListener listener);
-
- /**
- * Adds a listener to the collection of listeners who will be notified when
- * help events are generated for this control.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addHelpListener(HelpListener listener);
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when help events are generated for this control.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeHelpListener(HelpListener listener);
-
- /**
- * Adds the listener to the collection of listeners who will be notifed when
- * an event of the given type occurs within this control.
- *
- * @param eventType
- * the type of event to listen for
- * @param listener
- * the listener which should be notified when the event occurs
- */
- public void addListener(int eventType, Listener listener);
-
- /**
- * Removes the listener from the collection of listeners who will be notifed
- * when an event of the given type occurs within this econtrol.
- *
- * @param eventType
- * the type of event to listen to
- * @param listener
- * the listener which should no longer be notified when the event
- * occurs
- */
- public void removeListener(int eventType, Listener listener);
-
- /**
- * Notifies the modify listeners
- *
- */
- public void notifyModifyListeners();
-
- /**
- * Returns the event listeners attached to this control.
- *
- * @return an iterator for retrieving the event listeners attached to this
- * control
- */
- public Iterator<RichTextListener> getListeners();
-
- /**
- * Returns the base URL of the rich text control whose content was last
- * copied to the clipboard.
- *
- * @return the base URL of a rich text control
- */
- public URL getCopyURL();
-
- /**
- * Sets the base URL of the rich text control whose content was last copied
- * to the clipboard.
- */
- public void setCopyURL();
-
- /**
- * Disposes the operating system resources allocated by this control.
- */
- public void dispose();
-
- /**
- * Checks whether this control has been disposed.
- *
- * @return <code>true</code> if this control is disposed successfully
- */
- public boolean isDisposed();
-
- /**
- *
- * @return the control's FindReplaceAction
- */
- public FindReplaceAction getFindReplaceAction();
-
- /**
- * Sets the FindReplaceAction to use
- * @param findReplaceAction
- */
- public void setFindReplaceAction(FindReplaceAction findReplaceAction);
-
- /**
- * Sets the initialText variable, which stores what is saved on disk
- * @param text
- */
- public void setInitialText(String text);
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextEditor.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextEditor.java
deleted file mode 100644
index 9905e7578f8..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextEditor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.epf.richtext;
-
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-
-/**
- * The interface for a rich text editor.
- * <p>
- * A rich text editor is a composite user interface object that includes a tool
- * bar, a tab folder for entering the rich text content, and a tab folder for
- * viewing and modifying the rich text content in a markup language.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IRichTextEditor extends IRichText {
-
- /**
- * Fills the tool bar with rich text action items.
- *
- * @param toolBar
- * a rich text editor tool bar
- */
- public void fillToolBar(IRichTextToolBar toolBar);
-
- /**
- * Selects the rich text or the markup language tab.
- *
- * @param index
- * <code>0</code> for the rich text tab, <code>1</code> for
- * the markup language tab
- */
- public void setSelection(int index);
-
- /**
- * Sets the FindReplaceAction to use
- * @param findReplaceAction
- */
- public void setFindReplaceAction(FindReplaceAction findReplaceAction);
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextToolBar.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextToolBar.java
deleted file mode 100644
index fa8b434f715..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/IRichTextToolBar.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.epf.richtext.actions.RichTextComboAction;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.ToolBarManager;
-
-/**
- * The interface for a rich text editor toolbar.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IRichTextToolBar {
-
-
- /**
- * Adds a button action to the tool bar.
- *
- * @param action
- * the button action to add
- */
- public void addAction(IAction action);
-
- /**
- * Adds a combo action to the tool bar.
- *
- * @param action
- * the combo action to add
- */
- public void addAction(RichTextComboAction item);
-
- /**
- * Adds a separator to the tool bar.
- */
- public void addSeparator();
-
- /**
- * Updates the toolbar state.
- * <p>
- * Enables/disables actions depending on the currently selected
- * RichTextEditor tab (RichText vs. HTML)
- *
- * @param editable specifies whether to enable non-ReadOnly commands
- */
- public void updateToolBar(boolean enabled);
-
- /**
- *
- * @return the toolbar manager
- */
- public ToolBarManager getToolbarMgr();
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Messages.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Messages.java
deleted file mode 100644
index c3b3dd6d417..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Messages.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The RichText resources.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public final class Messages extends NLS {
-
- static {
- NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$
- }
-
- private Messages() {
- }
-
- public static String fontNameAction_CSS_Default;
- public static String fontNameAction_CSS_Default_Mozilla;
- public static String fontNameAction_DefaultFontName;
- public static String fontStyle_normal;
- public static String fontStyle_sectionHeading;
- public static String fontStyle_subsectionHeading;
- public static String fontStyle_subSubsectionHeading;
- public static String fontStyle_quote;
- public static String fontStyle_codeSample;
- public static String blockTag_paragraph;
- public static String blockTag_heading1;
- public static String blockTag_heading2;
- public static String blockTag_heading3;
- public static String blockTag_heading4;
- public static String blockTag_heading5;
- public static String blockTag_heading6;
- public static String blockTag_address;
- public static String blockTag_preformattedText;
- public static String fontName_default;
- public static String fontName_arial;
- public static String fontName_courierNew;
- public static String fontName_timesNewRoman;
- public static String fontName_verdana;
- public static String addHorizontalBarAction_toolTipText;
- public static String addImageAction_toolTipText;
- public static String addLineAction_toolTipText;
- public static String addLinkAction_toolTipText;
- public static String addOrderedListAction_toolTipText;
- public static String addTableAction_toolTipText;
- public static String addUnorderedListAction_toolTipText;
- public static String boldAction_toolTipText;
- public static String clearContentAction_toolTipText;
- public static String copyAction_toolTipText;
- public static String cutAction_toolTipText;
- public static String findReplaceAction_toolTipText;
- public static String indentAction_toolTipText;
- public static String italicAction_toolTipText;
- public static String justifyCenterAction_toolTipText;
- public static String justifyFullAction_toolTipText;
- public static String justifyLeftAction_toolTipText;
- public static String justifyRightAction_toolTipText;
- public static String outdentAction_toolTipText;
- public static String pasteAction_toolTipText;
- public static String pastePlainTextAction_toolTipText;
- public static String subscriptAction_toolTipText;
- public static String superscriptAction_toolTipText;
- public static String underlineAction_toolTipText;
- public static String fontStyleAction_toolTipText;
- public static String blockTagAction_toolTipText;
- public static String fontNameAction_toolTipText;
- public static String fontSizeAction_toolTipText;
- public static String cutAction_text;
- public static String copyAction_text;
- public static String pasteAction_text;
- public static String pastePlainTextAction_text;
- public static String richTextTab_text;
- public static String richTextTab_toolTipText;
- public static String htmlTab_text;
- public static String htmlTab_toolTipText;
- public static String addImageDialog_title;
- public static String addLinkDialog_title;
- public static String addTableDialog_title;
- public static String findReplaceDialog_title;
- public static String urlDisplayNameLabel_text;
- public static String urlLabel_text;
- public static String summaryLabel_text;
- public static String captionLabel_text;
- public static String rowsLabel_text;
- public static String columnsLabel_text;
- public static String widthLabel_text;
- public static String tableStyleLabel_text;
- public static String tableHeaderNone_text;
- public static String tableHeaderCols_text;
- public static String tableHeaderRows_text;
- public static String tableHeaderBoth_text;
- public static String browseButton_text;
- public static String clearContentDialog_title;
- public static String clearContentDialog_text;
- public static String findLabel_text;
- public static String replaceLabel_text;
- public static String optionsGroup_text;
- public static String caseSensitiveCheckbox_text;
- public static String wholeWordCheckbox_text;
- public static String directionGroup_text;
- public static String forwardRadioButton_text;
- public static String backwardRadioButton_text;
- public static String findButton_text;
- public static String replaceButton_text;
- public static String replaceFindButton_text;
- public static String replaceallButton_text;
- public static String FindReplace_Status_noMatch_label;
- public static String maxCharsPerLineLabel_text;
- public static String indentHTMLCheckbox_text;
- public static String indentSizeLabel_text;
- public static String tidy_clean_text;
- public static String tidy_cleaner_text;
- public static String tidy_cleanest_text;
- public static String tidy_clean_toolTipText;
- public static String tidy_cleaner_toolTipText;
- public static String tidy_cleanest_toolTipText;
- public static String addCodeAction_toolTipText;
- public static String addCodeDialog_title;
- public static String addCodeDialog_Msg;
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Resources.properties b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Resources.properties
deleted file mode 100644
index 1eeeb7bc043..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/Resources.properties
+++ /dev/null
@@ -1,160 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#-------------------------------------------------------------------------------
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial implementation.
-#-------------------------------------------------------------------------------
-# NLS_MESSAGEFORMAT_VAR
-
-################################################################################
-# BEGIN NO TRANSLATION
-###############################################################################
-# !! DO NOT TRANSLATE THE FOLLOWING LINE !!
-fontNameAction_CSS_Default=arial, helvetica, sans-serif
-# !! DO NOT TRANSLATE THE FOLLOWING LINE !!
-fontNameAction_CSS_Default_Mozilla=arial,helvetica,sans-serif
-################################################################################
-# END NO TRANSLATION
-################################################################################
-
-
-
-# Font Style Names
-fontStyle_normal=Normal
-fontStyle_sectionHeading=Section Heading
-fontStyle_subsectionHeading=Subsection Heading
-fontStyle_subSubsectionHeading=Sub Subsection Heading
-fontStyle_quote=Quote
-fontStyle_codeSample=Code Sample
-
-# HTML Block Tags
-blockTag_paragraph=Paragraph
-blockTag_heading1=Heading 1
-blockTag_heading2=Heading 2
-blockTag_heading3=Heading 3
-blockTag_heading4=Heading 4
-blockTag_heading5=Heading 5
-blockTag_heading6=Heading 6
-blockTag_address=Address
-blockTag_preformattedText=Preformatted Text
-
-# HTML Font Names
-fontName_default=Default
-fontName_arial=Arial
-fontName_courierNew=Courier New
-fontName_timesNewRoman=Times New Roman
-fontName_verdana=Verdana
-
-# Rich Text Editor Tool Buttons
-addHorizontalBarAction_toolTipText=Add Horizontal Bar
-addImageAction_toolTipText=Add Image
-addLineAction_toolTipText=Add Line
-addLinkAction_toolTipText=Add Link
-addOrderedListAction_toolTipText=Add Ordered List
-addTableAction_toolTipText=Add Table
-addUnorderedListAction_toolTipText=Add Unordered List
-boldAction_toolTipText=Bold
-clearContentAction_toolTipText=Clear Content
-copyAction_toolTipText=Copy
-cutAction_toolTipText=Cut
-findReplaceAction_toolTipText=Find/Replace
-indentAction_toolTipText=Indent
-italicAction_toolTipText=Italic
-justifyCenterAction_toolTipText=Justify Center
-justifyFullAction_toolTipText=Justify Full
-justifyLeftAction_toolTipText=Justify Left
-justifyRightAction_toolTipText=Justify Right
-outdentAction_toolTipText=Outdent
-pasteAction_toolTipText=Paste
-pastePlainTextAction_toolTipText=Paste as plain text
-subscriptAction_toolTipText=Subscript
-superscriptAction_toolTipText=Superscript
-underlineAction_toolTipText=Underline
-tidy_clean_text=Default Clean
-tidy_cleaner_text=Clean MS HTML
-tidy_cleanest_text=Clean Word 2000 HTML
-tidy_clean_toolTipText=Clean with JTidy using default options
-tidy_cleaner_toolTipText=Clean HTML of MS HTML
-tidy_cleanest_toolTipText=Clean Word 2000 HTML
-addCodeAction_toolTipText=Insert custom html (javascript or video)
-
-# Rich Text Editor Comboboxes
-fontStyleAction_toolTipText=Set Font Style
-blockTagAction_toolTipText=Set Block Tag
-fontNameAction_toolTipText=Set Font
-fontNameAction_DefaultFontName=Default font
-fontSizeAction_toolTipText=Set Font Size
-
-# Rich Text Editor Context Menu Items
-cutAction_text=&Cut
-copyAction_text=C&opy
-pasteAction_text=&Paste
-pastePlainTextAction_text=Paste &as plain text
-
-# Rich Text Editor Tabs
-richTextTab_text=Rich Text
-richTextTab_toolTipText=Edit content in rich text
-htmlTab_text=HTML
-htmlTab_toolTipText=Edit content in HTML
-
-# Add Dialogs
-addImageDialog_title=Add Image
-addLinkDialog_title=Add Link
-addTableDialog_title=Add Table
-findReplaceDialog_title=Find/Replace
-urlLabel_text=URL:
-summaryLabel_text=Summary:
-captionLabel_text=Caption:
-rowsLabel_text=Rows:
-columnsLabel_text=Columns:
-widthLabel_text=Width:
-tableStyleLabel_text=Style:
-tableHeaderNone_text=Table with no headers
-tableHeaderCols_text=Table with column headers
-tableHeaderRows_text=Table with row headers
-tableHeaderBoth_text=Table with column and row headers
-browseButton_text=Browse...
-addCodeDialog_title=Insert Custom Html
-addCodeDialog_Msg=Input your html for javascript or video:
-
-# Clear Editor Content Dialog
-clearContentDialog_title=Clear Editor Content Confirmation
-clearContentDialog_text=Do you really want to clear the content of this rich text editor?
-
-# Find/Replace Dialog
-findLabel_text=Find:
-replaceLabel_text=Replace with:
-optionsGroup_text=Options
-caseSensitiveCheckbox_text=Case sensitive
-wholeWordCheckbox_text=Whole word
-directionGroup_text=Direction
-forwardRadioButton_text=Forward
-backwardRadioButton_text=Backward
-findButton_text=Find
-replaceButton_text=Replace
-replaceFindButton_text=Replace/Find
-replaceallButton_text=Replace All
-# taken from org.eclipse.ui.workbench.texteditor
-FindReplace_Status_noMatch_label=String Not Found
-
-# Preference Page
-maxCharsPerLineLabel_text=Maximum characters per line:
-indentHTMLCheckbox_text=Indent HTML tags
-indentSizeLabel_text=Indent Size:
-urlDisplayNameLabel_text=URL Display Name:
-
-
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichText.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichText.java
deleted file mode 100644
index b0ec1071064..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichText.java
+++ /dev/null
@@ -1,1671 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import java.io.File;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.common.IHTMLFormatter;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.common.utils.ExtensionHelper;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.XMLUtil;
-import org.eclipse.epf.common.xml.XSLTProcessor;
-import org.eclipse.epf.richtext.actions.CopyAction;
-import org.eclipse.epf.richtext.actions.CutAction;
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-import org.eclipse.epf.richtext.actions.PasteAction;
-import org.eclipse.epf.richtext.actions.PastePlainTextAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.LocationAdapter;
-import org.eclipse.swt.browser.LocationEvent;
-import org.eclipse.swt.browser.StatusTextEvent;
-import org.eclipse.swt.browser.StatusTextListener;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.HelpListener;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MenuListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The default rich text control implementation.
- * <p>
- * The default rich text editor uses XHTML as the underlying markup language for
- * the rich text content. It is implemented using a SWT <code>Browser</code>
- * control and DHTML (HTML, CSS and JavaScript).
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class RichText implements IRichText {
-
- // Encoded single quote. All single quotes need to be specially encoded to
- // avoid JavaScript error when calling Browse.executeCommand().
- private static final String ENCODED_SINGLE_QUOTE = "%sq%"; //$NON-NLS-1$
-
- private static final String ENCODED_NEWLINE = "%EOL%"; //$NON-NLS-1$
-
- protected static final String STATUS_PREFIX = "$$$"; //$NON-NLS-1$
-
- protected static final int STATUS_PREFIX_LENGTH = STATUS_PREFIX.length();
-
- protected static final int STATUS_NOP = 0;
-
- protected static final int STATUS_INITIALIZED = 1;
-
- protected static final int STATUS_MODIFIED = 2;
-
- protected static final int STATUS_GET_TEXT = 3;
-
- protected static final int STATUS_KEY_DOWN = 4;
-
- protected static final int STATUS_KEY_UP = 5;
-
- protected static final int STATUS_SELECT_TEXT = 6;
-
- protected static final int STATUS_SELECT_CONTROL = 7;
-
- protected static final int STATUS_SELECT_NONE = 8;
-
- protected static final int STATUS_EXEC_CMD = 9;
-
- protected static final int STATUS_REFORMAT_LINKS = 10;
-
- // The default base path used for resolving links (<href>, <img>, etc.)
- private static final String DEFAULT_BASE_PATH = System
- .getProperty("user.home") //$NON-NLS-1$
- + System.getProperty("file.separator") + "rte"; //$NON-NLS-1$ //$NON-NLS-2$
-
- // If true, log debugging info.
- protected boolean debug;
-
- // The plug-in logger.
- protected Logger logger;
-
- // The underlying SWT Browser used for loading the JavaScript/DHTML editor.
- protected Browser editor;
-
- // The underlying OleControlSite for the SWT Browser (Win32 only).
- protected Control editorControl;
-
- // The base URL of the rich text control whose content was last
- // copied to the clipboard.
- protected static URL copyURL;
-
- // The context menu associated with this control.
- protected Menu contextMenu;
-
- // The folder that contains the supporting CSS and JavaScript files
- protected String rteFolder;
-
- // The URL that points to the supporting CSS and JavaScript files.
- protected String rteURL;
-
- // The base path used for resolving links (<href>, <img>, etc.)
- protected String basePath;
-
- // The DHTML initialization flag.
- protected boolean initialized;
-
- // The initial focus.
- protected boolean initializedWithFocus;
-
- // The control's initial text. This is used to cache the HTML source passed
- // in via setText()while the DHTML initialization is happening.
- protected String initialText;
-
- // The control's current text.
- protected String currentText = ""; //$NON-NLS-1$
-
- // The control's editable flag.
- protected boolean editable = true;
-
- // The control's modification flag.
- protected boolean modified;
-
- // The control's text and object selection flag.
- protected boolean hasSelection;
-
- // The control's text selection
- protected RichTextSelection richTextSelection = new RichTextSelection();
-
- // JavaScript command execution status code.
- protected int status = 0;
-
- // The HTML source formatter.
- protected IHTMLFormatter htmlFormatter;
-
- // The SWT event listeners.
- protected Map<Listener, RichTextListener> listeners;
-
- // The modify listeners.
- protected List<ModifyListener> modifyListeners;
-
- // The control's edit flag.
- protected boolean notifyingModifyListeners = false;
-
- // The controls's focus flag.
- protected boolean hasFocus = false;
-
- // The controls's processing JavaScript event flag.
- protected boolean processingJSEvent = false;
-
- // The controls's processing MODIFIED JavaScript event flag.
- protected boolean checkingModifyEvent = false;
-
- // The control's find/replace text action
- protected FindReplaceAction findReplaceAction;
-
- // The control's IE flag
- protected boolean isIE = false;
-
- // A event type indicate control has been initialized
- public static final int RICH_TEXT_INITIALIZED_WIN32 = 98979695;
- public static final int RICH_TEXT_INITIALIZED_LINUX = 98979694;
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent composite
- * @param style
- * the style for this control
- * @param basePath
- * the path used for resolving links
- */
- public RichText(Composite parent, int style, String basePath) {
- debug = RichTextPlugin.getDefault().isDebugging();
- logger = RichTextPlugin.getDefault().getLogger();
- findReplaceAction = new FindReplaceAction(this);
- rteFolder = RichTextPlugin.getDefault().getInstallPath() + "rte/"; //$NON-NLS-1$
- rteURL = XMLUtil.escape("file://" + rteFolder); //$NON-NLS-1$
- setBasePath(basePath);
-
- try {
- editor = new Browser(parent, SWT.NONE);
- if (debug) {
- printDebugMessage("RichText", "basePath=" + basePath); //$NON-NLS-1$ //$NON-NLS-2$
- }
- editor.setLayoutData(new GridData(GridData.FILL_BOTH));
- editor.setData(PROPERTY_NAME, this);
- init(parent, style);
- } catch (Exception e) {
- editor = null;
- String msg = "Failed to create RichText with basePath=" + basePath; //$NON-NLS-1$
- logger.logError(msg, e);
- if (debug) {
- System.out.println(msg);
- e.printStackTrace();
- }
- }
- }
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent composite
- * @param style
- * the style for this control
- */
- public RichText(Composite parent, int style) {
- this(parent, style, null);
- }
-
- /**
- * Sets the base path for resolving links.
- */
- protected void setBasePath(String path) {
- if (path != null && path.length() > 0) {
- if (path.startsWith(FileUtil.UNC_PATH_PREFIX)) {
- basePath = FileUtil.UNC_PATH_PREFIX
- + FileUtil.appendSeparator(path.substring(
- FileUtil.UNC_PATH_PREFIX_LENGTH).replace('\\',
- '/'), "/"); //$NON-NLS-1$
- } else {
- basePath = FileUtil.appendSeparator(path).replace('\\', '/');
- }
- } else {
- basePath = FileUtil.appendSeparator(DEFAULT_BASE_PATH).replace(
- '\\', '/');
- }
- }
-
- /**
- * Initializes this control.
- *
- * @param parent
- * the parent composite
- * @param style
- * the style for this control
- * @throws Exception
- * when an error has occurred while initialzing this control
- */
- protected void init(Composite parent, int style) throws Exception {
- try {
- addStatusTextListener();
-
- // Bug 244838 : Enforce Browser resizing when its container is resized
- editor.addControlListener(new ControlAdapter() {
- @Override
- public void controlResized(ControlEvent e) {
- if (!Platform.getOS().equals("win32")) { //$NON-NLS-1$
- // Workaround Mozilla'a IFRAME height issue.
- executeCommand(RichTextCommand.SET_HEIGHT, "" + editor.getBounds().height); //$NON-NLS-1$
- }
- }
- });
-
- if (debug) {
- printDebugMessage("init", "added status text listener"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- String editorHTML = generateEditorHTML();
- if (debug) {
- printDebugMessage("init", "generated editor HTML"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- editor.setText(editorHTML);
- if (debug) {
- printDebugMessage("init", "loaded editor HTML"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- contextMenu = new Menu(parent.getShell(), SWT.POP_UP);
- editor.setMenu(contextMenu);
- fillContextMenu(contextMenu);
- if (debug) {
- printDebugMessage("init", "added context menu"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- addListeners();
- if (debug) {
- printDebugMessage("init", "added listeners"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-// htmlFormatter = new HTMLFormatter();
- htmlFormatter = (IHTMLFormatter) ExtensionHelper.createExtensionForJTidy(
- CommonPlugin.getDefault().getId(), "htmlFormatter"); //$NON-NLS-1$
- if (debug) {
- printDebugMessage("init", "instantiated HTMLFormatter"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } catch (Exception e) {
- editor = null;
- dispose();
- throw e;
- }
- }
-
- /**
- * Returns this rich text control.
- *
- * @return this rich text control
- */
- public Control getControl() {
- return editor;
- }
-
- /**
- * Sets the layout data.
- *
- * @param layoutData
- * the layout data to set
- */
- public void setLayoutData(Object layoutData) {
- if (editor != null) {
- editor.setLayoutData(layoutData);
- }
- }
-
- /**
- * Returns the layout data.
- *
- * @return this control's layout data
- */
- public Object getLayoutData() {
- if (editor != null) {
- return editor.getLayoutData();
- }
- return null;
- }
-
- /**
- * Sets focus to this control.
- */
- public void setFocus() {
- if (debug) {
- printDebugMessage("setFocus, editable=" + editable); //$NON-NLS-1$
- }
- if (editor != null) {
- if (initialized) {
- if (!editor.isFocusControl()) {
- if (!Platform.getOS().equals("win32")) { //$NON-NLS-1$
- // Workaround for Mozilla and Firefox rich text editor focus
- // issue.
- editor.setFocus();
- }
- executeCommand(RichTextCommand.SET_FOCUS);
- }
- hasFocus = true;
- } else {
- initializedWithFocus = true;
- }
- }
- }
-
- /**
- * Tells the control it does not have focus.
- */
- public void setBlur() {
- if (debug) {
- printDebugMessage("setBlur, editable=" + editable); //$NON-NLS-1$
- }
- if (editor != null) {
- if (initialized) {
- hasFocus = false;
- } else {
- initializedWithFocus = false;
- }
- }
- }
-
- /**
- * Checks whether this control has focus.
- *
- * @return <code>true</code> if this control has the user-interface focus
- */
- public boolean hasFocus() {
- if (editor != null) {
- return hasFocus;
- }
- return false;
- }
-
- /**
- * Returns the base path used for resolving text and image links.
- *
- * @return the base path used for resolving links in this control
- */
- public String getBasePath() {
- return basePath;
- }
-
- /**
- * Returns the base URL of the rich text control whose content was last
- * copied to the clipboard.
- *
- * @return the base URL of a rich text control
- */
- public URL getCopyURL() {
- return copyURL;
- }
-
- /**
- * Sets the base URL of the rich text control whose content was last copied
- * to the clipboard.
- */
- public void setCopyURL() {
- try {
- copyURL = new File(basePath).toURL();
- } catch (Exception e) {
- copyURL = null;
- }
- }
-
- /**
- * Returns the editable state.
- *
- * @return <code>true</code> if the content is editable
- */
- public boolean getEditable() {
- return editable;
- }
-
- /**
- * Sets the editable state.
- *
- * @param editable
- * the editable state
- */
- public void setEditable(boolean editable) {
- this.editable = editable;
- if (initialized) {
- executeCommand(RichTextCommand.SET_EDITABLE, "" + editable); //$NON-NLS-1$
- }
- }
-
- /**
- * Checks whether the content has been modified.
- *
- * @return <code>true</code> if the content has been modified
- */
- public boolean getModified() {
- return modified;
- }
-
- /**
- * Sets the modified state.
- *
- * @param modified
- * the modified state
- */
- public void setModified(boolean modified) {
- this.modified = modified;
- }
-
- /**
- * Returns the rich text content.
- *
- * @return the rich text content formatted in a markup language
- */
- public String getText() {
- if (editor != null && initialized) {
- try {
- executeCommand(RichTextCommand.GET_TEXT);
- if (currentText != null && currentText.length() > 0) {
- currentText = currentText.replaceAll(
- "<P>&nbsp;</P>", "<br/>"); //$NON-NLS-1$ //$NON-NLS-2$
- currentText = tidyText(currentText);
- currentText = formatHTML(currentText);
- } else {
- currentText = ""; //$NON-NLS-1$
- }
- if (debug) {
- printDebugMessage("getText", "text=", currentText); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return currentText;
- } catch (Exception e) {
- logger.logError(e);
- }
- }
- return ""; //$NON-NLS-1$
- }
-
- protected String formatHTML(String text) {
- String formattedText;
- try {
- // Call JTidy to format the source to XHTML.
- formattedText = htmlFormatter.formatHTML(text);
- if (htmlFormatter.getLastErrorStr() != null) {
- logger.logError(htmlFormatter.getLastErrorStr());
- }
- return formattedText;
- } catch (UnsupportedEncodingException e) {
- logger.logError(e);
- }
- return text;
- }
-
- /**
- * Sets the rich text content.
- *
- * @param text
- * the rich text content formatted in a markup language
- */
- public void setText(String text) {
- if (editor != null) {
- if (debug) {
- printDebugMessage("setText", "text=", text); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- String newText = text;
- if (newText != null) {
- newText = tidyText(newText);
- // Call JTidy to format the source to XHTML.
- newText = formatHTML(newText);
- } else {
- newText = ""; //$NON-NLS-1$
- }
-
- if (initialized) {
- modified = !newText.equals(currentText);
- }
- initialText = newText;
- if (initialText.equals("") && !isIE) { //$NON-NLS-1$
- initialText = "<br />"; //$NON-NLS-1$
- }
-
- if (debug) {
- printDebugMessage(
- "setText", "modified=" + modified + ", newText=", newText); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- if (initialized) {
- try {
- executeCommand(RichTextCommand.SET_TEXT, workaroundForObjectParamNode(newText));
- executeCommand(RichTextCommand.SET_EDITABLE, "" + editable); //$NON-NLS-1$
- } catch (Exception e) {
- logger.logError(e);
- }
- }
-
- currentText = newText;
- }
- }
-
- /**
- * Restores the rich text content back to the initial value.
- */
- public void restoreText() {
- setText(initialText);
- modified = false;
- }
-
- /**
- * Returns the currently selected text.
- *
- * @return the selected text or <code>""</code> if there is no
- * hasSelection
- */
- public String getSelectedText() {
- // executeCommand(RichTextCommand.GET_SELECTED_TEXT);
- return richTextSelection.getText();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.epf.richtext.IRichText#getSelected()
- */
- public RichTextSelection getSelected() {
- return richTextSelection;
- }
-
- /**
- * Returns an application specific property value.
- *
- * @param key
- * the name of the property
- * @return the value of the property or <code>null</code> if it has not
- * been set
- */
- public Object getData(String key) {
- if (editor != null) {
- return editor.getData(key);
- }
- return null;
- }
-
- /**
- * Sets an application specific property name and value.
- *
- * @param key
- * the name of the property
- * @param value
- * the property value
- */
- public void setData(String key, Object value) {
- if (editor != null) {
- editor.setData(key, value);
- }
- }
-
- /**
- * Executes the given JavaScript.
- *
- * @param script
- * the JavaScript to execute
- * @return a status code returned by the executed script
- */
- protected int execute(final String script) {
- status = 0;
- if (editor != null && script != null && script.length() > 0) {
- try {
- if (!isIE && processingJSEvent) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- if (!isDisposed()) {
- editor.execute(script);
- if (!Platform.getOS().equals(Platform.OS_WIN32)) {
- if (script.startsWith(RichTextCommand.SET_TEXT)) {
- notifyListeners(RichText.RICH_TEXT_INITIALIZED_LINUX, new Event());
- }
- }
- }
- }
- });
- } else {
- editor.execute(script);
- }
- if (debug) {
- printDebugMessage("execute", script); //$NON-NLS-1$
- }
- } catch (Exception e) {
- String msg = "Failed to execute " + script; //$NON-NLS-1$
- logger.logError(msg, e);
- if (debug) {
- printDebugMessage("execute", msg); //$NON-NLS-1$
- e.printStackTrace();
- }
- }
- }
- return status;
- }
-
- /**
- * Executes the given rich text command. The supported command strings are
- * defined in <code>RichTextCommand<code>.
- *
- * @param command a rich text command string.
- * @return a status code returned by the executed command
- */
- public int executeCommand(String command) {
- status = 0;
- if (command != null && command.equals(RichTextCommand.CLEAR_CONTENT)) {
- String oldInitialText = initialText;
- setText(""); //$NON-NLS-1$
- initialText = oldInitialText;
- status = 1;
- modified = true;
- notifyModifyListeners();
- } else {
- status = execute(command + "();"); //$NON-NLS-1$
- }
- return status;
- }
-
- /**
- * Executes the given rich text command with a single parameter. The
- * supported command strings are defined in <code>RichTextCommand<code>.
- *
- * @param command a rich text command string
- * @param param a parameter for the command or <code>null</code>
- * @return a status code returned by the executed command
- */
- public int executeCommand(String command, String param) {
- if (param == null) {
- return executeCommand(command);
- }
- return execute(command + "('" + formatText(param) + "');"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Executes the given rich text command with an array of parameters. The
- * supported command strings are defined in <code>RichTextCommand<code>.
- *
- * @param command a rich text command string
- * @param params an array of parameters for the command or <code>null</code>
- * @return a status code returned by the executed command
- */
- public int executeCommand(String command, String[] params) {
- if (params == null || params.length == 0) {
- return executeCommand(command);
- }
- StringBuffer sb = new StringBuffer();
- int paramsLength = params.length;
- for (int i = 0; i < paramsLength; i++) {
- sb.append('\'').append(formatText(params[i])).append('\'');
- if (i < paramsLength - 1) {
- sb.append(',');
- }
- }
- String param = sb.toString();
- return execute(command + "(" + param + ");"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * Disposes the operating system resources allocated by the control.
- */
- public void dispose() {
- if (contextMenu != null && !contextMenu.isDisposed()) {
- contextMenu.dispose();
- contextMenu = null;
- }
- if (listeners != null) {
- listeners.clear();
- listeners = null;
- }
- if (modifyListeners != null) {
- modifyListeners.clear();
- modifyListeners = null;
- }
- if (htmlFormatter != null) {
- htmlFormatter = null;
- }
- if (this.findReplaceAction != null) {
- this.findReplaceAction.dispose();
- this.findReplaceAction = null;
- }
- }
-
- /**
- * Checks whether this control has been disposed.
- *
- * @return <code>true</code> if this control is disposed successfully
- */
- public boolean isDisposed() {
- return editor.isDisposed();
- }
-
- /**
- * Returns the modify listeners attached to this control.
- *
- * @return an iterator for retrieving the modify listeners
- */
- public Iterator<ModifyListener> getModifyListeners() {
- return modifyListeners.iterator();
- }
-
- /**
- * Adds a listener to the collection of listeners who will be notified when
- * keys are pressed and released within this control.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addKeyListener(KeyListener listener) {
- if (editor != null) {
- editor.addKeyListener(listener);
- }
- }
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when keys are pressed and released within this control.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeKeyListener(KeyListener listener) {
- if (editor != null) {
- editor.removeKeyListener(listener);
- }
- }
-
- /**
- * Adds a listener to the collection of listeners who will be notified when
- * the content of this control is modified.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addModifyListener(ModifyListener listener) {
- if (editor != null && listener != null
- && !modifyListeners.contains(listener)) {
- modifyListeners.add(listener);
- }
- }
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when the content of this control is modified.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeModifyListener(ModifyListener listener) {
- if (editor != null && listener != null
- && modifyListeners.contains(listener)) {
- modifyListeners.remove(listener);
- }
- }
-
- /**
- * Adds the listener to the collection of listeners who will be notifed when
- * this control is disposed.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addDisposeListener(DisposeListener listener) {
- if (editor != null) {
- editor.addDisposeListener(listener);
- }
- }
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when this control is disposed.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeDisposeListener(DisposeListener listener) {
- if (editor != null) {
- editor.removeDisposeListener(listener);
- }
- }
-
- /**
- * Adds a listener to the collection of listeners who will be notified when
- * help events are generated for this control.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addHelpListener(HelpListener listener) {
- if (editor != null) {
- editor.addHelpListener(listener);
- }
- }
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when help events are generated for this control.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeHelpListener(HelpListener listener) {
- if (editor != null) {
- editor.removeHelpListener(listener);
- }
- }
-
- /**
- * Adds the listener to the collection of listeners who will be notifed when
- * an event of the given type occurs within this control.
- *
- * @param eventType
- * the type of event to listen for
- * @param listener
- * the listener which should be notified when the event occurs
- */
- public void addListener(int eventType, Listener listener) {
- if (editor != null && !listeners.containsKey(listener)) {
- if (eventType != SWT.SELECTED) {
- if (editorControl == null
- || (eventType != SWT.Activate
- && eventType != SWT.Deactivate
- && eventType != SWT.FocusIn && eventType != SWT.FocusOut)) {
- editor.addListener(eventType, listener);
- }
- }
- listeners.put(listener, new RichTextListener(eventType, listener));
- }
- }
-
- /**
- * Removes the listener from the collection of listeners who will be notifed
- * when an event of the given type occurs within this control.
- *
- * @param eventType
- * the type of event to listen for
- * @param listener
- * the listener which should no longer be notified when the event
- * occurs
- */
- public void removeListener(int eventType, Listener listener) {
- if (editor != null && listeners.containsKey(listener)) {
- if (editorControl == null
- || (eventType != SWT.Activate
- && eventType != SWT.Deactivate
- && eventType != SWT.FocusIn && eventType != SWT.FocusOut)) {
- editor.removeListener(eventType, listener);
- }
- listeners.remove(listener);
- }
- }
-
- /**
- * Returns the event listeners attached to this control.
- *
- * @return an iterator for retrieving the event listeners attached to this
- * control
- */
- public Iterator<RichTextListener> getListeners() {
- return listeners.values().iterator();
- }
-
- /**
- * Adds the listener to monitor events and status sent by the underlying
- * DHTML editor.
- */
- protected void addStatusTextListener() {
- editor.addStatusTextListener(new StatusTextListener() {
- public void changed(StatusTextEvent event) {
- String eventText = event.text;
- int eventTextLength = eventText.length();
- if (eventText.startsWith(STATUS_PREFIX)
- && eventTextLength > STATUS_PREFIX_LENGTH) {
- try {
- processingJSEvent = true;
- int endStatusIndex = STATUS_PREFIX_LENGTH + 1;
- if (eventText.length() > STATUS_PREFIX_LENGTH + 1
- && Character.isDigit(eventText
- .charAt(endStatusIndex))) {
- endStatusIndex++;
- }
- int statusType = Integer.parseInt(eventText.substring(
- STATUS_PREFIX_LENGTH, endStatusIndex));
- switch (statusType) {
- case STATUS_NOP:
- break;
- case STATUS_INITIALIZED:
- if (!initialized) {
- initialized = true;
- if (debug) {
- printDebugMessage(
- "statusTextListener", "STATUS_INITIALIZED"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (!Platform.getOS().equals("win32")) { //$NON-NLS-1$
- // Workaround Mozilla'a IFRAME
- // height issue.
- executeCommand(RichTextCommand.SET_HEIGHT,
- "" + editor.getBounds().height); //$NON-NLS-1$
- }
- executeCommand(RichTextCommand.SET_TEXT,
- workaroundForObjectParamNode(currentText));
- if (initializedWithFocus) {
- setFocus();
- }
- if (!editable) {
- executeCommand(
- RichTextCommand.SET_EDITABLE,
- "" + editable); //$NON-NLS-1$
- }
-
- if (Platform.getOS().equals(Platform.OS_WIN32)) {
- notifyListeners(RichText.RICH_TEXT_INITIALIZED_WIN32, new Event());
- }
- }
- break;
- case STATUS_MODIFIED:
- if (debug) {
- printDebugMessage(
- "statusTextListener", "STATUS_MODIFIED"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- checkModify();
- break;
- case STATUS_GET_TEXT:
- if (eventTextLength >= STATUS_PREFIX_LENGTH + 2) {
- currentText = eventText
- .substring(STATUS_PREFIX_LENGTH + 2);
-
- currentText = unWorkaroundForObjectParamNode(currentText);
- } else {
- currentText = ""; //$NON-NLS-1$
- }
- if (debug) {
- printDebugMessage(
- "statusTextListener", //$NON-NLS-1$
- "STATUS_GET_TEXT, currentText=", currentText); //$NON-NLS-1$
- }
- break;
- case STATUS_KEY_DOWN:
- if (eventTextLength >= STATUS_PREFIX_LENGTH + 2) {
- String cmd = eventText
- .substring(STATUS_PREFIX_LENGTH + 2);
- if (debug) {
- printDebugMessage("statusTextListener", //$NON-NLS-1$
- "STATUS_KEY_DOWN, cmd=" + cmd); //$NON-NLS-1$
- }
- if (cmd.equals(RichTextCommand.COPY)) {
- setCopyURL();
- } else if (cmd.equals(RichTextCommand.CUT)) {
- setCopyURL();
- CutAction action = new CutAction(
- RichText.this);
- action.execute(RichText.this);
- } else if (cmd
- .equals(RichTextCommand.FIND_TEXT)) {
- getFindReplaceAction().execute(
- RichText.this);
- } else if (cmd.equals(RichTextCommand.PASTE)) {
- PasteAction action = new PasteAction(
- RichText.this);
- action.execute(RichText.this);
- } else if (cmd.equals(RichTextCommand.SAVE)) {
- PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow()
- .getActivePage().getActiveEditor()
- .doSave(null);
- } else if (cmd.equals(RichTextCommand.SAVE_ALL)) {
- PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow()
- .getActivePage().saveAllEditors(
- false);
- }
- }
- break;
- case STATUS_KEY_UP:
- if (debug) {
- printDebugMessage("statusTextListener", //$NON-NLS-1$
- "STATUS_KEY_UP, modified=" + modified); //$NON-NLS-1$
- }
- checkModify();
- break;
- case STATUS_SELECT_TEXT:
- if (eventTextLength >= STATUS_PREFIX_LENGTH + 2) {
- String[] strings = eventText.substring(
- STATUS_PREFIX_LENGTH + 2).split(
- "\\$", 5); //$NON-NLS-1$
- try {
- richTextSelection.setFontName(strings[0]);
- richTextSelection.setFontSize(strings[1]);
- richTextSelection.setBlockStyle(strings[2]);
- richTextSelection.setFlags(Integer
- .parseInt(strings[3]));
- richTextSelection.setText(strings[4]);
- } catch (NumberFormatException e) {
- logger.logError(e);
- }
- if (debug) {
- printDebugMessage(
- "selectionStatusListener", //$NON-NLS-1$
- "current selection is=" + richTextSelection); //$NON-NLS-1$
- }
-
- hasSelection = true;
- if (hasFocus())
- notifyListeners(SWT.SELECTED, new Event());
- } else {
- richTextSelection.setText(""); //$NON-NLS-1$
- hasSelection = false;
- }
- if (debug) {
- printDebugMessage(
- "statusTextListener", //$NON-NLS-1$
- "STATUS_SELECT_TEXT, selectedText=", richTextSelection.getText()); //$NON-NLS-1$
- }
- break;
- case STATUS_SELECT_CONTROL:
- if (debug) {
- printDebugMessage("statusTextListener", //$NON-NLS-1$
- "STATUS_SELECT_CONTROL, control selected"); //$NON-NLS-1$
- }
- hasSelection = true;
- break;
- case STATUS_SELECT_NONE:
- if (debug) {
- printDebugMessage("statusTextListener", //$NON-NLS-1$
- "STATUS_SELECT_NONE, no selection"); //$NON-NLS-1$
- }
- hasSelection = false;
- break;
- case STATUS_EXEC_CMD:
- if (eventTextLength >= STATUS_PREFIX_LENGTH + 3) {
- try {
- status = Integer.parseInt(eventText
- .substring(
- STATUS_PREFIX_LENGTH + 2,
- STATUS_PREFIX_LENGTH + 3));
- } catch (Exception e) {
- status = -1;
- }
- }
- if (debug && status != 1) {
- printDebugMessage("statusTextListener", //$NON-NLS-1$
- "STATUS_EXEC_CMD, status=" + status); //$NON-NLS-1$
- }
- break;
- case STATUS_REFORMAT_LINKS:
- if (debug) {
- printDebugMessage(
- "statusTextListener", "STATUS_REFORMAT_LINKS"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (Platform.getOS().equals("win32")) { //$NON-NLS-1$
- // Workaround the drag and drop issue with DBCS
- // characters.
- if (modified) {
- setText(getText());
- modified = true;
- }
- }
- checkModify();
- break;
- }
- } catch (Exception e) {
- } finally {
- processingJSEvent = false;
- }
- }
- }
- });
- }
-
- /**
- * Generates the HTML source for the editor.
- *
- * @return the HTML source for the editor
- */
- protected String generateEditorHTML() throws Exception {
- String escapedBasePath = basePath;
- if (escapedBasePath.startsWith(FileUtil.UNC_PATH_PREFIX))
- escapedBasePath = escapedBasePath.replaceFirst(
- "^\\\\\\\\", "\\\\\\\\\\\\\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
- escapedBasePath = XMLUtil
- .escape("file://" + escapedBasePath.replaceAll("'", "\\\\'")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- String escapedRteUTL = rteURL.replaceAll("&apos;", "%27"); //$NON-NLS-1$ //$NON-NLS-2$
-
- StringBuffer rteXML = new StringBuffer();
- rteXML.append("<rte id=\"").append("rte") //$NON-NLS-1$ //$NON-NLS-2$
- .append("\" css=\"").append(escapedRteUTL + "rte.css") //$NON-NLS-1$ //$NON-NLS-2$
- .append("\" js=\"").append(escapedRteUTL + "rte.js") //$NON-NLS-1$ //$NON-NLS-2$
- .append("\" baseURL=\"").append(escapedBasePath) //$NON-NLS-1$
- .append("\"/>"); //$NON-NLS-1$
- StringWriter result = new StringWriter();
- XSLTProcessor.transform(
- rteFolder + "rte.xsl", rteXML.toString(), result); //$NON-NLS-1$
- return result.toString();
- }
-
- /**
- * Fills the context menu with menu items.
- *
- * @param contextMenu
- * a context menu containing rich text actions
- */
- protected void fillContextMenu(Menu contextMenu) {
- final MenuItem cutItem = new MenuItem(contextMenu, SWT.PUSH);
- cutItem.setText(RichTextResources.cutAction_text);
- cutItem.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- CutAction action = new CutAction(RichText.this);
- action.execute(RichText.this);
- }
- });
- final MenuItem copyItem = new MenuItem(contextMenu, SWT.PUSH);
- copyItem.setText(RichTextResources.copyAction_text);
- copyItem.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- CopyAction action = new CopyAction(RichText.this);
- action.execute(RichText.this);
- }
- });
- final MenuItem pasteItem = new MenuItem(contextMenu, SWT.PUSH);
- pasteItem.setText(RichTextResources.pasteAction_text);
- pasteItem.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- PasteAction action = new PasteAction(RichText.this);
- action.execute(RichText.this);
- }
- });
-
- final MenuItem pastePlainTextItem = new MenuItem(contextMenu, SWT.PUSH);
- pastePlainTextItem.setText(RichTextResources.pastePlainTextAction_text);
- pastePlainTextItem.setImage(RichTextImages.IMG_PASTE_PLAIN_TEXT);
- pastePlainTextItem.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- PastePlainTextAction action = new PastePlainTextAction(
- RichText.this);
- action.execute(RichText.this);
- }
- });
-
- contextMenu.addMenuListener(new MenuListener() {
- public void menuHidden(MenuEvent e) {
- }
-
- public void menuShown(MenuEvent e) {
- getSelectedText();
- cutItem.setEnabled(editable && hasSelection);
- copyItem.setEnabled(hasSelection);
- pasteItem.setEnabled(editable);
- pastePlainTextItem.setEnabled(editable);
- }
- });
- }
-
- /**
- * Adds listeners to manage the activation and focus events.
- */
- protected void addListeners() {
- editorControl = getControlSite(editor);
- if (editorControl != null) {
- if (debug) {
- printDebugMessage(
- "init", "editorControl=" + editorControl.getClass().getName()); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- // only IE (win32) has the editorControl != null
- isIE = true;
-
- editorControl.addListener(SWT.Activate, new Listener() {
- public void handleEvent(Event event) {
- if (debug) {
- printDebugMessage("activateListener"); //$NON-NLS-1$
- }
- setFocus();
- notifyListeners(SWT.Activate, event);
- }
- });
-
- editorControl.addListener(SWT.Deactivate, new Listener() {
- public void handleEvent(Event event) {
- if (debug) {
- printDebugMessage("deactivateListener"); //$NON-NLS-1$
- }
- setBlur();
- notifyListeners(SWT.Deactivate, event);
- }
- });
-
- editorControl.addListener(SWT.FocusIn, new Listener() {
- public void handleEvent(Event event) {
- if (debug) {
- printDebugMessage("focusInListener"); //$NON-NLS-1$
- }
- executeCommand("updateSelection"); //$NON-NLS-1$
- notifyListeners(SWT.FocusIn, event);
- }
- });
-
- editorControl.addKeyListener(new KeyAdapter() {
- public void keyReleased(KeyEvent event) {
- int keyCode = event.keyCode;
- int stateMask = event.stateMask;
- if (debug) {
- printDebugMessage(
- "keyUpListener", "keyCode=" + keyCode //$NON-NLS-1$ //$NON-NLS-2$
- + ", stateMask=" + stateMask + ", editable=" + editable); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- if ( stateMask == SWT.CTRL && event.keyCode == 0x11 ) { //0x11 is for all Control key, such as ctrl-b, ctrl-I, ctrl-c, etc..
- executeCommand("updateSelection");
- }
-
- if ((stateMask & SWT.CTRL) > 0
- || (stateMask & SWT.ALT) > 0
- || ((stateMask & SWT.SHIFT) > 0 && keyCode == stateMask)) {
- return;
- }
- if (editable) {
- switch (event.keyCode) {
- case SWT.ARROW_DOWN:
- case SWT.ARROW_LEFT:
- case SWT.ARROW_RIGHT:
- case SWT.ARROW_UP:
- case SWT.END:
- case SWT.HOME:
- case SWT.PAGE_DOWN:
- case SWT.PAGE_UP:
- case SWT.TAB:
- return;
- default:
- checkModify();
- break;
- }
- }
- }
- });
-
-// editorControl.addListener(SWT.KeyUp, new Listener() {
-// public void handleEvent(Event event) {
-// int keyCode = event.keyCode;
-// int stateMask = event.stateMask;
-// if (debug) {
-// printDebugMessage(
-// "keyUpListener", "keyCode=" + keyCode //$NON-NLS-1$ //$NON-NLS-2$
-// + ", stateMask=" + stateMask + ", editable=" + editable); //$NON-NLS-1$ //$NON-NLS-2$
-// }
-// if ((stateMask & SWT.CTRL) > 0
-// || (stateMask & SWT.ALT) > 0
-// || ((stateMask & SWT.SHIFT) > 0 && keyCode == stateMask)) {
-// return;
-// }
-// if (editable) {
-// switch (event.keyCode) {
-// case SWT.ARROW_DOWN:
-// case SWT.ARROW_LEFT:
-// case SWT.ARROW_RIGHT:
-// case SWT.ARROW_UP:
-// case SWT.END:
-// case SWT.HOME:
-// case SWT.PAGE_DOWN:
-// case SWT.PAGE_UP:
-// case SWT.TAB:
-// return;
-// default:
-// checkModify();
-// break;
-// }
-// }
-// }
-// });
-
- editor.addLocationListener(new LocationAdapter() {
- public void changing(LocationEvent event) {
- // Deactivate the links in the content page in readonly
- // mode.
- event.doit = editable;
- }
- });
- } else {
- editor.addListener(SWT.Activate, new Listener() {
- public void handleEvent(Event event) {
- if (debug) {
- printDebugMessage("activateListener"); //$NON-NLS-1$
- }
- setFocus();
- }
- });
-
- editor.addKeyListener(new KeyListener() {
- public void keyPressed(KeyEvent e) {
- if (e.keyCode == SWT.TAB) {
- if ((e.stateMask & SWT.SHIFT) != 0) {
- editor.traverse(SWT.TRAVERSE_TAB_PREVIOUS);
- } else if ((e.stateMask & SWT.CTRL) == 0 ){
- editor.traverse(SWT.TRAVERSE_TAB_NEXT);
- }
- return;
- }
- if (!editable) {
- e.doit = false;
- }
- }
-
- public void keyReleased(KeyEvent e) {
- if ((e.stateMask & SWT.CTRL) > 0
- || (e.stateMask & SWT.ALT) > 0)
- return;
- if (editable) {
- switch (e.keyCode) {
- case SWT.ARROW_DOWN:
- case SWT.ARROW_LEFT:
- case SWT.ARROW_RIGHT:
- case SWT.ARROW_UP:
- case SWT.END:
- case SWT.HOME:
- case SWT.PAGE_DOWN:
- case SWT.PAGE_UP:
- case SWT.SHIFT:
- case SWT.TAB:
- break;
- default:
- checkModify();
- break;
- }
- }
- }
- });
- }
-
- editor.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- if (debug) {
- printDebugMessage("disposeListener"); //$NON-NLS-1$
- }
- dispose();
- }
- });
-
- listeners = new Hashtable<Listener, RichTextListener>();
- modifyListeners = new ArrayList<ModifyListener>();
- }
-
- /**
- * Notifies the rich text event listeners.
- *
- * @param eventType
- * the event type
- * @param event
- * the SWT event
- */
- protected void notifyListeners(int eventType, Event event) {
- if (notifyingModifyListeners) {
- return;
- }
-
- if (listeners != null) {
- event.display = Display.getCurrent();
- event.widget = editor;
-
- for (Iterator<RichTextListener> i = listeners.values().iterator(); i
- .hasNext();) {
- RichTextListener listener = i.next();
- if (listener.getEventType() == eventType) {
- if (debug) {
- printDebugMessage(
- "notifyListeners", "notifying listener, " + listener + ", eventType=" + eventType); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- listener.getListener().handleEvent(event);
- if (debug) {
- printDebugMessage(
- "notifyListeners", "notified listener, " + listener + ", eventType=" + eventType); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
- }
- }
- }
-
- /**
- * Notifies the modify listeners that the rich text editor content has
- * changed.
- */
- public void notifyModifyListeners() {
- notifyingModifyListeners = true;
-
- Event event = new Event();
- event.display = Display.getCurrent();
- event.widget = editor;
-
- for (Iterator<ModifyListener> i = modifyListeners.iterator(); i
- .hasNext();) {
- ModifyListener listener = i.next();
- if (debug) {
- printDebugMessage(
- "notifyModifyListeners", "notifying listener, " + listener); //$NON-NLS-1$ //$NON-NLS-2$
- }
- listener.modifyText(new ModifyEvent(event));
- if (debug) {
- printDebugMessage(
- "notifyModifyListeners", "notified listener, " + listener); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- notifyingModifyListeners = false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.epf.richtext.IRichText#checkModify()
- */
- public void checkModify() {
- try {
- if (!checkingModifyEvent) {
- checkingModifyEvent = true;
- if (modified) {
- notifyModifyListeners();
- } else {
- if (!isIE && processingJSEvent) {
- Display.getCurrent().asyncExec(new Runnable() {
- public void run() {
- if (!getText().equals(initialText)) {
- modified = true;
- notifyModifyListeners();
- }
- }
- });
- } else {
- if (!getText().equals(initialText)) {
- modified = true;
- notifyModifyListeners();
- }
- }
- }
- if (debug) {
- printDebugMessage("checkModify", "modified=" + modified); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- } finally {
- checkingModifyEvent = false;
- }
- }
-
- /**
- * This provides an opportunity for a sub class to tidy up the rich text.
- *
- * @param text
- * rich text encoded in HTML format
- */
- protected String tidyText(String text) {
- return text;
- }
-
- /**
- * Formats the text for consumption by the JavaScript/DHTML editor.
- *
- * @param text
- * rich text encoded in HTML format
- */
- protected String formatText(String text) {
- if (text == null || text.length() == 0) {
- return text;
- }
- StringBuffer result = new StringBuffer();
- int textSize = text.length();
- for (int i = 0; i < textSize; i++) {
- char ch = text.charAt(i);
- switch (ch) {
- case '\r':
- break;
- case '\t':
- result.append(' ');
- break;
- case '\n':
- result.append(ENCODED_NEWLINE);
- break;
- case '\'':
- result.append(ENCODED_SINGLE_QUOTE);
- break;
- case '\\':
- result.append("\\\\"); //$NON-NLS-1$
- break;
- default:
- result.append(ch);
- }
- }
- return result.toString();
- }
-
- /**
- * Returns the child <code>OleControlSite</code> contained within the
- * given <code>Composite</code>.
- *
- * @param composite
- * a <code>Composite</code> object, presumably a
- * <code>Browser</code>
- * @return an <code>OleControlSite</code> object
- */
- protected Control getControlSite(Composite composite) {
- if (Platform.getOS().equals("win32")) { //$NON-NLS-1$
- Control[] controls = composite.getChildren();
- for (int i = 0; i < controls.length; i++) {
- String controlClass = controls[i].getClass().getName();
- if (controlClass.equals("org.eclipse.swt.browser.WebSite")) { //$NON-NLS-1$
- return controls[i];
- } else if (controls[i] instanceof Composite) {
- return getControlSite((Composite) controls[i]);
- }
- }
- }
- return null;
- }
-
- /**
- * Displays the given debug message to the console.
- */
- protected void printDebugMessage(String method, String msg, String text) {
- StringBuffer strBuf = new StringBuffer();
- strBuf.append("RichText[").append(editor.handle).append(']') //$NON-NLS-1$
- .append('.').append(method);
- if (msg != null && msg.length() > 0) {
- strBuf.append(": ").append(msg); //$NON-NLS-1$
- }
- if (text != null && text.length() > 0) {
- strBuf.append('\n').append(text);
- }
- System.out.println(strBuf);
- }
-
- /**
- * Displays the given debug message to the console.
- */
- protected void printDebugMessage(String method, String msg) {
- printDebugMessage(method, msg, null);
- }
-
- /**
- * Displays the given debug message to the console.
- */
- protected void printDebugMessage(String method) {
- printDebugMessage(method, null);
- }
-
- public FindReplaceAction getFindReplaceAction() {
- return findReplaceAction;
- }
-
- public void setFindReplaceAction(FindReplaceAction findReplaceAction) {
- if (findReplaceAction != null) {
- if (this.findReplaceAction != null
- && this.findReplaceAction != findReplaceAction) {
- this.findReplaceAction.dispose();
- }
- this.findReplaceAction = findReplaceAction;
- this.findReplaceAction.setRichText(this);
- }
- }
-
- public void setInitialText(String text) {
- setText(text);
- initialText = text == null ? "" : text; //$NON-NLS-1$
- modified = false;
- }
-
- public boolean hasError() {
- return htmlFormatter.getLastErrorStr() != null;
- }
-
- public static String workaroundForObjectParamNode(String html) {
- String result = html.replaceAll("<param", "<paramTemp"); //$NON-NLS-1$ //$NON-NLS-2$
-
- return result;
- }
-
- private String unWorkaroundForObjectParamNode(String html) {
- String result = html.replaceAll("<paramTemp", "<param"); //$NON-NLS-1$ //$NON-NLS-2$
-
- return result;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextCommand.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextCommand.java
deleted file mode 100644
index dbf706443ec..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextCommand.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-/**
- * Defines the editing commands supported by the default rich text control and
- * editor.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextCommand {
-
- /**
- * Adds a HTML fragment.
- */
- public static final String ADD_HTML = "addHTML"; //$NON-NLS-1$
-
- /**
- * Adds an image.
- */
- public static final String ADD_IMAGE = "addImage"; //$NON-NLS-1$
-
- /**
- * Adds a horizontal line.
- */
- public static final String ADD_LINE = "addLine"; //$NON-NLS-1$
-
- /**
- * Adds a link.
- */
- public static final String ADD_LINK = "addLink"; //$NON-NLS-1$
-
- /**
- * Inserts text over the current selection.
- */
- public static final String INSERT_TEXT = "insertText"; //$NON-NLS-1$
-
- /**
- * Adds an ordered list.
- */
- public static final String ADD_ORDERED_LIST = "addOrderedList"; //$NON-NLS-1$
-
- /**
- * Adds a table.
- */
- public static final String ADD_TABLE = "addTable"; //$NON-NLS-1$
-
- /**
- * Adds an unordered list.
- */
- public static final String ADD_UNORDERED_LIST = "addUnorderedList"; //$NON-NLS-1$
-
- /**
- * Sets the background color of the selected text.
- */
- public static final String BACKGROUND_COLOR = "backColor"; //$NON-NLS-1$
-
- /**
- * Toggles the 'bold' attribute of the selected text.
- */
- public static final String BOLD = "bold"; //$NON-NLS-1$
-
- /**
- * Clears the rich text content.
- */
- public static final String CLEAR_CONTENT = "clearContent"; //$NON-NLS-1$
-
- /**
- * Copies the selected text to the clipboard.
- */
- public static final String COPY = "copy"; //$NON-NLS-1$
-
- /**
- * Cuts the selected text to the clipboard.
- */
- public static final String CUT = "cut"; //$NON-NLS-1$
-
- /**
- * Deletes the selected text.
- */
- public static final String DELETE = "deleteText"; //$NON-NLS-1$
-
- /**
- * Finds text.
- */
- public static final String FIND_TEXT = "findText"; //$NON-NLS-1$
-
- /**
- * Gets the HTML source.
- */
- public static final String GET_TEXT = "getText"; //$NON-NLS-1$
-
- /**
- * Sets the foreground color of the selected text.
- */
- public static final String FORGROUND_COLOR = "foreColor"; //$NON-NLS-1$
-
- /**
- * Formats the selected text.
- */
- public static final String FORMAT_BLOCK = "formatBlock"; //$NON-NLS-1$
-
- /**
- * Returns the selected text.
- */
- public static final String GET_SELECTED_TEXT = "getSelectedText"; //$NON-NLS-1$
-
- /**
- * Indents the selected text.
- */
- public static final String INDENT = "indent"; //$NON-NLS-1$
-
- /**
- * Toggles the 'italic' attribute of the selected text.
- */
- public static final String ITALIC = "italic"; //$NON-NLS-1$
-
- /**
- * Center justifies the selected text.
- */
- public static final String JUSTIFY_CENTER = "justifyCenter"; //$NON-NLS-1$
-
- /**
- * Fully justifies the selected text.
- */
- public static final String JUSTIFY_FULL = "justifyFull"; //$NON-NLS-1$
-
- /**
- * Left justifies the selected text.
- */
- public static final String JUSTIFY_LEFT = "justifyLeft"; //$NON-NLS-1$
-
- /**
- * Right justifies the selected text.
- */
- public static final String JUSTIFY_RIGHT = "justifyRight"; //$NON-NLS-1$
-
- /**
- * Outdents the selected text.
- */
- public static final String OUTDENT = "outdent"; //$NON-NLS-1$
-
- /**
- * Pastes text from the clipboard.
- */
- public static final String PASTE = "paste"; //$NON-NLS-1$
-
- /**
- * Replaces all text.
- */
- public static final String REPLACE_ALL_TEXT = "replaceAllText"; //$NON-NLS-1$
-
- /**
- * Replaces the selected text.
- */
- public static final String REPLACE_TEXT = "replaceText"; //$NON-NLS-1$
-
- /**
- * Redoes the previous command.
- */
- public static final String REDO = "redo"; //$NON-NLS-1$
-
- /**
- * Removes the current formatting of the selected text.
- */
- public static final String REMOVE_FORMAT = "removeFormat"; //$NON-NLS-1$
-
- /**
- * Saves the editor
- */
- public static final String SAVE = "save"; //$NON-NLS-1$
-
- /**
- * Saves all editors
- */
- public static final String SAVE_ALL = "saveAll"; //$NON-NLS-1$
-
- /**
- * Selects all text.
- */
- public static final String SELECT_ALL = "selectAll"; //$NON-NLS-1$
-
- /**
- * Sets the font name for the selected text.
- */
- public static final String SET_FONT_NAME = "setFontName"; //$NON-NLS-1$
-
- /**
- * Sets the font size for the selected text.
- */
- public static final String SET_FONT_SIZE = "setFontSize"; //$NON-NLS-1$
-
- /**
- * Sets the font style for the selected text.
- */
- public static final String SET_FONT_STYLE = "setFontStyle"; //$NON-NLS-1$
-
- /**
- * Sets whether the content can be edited.
- */
- public static final String SET_EDITABLE = "setEditable"; //$NON-NLS-1$
-
- /**
- * Sets focus to this control.
- */
- public static final String SET_FOCUS = "setFocus"; //$NON-NLS-1$
-
- /**
- * Sets the height of this control.
- */
- public static final String SET_HEIGHT = "setHeight"; //$NON-NLS-1$
-
- /**
- * Sets the HTML source.
- */
- public static final String SET_TEXT = "setText"; //$NON-NLS-1$
-
- /**
- * Toggles the 'strike-through' attribute of the selected text.
- */
- public static final String STRIKE_THROUGH = "strikeThrough"; //$NON-NLS-1$
-
- /**
- * Toggles the subscript attribute of the selected text.
- */
- public static final String SUBSCRIPT = "subscript"; //$NON-NLS-1$
-
- /**
- * Toggles the superscript attribute of the selected text.
- */
- public static final String SUPERSCRIPT = "superscript"; //$NON-NLS-1$
-
- /**
- * Toggles the underline attribute of the selected text.
- */
- public static final String UNDERLINE = "underline"; //$NON-NLS-1$
-
- /**
- * Undoes the previous command.
- */
- public static final String UNDO = "undo"; //$NON-NLS-1$
-
- /**
- * Converts a link to normal text.
- */
- public static final String UNLINK = "unlink"; //$NON-NLS-1$
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditor.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditor.java
deleted file mode 100644
index 039b2a86c35..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditor.java
+++ /dev/null
@@ -1,1555 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ParameterizedCommand;
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.richtext.actions.CopyAction;
-import org.eclipse.epf.richtext.actions.CutAction;
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-import org.eclipse.epf.richtext.actions.PasteAction;
-import org.eclipse.epf.richtext.actions.PastePlainTextAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.bindings.Binding;
-import org.eclipse.jface.bindings.keys.KeySequence;
-import org.eclipse.jface.bindings.keys.KeyStroke;
-import org.eclipse.jface.bindings.keys.SWTKeySupport;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.ITextViewerExtension;
-import org.eclipse.jface.text.ITextViewerExtension6;
-import org.eclipse.jface.text.IUndoManager;
-import org.eclipse.jface.text.IUndoManagerExtension;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.text.TextViewerUndoManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.custom.VerifyKeyListener;
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTarget;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.DropTargetListener;
-import org.eclipse.swt.dnd.HTMLTransfer;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.HelpListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.events.MenuListener;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IKeyBindingService;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.keys.IBindingService;
-import org.eclipse.ui.operations.OperationHistoryActionHandler;
-import org.eclipse.ui.operations.RedoActionHandler;
-import org.eclipse.ui.operations.UndoActionHandler;
-import org.eclipse.ui.texteditor.IAbstractTextEditorHelpContextIds;
-import org.eclipse.ui.texteditor.IReadOnlyDependent;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.ui.texteditor.IUpdate;
-import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
-
-/**
- * The default rich text editor implementation.
- * <p>
- * The default rich text editor uses XHTML as the underlying markup language for
- * the rich text content. It is implemented using a <code>ViewForm</code>
- * control with a tool bar at the top, a tab folder that contains a
- * <code>RichText</code> control for entering the rich text content, and a tab
- * foler that contains a <code>StyleText</code> control for viewing and
- * modifying the XHTML representation of the rich text content.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class RichTextEditor implements IRichTextEditor {
-
- // The HTML tab name.
- protected static final String HTML_TAB_NAME = RichTextResources.htmlTab_text;
-
- // If true, log debugging info.
- protected boolean debug;
-
- // The plug-in logger.
- protected Logger logger;
-
- // The base path used for resolving links (<href>, <img>, etc.).
- protected String basePath;
-
- // The editor form.
- protected ViewForm form;
-
- // The editor tool bar.
- protected IRichTextToolBar toolBar;
-
- // The editor content.
- protected Composite content;
-
- // The editor tab folder.
- protected CTabFolder tabFolder;
-
- // The rich text tab
- protected CTabItem richTextTab;
-
- // The HTML source tab
- protected CTabItem htmlTab;
-
- // The embedded rich text control.
- protected IRichText richText;
-
- // The underlying HTML text editor.
- protected TextViewer sourceViewer;
-
- protected IDocument currentDoc;
-
- // Drop support
- protected DropTarget sourceEditDropTarget;
-
- // HTML editor's context menu
- protected Menu contextMenu;
-
- // Has the HTML source been modified?
- protected boolean sourceModified = false;
-
- // The editor's editable flag.
- protected boolean editable = true;
-
- private OperationHistoryActionHandler undoAction;
-
- private OperationHistoryActionHandler redoAction;
-
- private IEditorSite editorSite;
-
- /** The actions registered with the editor. */
- private Map<String, IAction> fActions= new HashMap<String, IAction>(10);
-
- /** The verify key listener for activation code triggering. */
- private ActivationCodeTrigger fActivationCodeTrigger= new ActivationCodeTrigger();
-
- /** The editor's action activation codes. */
- private List fActivationCodes= new ArrayList(2);
-
- final IUndoManager undoManager= new TextViewerUndoManager(10);
-
- /**
- * The key binding scopes of this editor.
- * @since 2.1
- */
- private String[] fKeyBindingScopes;
-
-
- protected IDocumentListener sourceEditDocumentListener= new IDocumentListener() {
- public void documentAboutToBeChanged(DocumentEvent event) {
- }
- public void documentChanged(DocumentEvent event) {
- sourceModified = true;
- if (richText != null && richText instanceof RichText) {
- richText.notifyModifyListeners();
- }
- }
- };
-
-
- // The deactivate listener for the sourceEdit control.
- protected Listener sourceEditDeactivateListener = new Listener() {
- public void handleEvent(Event event) {
- if (sourceModified) {
- updateRichText(sourceViewer.getTextWidget().getText());
- setModified(true);
- sourceModified = false;
- }
- }
- };
-
- // The key listener for the sourceEdit control.
- protected KeyListener sourceEditKeyListener = new KeyListener() {
- public void keyPressed(KeyEvent e) {
- Object adapter = PlatformUI.getWorkbench().getAdapter(
- IBindingService.class);
- if (adapter != null && adapter instanceof IBindingService) {
- int accel = SWTKeySupport
- .convertEventToUnmodifiedAccelerator(e);
- KeyStroke stroke = SWTKeySupport
- .convertAcceleratorToKeyStroke(accel);
- KeySequence seq = KeySequence.getInstance(stroke);
- Binding bind = ((IBindingService) adapter).getPerfectMatch(seq);
- if (bind != null) {
- ParameterizedCommand command = bind
- .getParameterizedCommand();
- if (command != null) {
- String cmdId = command.getId();
- if (cmdId != null
- && cmdId
- .equals("org.eclipse.ui.edit.findReplace")) { //$NON-NLS-1$
- richText.getFindReplaceAction().execute(RichTextEditor.this);
- }
- }
- }
- }
- }
-
- public void keyReleased(KeyEvent e) {
- }
- };
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent composite
- * @param style
- * the editor style
- */
- public RichTextEditor(Composite parent, int style, IEditorSite editorSite) {
- this(parent, style, editorSite, null);
- }
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent composite
- * @param style
- * the editor style
- * @param basePath
- * the base path used for resolving links
- */
- public RichTextEditor(Composite parent, int style, IEditorSite editorSite, String basePath) {
- this.basePath = basePath;
- this.editorSite = editorSite;
- debug = RichTextPlugin.getDefault().isDebugging();
- logger = RichTextPlugin.getDefault().getLogger();
- init(parent, style);
- }
-
- /**
- * Initializes this editor.
- *
- * @param parent
- * the parent composite
- * @param style
- * the editor style
- */
- protected void init(Composite parent, int style) {
- try {
- form = new ViewForm(parent, style);
- form.marginHeight = 0;
- form.marginWidth = 0;
-
- toolBar = new RichTextToolBar(form, SWT.FLAT, this);
-
- content = new Composite(form, SWT.FLAT);
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- content.setLayout(layout);
-
- tabFolder = createEditorTabFolder(content, style);
-
- form.setTopCenter(((RichTextToolBar)toolBar).getToolbarMgr().getControl());
- form.setTopLeft(((RichTextToolBar)toolBar).getToolbarMgrCombo().getControl());
- form.setContent(content);
- } catch (Exception e) {
- logger.logError(e);
- }
- }
-
- /**
- * Returns the form control.
- *
- * @return the form control
- */
- public Control getControl() {
- return form;
- }
-
- /**
- * Returns the rich text control embedded within this editor.
- */
- public IRichText getRichTextControl() {
- return richText;
- }
-
- /**
- * Sets the layout data.
- *
- * @param layoutData
- * the layout data to set
- */
- public void setLayoutData(Object layoutData) {
- if (form != null) {
- form.setLayoutData(layoutData);
- }
- }
-
- /**
- * Returns the layout data.
- *
- * @return the editor's layout data
- */
- public Object getLayoutData() {
- if (form != null) {
- return form.getLayoutData();
- }
- return null;
- }
-
- /**
- * Sets focus to this editor.
- */
- public void setFocus() {
- if (richText != null) {
- richText.setFocus();
- }
- setSelection(0);
- if (toolBar != null && tabFolder != null) {
- toolBar.updateToolBar(editable);
- }
-
- }
-
- /**
- * Tells the control it does not have focus.
- */
- public void setBlur() {
- if (richText != null) {
- richText.setBlur();
- }
- }
-
- /**
- * Checks whether this editor has focus.
- *
- * @return <code>true</code> if this editor has the user-interface focus
- */
- public boolean hasFocus() {
- if (richText != null) {
- return richText.hasFocus();
- }
- return false;
- }
-
- /**
- * Selects the Rich Text or HTML tab.
- *
- * @param index
- * <code>0</code> for the Rich Text tab, <code>1</code> for
- * the HTML tab.
- */
- public void setSelection(int index) {
- if (tabFolder != null) {
- tabFolder.setSelection(index);
- }
- }
-
- /**
- * Returns the base path used for resolving text and image links.
- *
- * @return the base path used for resolving links specified with <href>,
- * <img>, etc.
- */
- public String getBasePath() {
- return basePath;
- }
-
- /**
- * Returns the base URL of the rich text control whose content was last
- * copied to the clipboard.
- *
- * @return the base URL of a rich text control
- */
- public URL getCopyURL() {
- if (richText != null) {
- return richText.getCopyURL();
- }
- return null;
- }
-
- /**
- * Sets the base URL of the rich text control whose content was last copied
- * to the clipboard.
- */
- public void setCopyURL() {
- if (richText != null) {
- richText.setCopyURL();
- }
- }
-
- /**
- * Returns the editable state.
- *
- * @return <code>true</code> if the content can be edited
- */
- public boolean getEditable() {
- return editable;
- }
-
- /**
- * Sets the editable state.
- *
- * @param editable
- * the editable state
- */
- public void setEditable(boolean editable) {
- this.editable = editable;
- if (toolBar != null && tabFolder != null) {
- toolBar.updateToolBar(editable);
- }
- if (richText != null) {
- richText.setEditable(editable);
- }
- if (sourceViewer != null) {
- sourceViewer.setEditable(editable);
- }
- }
-
- /**
- * Checks whether the content has been modified.
- *
- * @return <code>true</code> if the content has been modified
- */
- public boolean getModified() {
- if (richText != null) {
- return richText.getModified();
- }
- return false;
- }
-
- /**
- * Sets the modified state.
- *
- * @param modified
- * the modified state
- */
- public void setModified(boolean modified) {
- if (richText != null) {
- richText.setModified(modified);
- }
- }
-
- /**
- * Returns the rich text content.
- *
- * @return the rich text content formatted in XHTML
- */
- public String getText() {
- if (sourceModified) {
- setText(getSourceEdit().getText());
- setModified(true);
- sourceModified = false;
- }
- if (richText != null) {
- return richText.getText();
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Sets the rich text content.
- *
- * @param text
- * the rich text content in XHTML format
- */
- public void setText(String text) {
- if (richText != null) {
- richText.setText(text);
- }
- sourceModified = false;
- if (tabFolder != null) {
- if (toolBar != null) {
- toolBar.updateToolBar(editable);
- }
- if (getSourceEdit() != null) {
- removeModifyListeners();
- currentDoc.set(text);
- addModifyListeners();
- }
- }
- }
-
- protected void addModifyListeners() {
- if (currentDoc != null) {
- currentDoc.addDocumentListener(sourceEditDocumentListener);
- }
- }
-
- protected void removeModifyListeners() {
- if (currentDoc != null) {
- currentDoc.removeDocumentListener(sourceEditDocumentListener);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.epf.richtext.IRichText#checkModify()
- */
- public void checkModify() {
- richText.checkModify();
- if (sourceModified) {
- notifyModifyListeners();
- }
- if (debug) {
- printDebugMessage("checkModify", "modified=" + sourceModified); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * Restores the rich text content back to the initial value.
- */
- public void restoreText() {
- if (richText != null) {
- richText.restoreText();
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.epf.richtext.IRichText#getSelected()
- */
- public RichTextSelection getSelected() {
- if (tabFolder.getSelection() == htmlTab) {
- String HTMLsource = getSourceEdit().getText();
- Point sel = sourceViewer.getSelectedRange();
- int selStartIndex = sel.x;
- int selEndIndex = sel.x + sel.y - 1;
- richText.getSelected().clear();
- richText.getSelected().setText(HTMLsource.substring(selStartIndex, selEndIndex + 1));
- }
- return richText.getSelected();
- }
-
- /**
- * Returns an application specific property value.
- *
- * @param key
- * the name of the property
- * @return the value of the property or <code>null</code> if it has not
- * been set
- */
- public Object getData(String key) {
- if (richText != null) {
- return richText.getData(key);
- }
- return null;
- }
-
- /**
- * Sets an application specific property name and value.
- *
- * @param key
- * the name of the property
- * @param value
- * the new value for the property
- */
- public void setData(String key, Object value) {
- if (richText != null) {
- richText.setData(key, value);
- }
- }
-
- /**
- * Executes the given rich text command. The supported command strings are
- * defined in <code>RichTextCommand<code>.
- *
- * @param command a rich text command string
- * @return a status code returned by the executed command
- */
- public int executeCommand(String command) {
- if (richText != null) {
- return richText.executeCommand(command);
- }
- return 0;
- }
-
- /**
- * Executes the given rich text command with a single parameter. The
- * supported command strings are defined in <code>RichTextCommand<code>.
- *
- * @param command a rich text command string
- * @param param a parameter for the command or <code>null</code>
- * @return a status code returned by the executed command
- */
- public int executeCommand(String command, String param) {
- if (richText != null) {
- return richText.executeCommand(command, param);
- }
- return 0;
- }
-
- /**
- * Executes the given rich text command with an array of parameters. The
- * supported command strings are defined in <code>RichTextCommand<code>.
- *
- * @param command a rich text command string
- * @param params an array of parameters for the command or <code>null</code>
- * @return a status code returned by the executed command
- */
- public int executeCommand(String command, String[] params) {
- if (richText != null) {
- return richText.executeCommand(command, params);
- }
- return 0;
- }
-
- /**
- * Disposes the operating system resources allocated by this editor.
- */
- public void dispose() {
- if (contextMenu != null && !contextMenu.isDisposed()) {
- contextMenu.dispose();
- contextMenu = null;
- }
- if (sourceEditDropTarget != null) {
- sourceEditDropTarget.dispose();
- sourceEditDropTarget = null;
- }
- if (fActivationCodeTrigger != null) {
- fActivationCodeTrigger.uninstall();
- fActivationCodeTrigger= null;
- }
- removeModifyListeners();
- if (getSourceEdit() != null) {
- getSourceEdit().removeListener(SWT.Deactivate,
- sourceEditDeactivateListener);
- getSourceEdit().removeKeyListener(sourceEditKeyListener);
- sourceEditDeactivateListener = null;
- sourceEditKeyListener = null;
- }
-
- if (sourceViewer != null) {
- sourceViewer= null;
- }
-
- if (fActions != null) {
- fActions.clear();
- fActions= null;
- }
- if (fActivationCodes != null) {
- fActivationCodes.clear();
- fActivationCodes= null;
- }
-
- if (richText != null) {
- richText.dispose();
- richText = null;
- }
- }
-
- /**
- * Checks whether this control has been disposed.
- *
- * @return <code>true</code> if this control is disposed successfully
- */
- public boolean isDisposed() {
- if (richText != null) {
- return richText.isDisposed();
- }
- return true;
- }
-
- /**
- * Returns the modify listeners attached to this editor.
- *
- * @return an iterator for retrieving the modify listeners
- */
- public Iterator<ModifyListener> getModifyListeners() {
- if (richText != null) {
- richText.getModifyListeners();
- }
- return null;
- }
-
- /**
- * Adds a listener to the collection of listeners who will be notified when
- * keys are pressed and released within this editor.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addKeyListener(KeyListener listener) {
- if (richText != null) {
- richText.addKeyListener(listener);
- }
- }
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when keys are pressed and released within this editor.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeKeyListener(KeyListener listener) {
- if (richText != null) {
- richText.removeKeyListener(listener);
- }
- }
-
- /**
- * Adds a listener to the collection of listeners who will be notified when
- * the content of this editor is modified.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addModifyListener(ModifyListener listener) {
- if (richText != null) {
- richText.addModifyListener(listener);
- }
- }
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when the content of this editor is modified.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeModifyListener(ModifyListener listener) {
- if (richText != null) {
- richText.removeModifyListener(listener);
- }
- }
-
- /**
- * Adds the listener to the collection of listeners who will be notifed when
- * this editor is disposed.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addDisposeListener(DisposeListener listener) {
- if (richText != null) {
- richText.addDisposeListener(listener);
- }
- }
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when this editor is disposed.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeDisposeListener(DisposeListener listener) {
- if (richText != null) {
- richText.removeDisposeListener(listener);
- }
- }
-
- /**
- * Adds a listener to the collection of listeners who will be notified when
- * help events are generated for this editor.
- *
- * @param listener
- * the listener which should be notified
- */
- public void addHelpListener(HelpListener listener) {
- if (richText != null) {
- richText.addHelpListener(listener);
- }
- }
-
- /**
- * Removes a listener from the collection of listeners who will be notified
- * when help events are generated for this editor.
- *
- * @param listener
- * the listener which should no longer be notified
- */
- public void removeHelpListener(HelpListener listener) {
- if (richText != null) {
- richText.removeHelpListener(listener);
- }
- }
-
- /**
- * Adds the listener to the collection of listeners who will be notifed when
- * an event of the given type occurs within this editor.
- *
- * @param eventType
- * the type of event to listen for
- * @param listener
- * the listener which should be notified when the event occurs
- */
- public void addListener(int eventType, Listener listener) {
- if (richText != null) {
- richText.addListener(eventType, listener);
- }
- }
-
- /**
- * Removes the listener from the collection of listeners who will be notifed
- * when an event of the given type occurs within this editor.
- *
- * @param eventType
- * the type of event to listen for
- * @param listener
- * the listener which should no longer be notified when the event
- * occurs
- */
- public void removeListener(int eventType, Listener listener) {
- if (richText != null) {
- richText.removeListener(eventType, listener);
- }
- }
-
- /**
- * Returns the event listeners attached to this editor.
- *
- * @return an iterator for retrieving the event listeners attached to this
- * editor
- */
- public Iterator<RichTextListener> getListeners() {
- if (richText != null) {
- return richText.getListeners();
- }
- return null;
- }
-
- /**
- * Notifies the modify listeners that the rich text editor content has
- * changed.
- */
- public void notifyModifyListeners() {
- if (richText != null) {
- Event event = new Event();
- event.display = Display.getCurrent();
- event.widget = richText.getControl();
-
- for (Iterator<ModifyListener> i = getModifyListeners(); i != null && i.hasNext();) {
- ModifyListener listener = i.next();
- listener.modifyText(new ModifyEvent(event));
- }
- }
- }
-
- /**
- * Fills the tool bar with action items.
- *
- * @param toolBar
- * a tool bar contain rich text actions
- */
- public void fillToolBar(IRichTextToolBar toolBar) {
- }
-
- /**
- * Creates the underlying rich text control.
- *
- * @param parent
- * the parent composite
- * @param style
- * the style for the control
- * @param basePath
- * the path used for resolving links
- */
- protected IRichText createRichTextControl(Composite parent, int style,
- String basePath) {
- return new RichText(parent, style, basePath);
- }
-
- /**
- * Creates the editor tab folder.
- *
- * @param parent
- * the parent control
- * @param style
- * the style for the control
- * @return a new editor toolbar
- */
- protected CTabFolder createEditorTabFolder(Composite parent, int style) {
- CTabFolder folder = new CTabFolder(parent, SWT.FLAT | SWT.BOTTOM);
- folder.setLayout(new GridLayout(1, true));
- folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Composite richTextComposite = new Composite(folder, SWT.FLAT);
- GridLayout richTextCompositeLayout = new GridLayout(1, false);
- richTextCompositeLayout.marginHeight = 0;
- richTextCompositeLayout.marginWidth = 0;
- richTextComposite.setLayout(richTextCompositeLayout);
- richTextComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- richText = createRichTextControl(richTextComposite, style, basePath);
- richText.setData(PROPERTY_NAME, this);
- richText.getFindReplaceAction().setRichText(this);
-
- richTextTab = new CTabItem(folder, SWT.FLAT);
- richTextTab.setText(RichTextResources.richTextTab_text);
- richTextTab.setToolTipText(RichTextResources.richTextTab_toolTipText);
- richTextTab.setControl(richTextComposite);
-
- Composite htmlComposite = new Composite(folder, SWT.FLAT);
- htmlComposite.setLayout(new FillLayout());
-
- sourceViewer = new TextViewer(htmlComposite, SWT.FLAT | SWT.MULTI
- | SWT.WRAP | SWT.V_SCROLL);
- sourceViewer.setUndoManager(undoManager);
- setDocument(null);
- addModifyListeners();
- getSourceEdit().addListener(SWT.Deactivate, sourceEditDeactivateListener);
- getSourceEdit().addKeyListener(sourceEditKeyListener);
- contextMenu = new Menu(parent.getShell(), SWT.POP_UP);
- getSourceEdit().setMenu(contextMenu);
- // FIXME! This opens up a can of worms, especially with DBCS characters.
- // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=179432.
- //addDropSupportToStyledText();
- fillContextMenu(contextMenu);
-
-
- htmlTab = new CTabItem(folder, SWT.NONE);
- htmlTab.setText(HTML_TAB_NAME);
- htmlTab.setToolTipText(RichTextResources.htmlTab_toolTipText);
- htmlTab.setControl(htmlComposite);
-
- folder.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- CTabItem item = (CTabItem) event.item;
- if (item.getText().equals(HTML_TAB_NAME)) {
- removeModifyListeners();
- currentDoc.set(getText());
- sourceModified = false;
- addModifyListeners();
- if (toolBar != null) {
- toolBar.updateToolBar(editable);
- }
- } else {
- updateRichText(getSourceEdit().getText());
- setModified(true);
- if (toolBar != null) {
- toolBar.updateToolBar(editable);
- }
- }
- }
- });
- fillToolBar(toolBar);
-
- initializeActivationCodeTrigger();
- createActions();
-
- folder.setSelection(0);
-
- return folder;
- }
-
-
- private void setDocument(IDocument doc) {
- if (doc == null) {
- doc = new Document();
- }
- // clean up old doc
- undoManager.disconnect();
- IDocument oldDoc = sourceViewer.getDocument();
- if (oldDoc != null) {
- oldDoc.removeDocumentListener(sourceEditDocumentListener);
- }
-
- // hook up new doc
- currentDoc = doc;
- sourceViewer.setDocument(currentDoc);
- currentDoc.addDocumentListener(sourceEditDocumentListener);
- undoManager.connect(sourceViewer);
- if (undoAction != null) {
- undoAction.setContext(getUndoContext());
- }
- if (redoAction != null) {
- redoAction.setContext(getUndoContext());
- }
- }
-
- /**
- * Returns the HTML source edit control.
- *
- * @return a <code>StyleText</code> object.
- */
- public StyledText getSourceEdit() {
- if (sourceViewer != null) {
- return sourceViewer.getTextWidget();
- }
- return null;
- }
-
- /**
- * Inserts text at the selection (overwriting the selection).
- */
- public void addHTML(String text) {
- if (text == null || text.length() == 0)
- return;
- if (tabFolder.getSelection() == richTextTab) {
- //To avoid encoding of javascript
- text = text.replaceAll("&", "&amp;"); //$NON-NLS-1$//$NON-NLS-2$
- executeCommand(RichTextCommand.ADD_HTML, text);
- } else if (tabFolder.getSelection() == htmlTab) {
- String oldHTML = getSourceEdit().getText();
- Point sel = sourceViewer.getSelectedRange();
- int selStartIndex = sel.x;
- int selEndIndex = sel.x + sel.y - 1;
- String newHTML = oldHTML.substring(0, selStartIndex) + text
- + oldHTML.substring(selEndIndex + 1);
- removeModifyListeners();
- currentDoc.set(newHTML);
- addModifyListeners();
- updateRichText(newHTML);
- }
- }
-
-
- /**
- * Inserts an image at the selection (overwriting the selection).
- */
- public void addImage(String imageURL, String height, String width, String altTag) {
- if (tabFolder.getSelection() == richTextTab) {
- executeCommand(
- RichTextCommand.ADD_IMAGE,
- new String[] {
- imageURL,
- height, width, altTag });
- } else if (tabFolder.getSelection() == htmlTab) {
- StringBuffer imageLink = new StringBuffer();
- // order of these attributes is the same as JTidy'ed HTML
- imageLink.append("<img"); //$NON-NLS-1$
- if (height.length() > 0) {
- imageLink.append(" height=\"" + height + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (altTag.length() > 0) {
- imageLink.append(" alt=\"" + altTag + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- imageLink.append(" src=\"" + imageURL + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- if (width.length() > 0) {
- imageLink.append(" width=\"" + width + "\""); //$NON-NLS-1$ //$NON-NLS-2$
- }
- imageLink.append(" />"); //$NON-NLS-1$
- String oldHTML = getSourceEdit().getText();
- Point sel = sourceViewer.getSelectedRange();
- int selStartIndex = sel.x;
- int selEndIndex = sel.x + sel.y - 1;
- String newHTML = oldHTML.substring(0, selStartIndex) + imageLink.toString()
- + oldHTML.substring(selEndIndex + 1);
- removeModifyListeners();
- currentDoc.set(newHTML);
- addModifyListeners();
- updateRichText(newHTML);
- }
- }
-
- /**
- * Checks whether the HTML tab is selected.
- *
- * @return <code>true</code> if the HTML tab is selected.
- */
- public boolean isHTMLTabSelected() {
- return (tabFolder.getSelection() == htmlTab);
- }
-
- /**
- * Fills the context menu with menu items.
- *
- * @param contextMenu
- * a context menu containing rich text actions
- */
- protected void fillContextMenu(Menu contextMenu) {
- final MenuItem cutItem = new MenuItem(contextMenu, SWT.PUSH);
- cutItem.setText(RichTextResources.cutAction_text);
- cutItem.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- CutAction action = new CutAction(RichTextEditor.this);
- action.execute(RichTextEditor.this);
- }
- });
- final MenuItem copyItem = new MenuItem(contextMenu, SWT.PUSH);
- copyItem.setText(RichTextResources.copyAction_text);
- copyItem.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- CopyAction action = new CopyAction(RichTextEditor.this);
- action.execute(RichTextEditor.this);
- }
- });
- final MenuItem pasteItem = new MenuItem(contextMenu, SWT.PUSH);
- pasteItem.setText(RichTextResources.pasteAction_text);
- pasteItem.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- PasteAction action = new PasteAction(RichTextEditor.this);
- action.execute(RichTextEditor.this);
- }
- });
-
- final MenuItem pastePlainTextItem = new MenuItem(contextMenu, SWT.PUSH);
- pastePlainTextItem.setText(RichTextResources.pastePlainTextAction_text);
- pastePlainTextItem.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- PastePlainTextAction action = new PastePlainTextAction(RichTextEditor.this);
- action.execute(RichTextEditor.this);
- }
- });
-
- contextMenu.addMenuListener(new MenuListener() {
- public void menuHidden(MenuEvent e) {
- }
-
- public void menuShown(MenuEvent e) {
- String selectedText = getSelected().getText();
- boolean selection = selectedText.length() > 0;
- cutItem.setEnabled(editable && selection);
- copyItem.setEnabled(selection);
- pasteItem.setEnabled(editable);
- pastePlainTextItem.setEnabled(editable);
- }
- });
- }
-
- /**
- * Updates the content of the rich text control without updating the HTML
- * source editor.
- * <p>
- * This method should be called by the HTML source editor to sync up its
- * content with the rich text control.
- *
- * @param text
- * the rich text content in XHTML format
- */
- private void updateRichText(String text) {
- if (richText != null) {
- richText.setText(text);
- richText.checkModify();
- }
- sourceModified = false;
- if (tabFolder != null) {
- if (toolBar != null) {
- toolBar.updateToolBar(editable);
- }
- }
- }
-
- private void addDropSupportToStyledText() {
- // this function based heavily on the example at:
- // http://www.eclipse.org/articles/Article-SWT-DND/DND-in-SWT.html
-
- // Allow data to be copied to the drop target
- int operations = DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT;
- sourceEditDropTarget = new DropTarget(getSourceEdit(), operations);
-
- // Receive data in Text or HTML format
- final TextTransfer textTransfer = TextTransfer.getInstance();
- final HTMLTransfer htmlTransfer = HTMLTransfer.getInstance();
- Transfer[] types = new Transfer[] {htmlTransfer, textTransfer};
- sourceEditDropTarget.setTransfer(types);
-
- sourceEditDropTarget.addDropListener(new DropTargetListener() {
- public void dragEnter(DropTargetEvent event) {
- if (event.detail == DND.DROP_DEFAULT) {
- if ((event.operations & DND.DROP_COPY) != 0) {
- event.detail = DND.DROP_COPY;
- } else {
- event.detail = DND.DROP_NONE;
- }
- }
- if (!getEditable()) {
- event.detail = DND.DROP_NONE;
- }
- // will accept text but prefer to have HTML dropped
- for (int i = 0; i < event.dataTypes.length; i++) {
- if (htmlTransfer.isSupportedType(event.dataTypes[i])){
- event.currentDataType = event.dataTypes[i];
- break;
- }
- }
- }
- public void dragOver(DropTargetEvent event) {
- event.feedback = DND.FEEDBACK_SELECT | DND.FEEDBACK_INSERT_AFTER | DND.FEEDBACK_SCROLL;
- }
- public void dragOperationChanged(DropTargetEvent event) {
- if (event.detail == DND.DROP_DEFAULT) {
- if ((event.operations & DND.DROP_COPY) != 0) {
- event.detail = DND.DROP_COPY;
- } else {
- event.detail = DND.DROP_NONE;
- }
- }
- }
- public void dragLeave(DropTargetEvent event) {
- }
- public void dropAccept(DropTargetEvent event) {
- }
- public void drop(DropTargetEvent event) {
- if (textTransfer.isSupportedType(event.currentDataType) ||
- htmlTransfer.isSupportedType(event.currentDataType)) {
- String text = (String)event.data;
- addHTML(text);
- }
- }
- });
- }
-
- /**
- * Displays the given debug message to the console.
- */
- private void printDebugMessage(String method, String msg, String text) {
- StringBuffer strBuf = new StringBuffer();
- strBuf.append("RichTextEditor[").append(richText.getControl().handle).append(']') //$NON-NLS-1$
- .append('.').append(method);
- if (msg != null && msg.length() > 0) {
- strBuf.append(": ").append(msg); //$NON-NLS-1$
- }
- if (text != null && text.length() > 0) {
- strBuf.append('\n').append(text);
- }
- System.out.println(strBuf);
- }
-
- /**
- * Displays the given debug message to the console.
- */
- private void printDebugMessage(String method, String msg) {
- printDebugMessage(method, msg, null);
- }
-
- public FindReplaceAction getFindReplaceAction() {
- return richText.getFindReplaceAction();
- }
-
- public void setFindReplaceAction(FindReplaceAction findReplaceAction) {
- if (richText != null) {
- richText.setFindReplaceAction(findReplaceAction);
- richText.getFindReplaceAction().setRichText(this);
-
- }
- }
-
- public void setInitialText(String text) {
- if (richText != null) {
- richText.setInitialText(text);
- }
- if (getSourceEdit() != null) {
- removeModifyListeners();
- setDocument(new Document(text));
- addModifyListeners();
- }
-
- }
-
-
- /**
- * from org.eclipse.ui.texteditor.AbstractTextEditor#getUndoContext()
- * Returns this editor's viewer's undo manager undo context.
- *
- * @return the undo context or <code>null</code> if not available
- * @since 3.1
- */
- private IUndoContext getUndoContext() {
- if (sourceViewer instanceof ITextViewerExtension6) {
- IUndoManager undoManager= ((ITextViewerExtension6)sourceViewer).getUndoManager();
- if (undoManager instanceof IUndoManagerExtension)
- return ((IUndoManagerExtension)undoManager).getUndoContext();
- }
- return null;
- }
-
- protected void createActions() {
- createUndoRedoActions();
- // select all
- Action selectAllAction = new Action() {
- @Override
- public void run() {
- getSourceEdit().selectAll();
- }
- };
- selectAllAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.SELECT_ALL);
- registerAction(ActionFactory.SELECT_ALL.getId(), selectAllAction);
- }
-
- /*
- * from org.eclipse.ui.texteditor.AbstractTextEditor#createUndoRedoActions()
- */
- protected void createUndoRedoActions() {
- IUndoContext undoContext= getUndoContext();
- if (undoContext != null) {
- // Use actions provided by global undo/redo
-
- // Create the undo action
- undoAction= new UndoActionHandler(getEditorSite(), undoContext);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(undoAction, IAbstractTextEditorHelpContextIds.UNDO_ACTION);
- undoAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.UNDO);
- registerAction(ITextEditorActionConstants.UNDO, undoAction);
-
- // Create the redo action.
- redoAction= new RedoActionHandler(getEditorSite(), undoContext);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(redoAction, IAbstractTextEditorHelpContextIds.REDO_ACTION);
- redoAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.REDO);
- registerAction(ITextEditorActionConstants.REDO, redoAction);
- }
- }
-
- private IEditorSite getEditorSite() {
- return editorSite;
- }
-
-
- /**
- * Registers the given undo/redo action under the given ID and
- * ensures that previously installed actions get disposed. It
- * also takes care of re-registering the new action with the
- * global action handler.
- *
- * @param actionId the action id under which to register the action
- * @param action the action to register
- * @since 3.1
- */
- private void registerAction(String actionId, IAction action) {
- IAction oldAction= getAction(actionId);
- if (oldAction instanceof OperationHistoryActionHandler)
- ((OperationHistoryActionHandler)oldAction).dispose();
-
- setAction(actionId, action);
-
- IActionBars actionBars= getEditorSite().getActionBars();
- if (actionBars != null)
- actionBars.setGlobalActionHandler(actionId, action);
- }
-
-
- /*
- * @see ITextEditor#getAction(String)
- */
- public IAction getAction(String actionID) {
- assert actionID != null;
- IAction action= (IAction) fActions.get(actionID);
-
-// if (action == null) {
-// action= findContributedAction(actionID);
-// if (action != null)
-// setAction(actionID, action);
-// }
-
- return action;
- }
-
- /*
- * @see ITextEditor#setAction(String, IAction)
- */
- public void setAction(String actionID, IAction action) {
- assert actionID != null;
- if (action == null) {
- action= (IAction) fActions.remove(actionID);
- if (action != null)
- fActivationCodeTrigger.unregisterActionFromKeyActivation(action);
- } else {
- fActions.put(actionID, action);
- fActivationCodeTrigger.registerActionForKeyActivation(action);
- }
- }
-
- /**
- * Initializes the activation code trigger.
- *
- * @since 2.1
- */
- private void initializeActivationCodeTrigger() {
- fActivationCodeTrigger.install();
- fActivationCodeTrigger.setScopes(fKeyBindingScopes);
- }
-
- /**
- * Internal key verify listener for triggering action activation codes.
- */
- class ActivationCodeTrigger implements VerifyKeyListener {
-
- /** Indicates whether this trigger has been installed. */
- private boolean fIsInstalled= false;
- /**
- * The key binding service to use.
- * @since 2.0
- */
- private IKeyBindingService fKeyBindingService;
-
- /*
- * @see VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent)
- */
- public void verifyKey(VerifyEvent event) {
-
- ActionActivationCode code= null;
- int size= fActivationCodes.size();
- for (int i= 0; i < size; i++) {
- code= (ActionActivationCode) fActivationCodes.get(i);
- if (code.matches(event)) {
- IAction action= getAction(code.fActionId);
- if (action != null) {
-
- if (action instanceof IUpdate)
- ((IUpdate) action).update();
-
- if (!action.isEnabled() && action instanceof IReadOnlyDependent) {
- IReadOnlyDependent dependent= (IReadOnlyDependent) action;
- boolean writable= dependent.isEnabled(true);
- if (writable) {
- event.doit= false;
- return;
- }
- } else if (action.isEnabled()) {
- event.doit= false;
- action.run();
- return;
- }
- }
- }
- }
- }
-
- /**
- * Installs this trigger on the editor's text widget.
- * @since 2.0
- */
- public void install() {
- if (!fIsInstalled) {
-
- if (sourceViewer instanceof ITextViewerExtension) {
- ITextViewerExtension e= (ITextViewerExtension) sourceViewer;
- e.prependVerifyKeyListener(this);
- } else {
- StyledText text= sourceViewer.getTextWidget();
- text.addVerifyKeyListener(this);
- }
-
- fKeyBindingService= getEditorSite().getKeyBindingService();
- fIsInstalled= true;
- }
- }
-
- /**
- * Uninstalls this trigger from the editor's text widget.
- * @since 2.0
- */
- public void uninstall() {
- if (fIsInstalled) {
-
- if (sourceViewer instanceof ITextViewerExtension) {
- ITextViewerExtension e= (ITextViewerExtension) sourceViewer;
- e.removeVerifyKeyListener(this);
- } else if (sourceViewer != null) {
- StyledText text= sourceViewer.getTextWidget();
- if (text != null && !text.isDisposed())
- text.removeVerifyKeyListener(fActivationCodeTrigger);
- }
-
- fIsInstalled= false;
- fKeyBindingService= null;
- }
- }
-
- /**
- * Registers the given action for key activation.
- * @param action the action to be registered
- * @since 2.0
- */
- public void registerActionForKeyActivation(IAction action) {
- if (action.getActionDefinitionId() != null)
- fKeyBindingService.registerAction(action);
- }
-
- /**
- * The given action is no longer available for key activation
- * @param action the action to be unregistered
- * @since 2.0
- */
- public void unregisterActionFromKeyActivation(IAction action) {
- if (action.getActionDefinitionId() != null)
- fKeyBindingService.unregisterAction(action);
- }
-
- /**
- * Sets the key binding scopes for this editor.
- * @param keyBindingScopes the key binding scopes
- * @since 2.1
- */
- public void setScopes(String[] keyBindingScopes) {
- if (keyBindingScopes != null && keyBindingScopes.length > 0)
- fKeyBindingService.setScopes(keyBindingScopes);
- }
- }
-
- /**
- * Representation of action activation codes.
- */
- static class ActionActivationCode {
-
- /** The action id. */
- public String fActionId;
- /** The character. */
- public char fCharacter;
- /** The key code. */
- public int fKeyCode= -1;
- /** The state mask. */
- public int fStateMask= SWT.DEFAULT;
-
- /**
- * Creates a new action activation code for the given action id.
- * @param actionId the action id
- */
- public ActionActivationCode(String actionId) {
- fActionId= actionId;
- }
-
- /**
- * Returns <code>true</code> if this activation code matches the given verify event.
- * @param event the event to test for matching
- * @return whether this activation code matches <code>event</code>
- */
- public boolean matches(VerifyEvent event) {
- return (event.character == fCharacter &&
- (fKeyCode == -1 || event.keyCode == fKeyCode) &&
- (fStateMask == SWT.DEFAULT || event.stateMask == fStateMask));
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditorForm.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditorForm.java
deleted file mode 100644
index aebc146cf72..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextEditorForm.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.swt.custom.ViewForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * A composite for laying out the default rich text editor in an Eclipse form.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextEditorForm extends ViewForm {
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent control
- * @param style
- * the style for this control
- */
- public RichTextEditorForm(Composite parent, int style) {
- super(parent, style);
- }
-
- /**
- * @see org.eclipse.swt.widgets#getData(String key)
- */
- public Object getData(String key) {
- if (key != null && key.equals(FormToolkit.KEY_DRAW_BORDER)) {
- // Return a text border to get the FormToolkit's BorderPainter to
- // paint a border for the rich text editor.
- return FormToolkit.TEXT_BORDER;
- }
- return super.getData();
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextFormToolkit.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextFormToolkit.java
deleted file mode 100644
index 7809c45f4f3..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextFormToolkit.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * A helper toolkit for creating a rich text control and editor that can be
- * added to an Eclipse form.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextFormToolkit {
-
- /**
- * Creates a rich text control and adapts it to be used in a form.
- *
- * @param toolkit
- * the form toolkit
- * @param parent
- * the parent control
- * @param text
- * the initial text for the viewer
- * @param style
- * the initial style for the viewer
- * @param basePath
- * the base path used for resolving hrefs
- * @return a new <code>IRichText</code> instance
- */
- public static IRichText createRichText(FormToolkit toolkit,
- Composite parent, String text, int style) {
- IRichText richText = new RichText(parent, toolkit.getBorderStyle()
- | style | toolkit.getOrientation());
- richText.getControl().setData(FormToolkit.KEY_DRAW_BORDER,
- FormToolkit.TEXT_BORDER);
- if (text != null) {
- richText.setText(text);
- }
- return richText;
- }
-
- /**
- * Creates a rich text editor and adapts it to be used in a form.
- *
- * @param toolkit
- * the form toolkit
- * @param parent
- * the parent control
- * @param text
- * the initial text for the viewer
- * @param style
- * the initial style for the viewer
- * @param basePath
- * the base path used for resolving hrefs
- * @return a new <code>IRichText</code> instance
- */
- public static IRichTextEditor createRichTextEditor(FormToolkit toolkit,
- Composite parent, String text, int style, IEditorSite editorSite) {
- IRichTextEditor richTextEditor = new RichTextEditor(parent, toolkit
- .getBorderStyle()
- | style | toolkit.getOrientation(), editorSite);
- richTextEditor.getControl().setData(FormToolkit.KEY_DRAW_BORDER,
- FormToolkit.TEXT_BORDER);
- if (text != null) {
- richTextEditor.setInitialText(text);
- }
- return richTextEditor;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextImages.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextImages.java
deleted file mode 100644
index db51e92f1f7..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextImages.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Shared images used by the default rich text editor.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextImages {
-
- private static final String ETOOL16 = "full/etool16/"; //$NON-NLS-1$
-
- private static final String DTOOL16 = "full/dtool16/"; //$NON-NLS-1$
-
- private static final RichTextPlugin richTextPlugin = RichTextPlugin
- .getDefault();
-
- public static final String IMG_PATH_ADD_IMAGE = ETOOL16 + "AddImage.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_ADD_LINE = ETOOL16 + "AddLine.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_ADD_LINK = ETOOL16 + "AddLink.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_ADD_ORDERED_LIST = ETOOL16
- + "AddOrderedList.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_ADD_TABLE = ETOOL16 + "AddTable.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_ADD_UNORDERED_LIST = ETOOL16
- + "AddUnorderedList.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_BOLD = ETOOL16 + "Bold.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_CLEAR_CONTENT = ETOOL16
- + "ClearContent.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_COPY = ETOOL16 + "Copy.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_CUT = ETOOL16 + "Cut.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_FIND_REPLACE = ETOOL16
- + "FindReplace.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_INDENT = ETOOL16 + "Indent.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_ITALIC = ETOOL16 + "Italic.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_JUSTIFY_CENTER = ETOOL16
- + "JustifyCenter.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_JUSTIFY_FULL = ETOOL16
- + "JustifyFull.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_JUSTIFY_LEFT = ETOOL16
- + "JustifyLeft.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_JUSTIFY_RIGHT = ETOOL16
- + "JustifyRight.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_OUTDENT = ETOOL16 + "Outdent.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_PASTE = ETOOL16 + "Paste.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_PASTE_PLAIN_TEXT = ETOOL16 + "PastePlainText.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_STRIKE_THROUGH = ETOOL16
- + "StrikeThrough.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_SUBSCRIPT = ETOOL16 + "Subscript.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_SUPERSCRIPT = ETOOL16
- + "Superscript.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_UNDERLINE = ETOOL16 + "Underline.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_TIDY = ETOOL16 + "TidyHTML.gif"; //$NON-NLS-1$
-
- public static final String IMG_PATH_ADD_CODE = ETOOL16 + "AddCode.gif"; //$NON-NLS-1$
-
- public static final Image IMG_ADD_IMAGE = richTextPlugin
- .getSharedImage(IMG_PATH_ADD_IMAGE);
-
- public static final Image IMG_ADD_LINE = richTextPlugin
- .getSharedImage(IMG_PATH_ADD_LINE);
-
- public static final Image IMG_ADD_LINK = richTextPlugin
- .getSharedImage(IMG_PATH_ADD_LINK);
-
- public static final Image IMG_ADD_ORDERED_LIST = richTextPlugin
- .getSharedImage(IMG_PATH_ADD_ORDERED_LIST);
-
- public static final Image IMG_ADD_TABLE = richTextPlugin
- .getSharedImage(IMG_PATH_ADD_TABLE);
-
- public static final Image IMG_ADD_UNORDERED_LIST = richTextPlugin
- .getSharedImage(IMG_PATH_ADD_UNORDERED_LIST);
-
- public static final Image IMG_BOLD = richTextPlugin
- .getSharedImage(IMG_PATH_BOLD);
-
- public static final Image IMG_CLEAR_CONTENT = richTextPlugin
- .getSharedImage(IMG_PATH_CLEAR_CONTENT);
-
- public static final Image IMG_COPY = richTextPlugin
- .getSharedImage(IMG_PATH_COPY);
-
- public static final Image IMG_CUT = richTextPlugin
- .getSharedImage(IMG_PATH_CUT);
-
- public static final Image IMG_FIND_REPLACE = richTextPlugin
- .getSharedImage(IMG_PATH_FIND_REPLACE);
-
- public static final Image IMG_INDENT = richTextPlugin
- .getSharedImage(IMG_PATH_INDENT);
-
- public static final Image IMG_ITALIC = richTextPlugin
- .getSharedImage(IMG_PATH_ITALIC);
-
- public static final Image IMG_JUSTIFY_CENTER = richTextPlugin
- .getSharedImage(IMG_PATH_JUSTIFY_CENTER);
-
- public static final Image IMG_JUSTIFY_FULL = richTextPlugin
- .getSharedImage(IMG_PATH_JUSTIFY_FULL);
-
- public static final Image IMG_JUSTIFY_LEFT = richTextPlugin
- .getSharedImage(IMG_PATH_JUSTIFY_LEFT);
-
- public static final Image IMG_JUSTIFY_RIGHT = richTextPlugin
- .getSharedImage(IMG_PATH_JUSTIFY_RIGHT);
-
- public static final Image IMG_OUTDENT = richTextPlugin
- .getSharedImage(IMG_PATH_OUTDENT);
-
- public static final Image IMG_PASTE = richTextPlugin
- .getSharedImage(IMG_PATH_PASTE);
-
- public static final Image IMG_PASTE_PLAIN_TEXT = richTextPlugin
- .getSharedImage(IMG_PATH_PASTE_PLAIN_TEXT);
-
- public static final Image IMG_STRIKE_THROUGH = richTextPlugin
- .getSharedImage(IMG_PATH_STRIKE_THROUGH);
-
- public static final Image IMG_SUBSCRIPT = richTextPlugin
- .getSharedImage(IMG_PATH_SUBSCRIPT);
-
- public static final Image IMG_SUPERSCRIPT = richTextPlugin
- .getSharedImage(IMG_PATH_SUPERSCRIPT);
-
- public static final Image IMG_UNDERLINE = richTextPlugin
- .getSharedImage(IMG_PATH_UNDERLINE);
- public static final Image IMG_TIDY = richTextPlugin
- .getSharedImage(IMG_PATH_TIDY);
-
- public static final ImageDescriptor IMG_DESC_ADD_IMAGE = richTextPlugin
- .getImageDescriptor(IMG_PATH_ADD_IMAGE);
-
- public static final ImageDescriptor IMG_DESC_ADD_LINE = richTextPlugin
- .getImageDescriptor(IMG_PATH_ADD_LINE);
-
- public static final ImageDescriptor IMG_DESC_ADD_LINK = richTextPlugin
- .getImageDescriptor(IMG_PATH_ADD_LINK);
-
- public static final ImageDescriptor IMG_DESC_ADD_ORDERED_LIST = richTextPlugin
- .getImageDescriptor(IMG_PATH_ADD_ORDERED_LIST);
-
- public static final ImageDescriptor IMG_DESC_ADD_TABLE = richTextPlugin
- .getImageDescriptor(IMG_PATH_ADD_TABLE);
-
- public static final ImageDescriptor IMG_DESC_ADD_UNORDERED_LIST = richTextPlugin
- .getImageDescriptor(IMG_PATH_ADD_UNORDERED_LIST);
-
- public static final ImageDescriptor IMG_DESC_BOLD = richTextPlugin
- .getImageDescriptor(IMG_PATH_BOLD);
-
- public static final ImageDescriptor IMG_DESC_CLEAR_CONTENT = richTextPlugin
- .getImageDescriptor(IMG_PATH_CLEAR_CONTENT);
-
- public static final ImageDescriptor IMG_DESC_COPY = richTextPlugin
- .getImageDescriptor(IMG_PATH_COPY);
-
- public static final ImageDescriptor IMG_DESC_CUT = richTextPlugin
- .getImageDescriptor(IMG_PATH_CUT);
-
- public static final ImageDescriptor IMG_DESC_FIND_REPLACE = richTextPlugin
- .getImageDescriptor(IMG_PATH_FIND_REPLACE);
-
- public static final ImageDescriptor IMG_DESC_INDENT = richTextPlugin
- .getImageDescriptor(IMG_PATH_INDENT);
-
- public static final ImageDescriptor IMG_DESC_ITALIC = richTextPlugin
- .getImageDescriptor(IMG_PATH_ITALIC);
-
- public static final ImageDescriptor IMG_DESC_JUSTIFY_CENTER = richTextPlugin
- .getImageDescriptor(IMG_PATH_JUSTIFY_CENTER);
-
- public static final ImageDescriptor IMG_DESC_JUSTIFY_FULL = richTextPlugin
- .getImageDescriptor(IMG_PATH_JUSTIFY_FULL);
-
- public static final ImageDescriptor IMG_DESC_JUSTIFY_LEFT = richTextPlugin
- .getImageDescriptor(IMG_PATH_JUSTIFY_LEFT);
-
- public static final ImageDescriptor IMG_DESC_JUSTIFY_RIGHT = richTextPlugin
- .getImageDescriptor(IMG_PATH_JUSTIFY_RIGHT);
-
- public static final ImageDescriptor IMG_DESC_OUTDENT = richTextPlugin
- .getImageDescriptor(IMG_PATH_OUTDENT);
-
- public static final ImageDescriptor IMG_DESC_PASTE = richTextPlugin
- .getImageDescriptor(IMG_PATH_PASTE);
-
- public static final ImageDescriptor IMG_DESC_PASTE_PLAIN_TEXT = richTextPlugin
- .getImageDescriptor(IMG_PATH_PASTE_PLAIN_TEXT);
-
- public static final ImageDescriptor IMG_DESC_STRIKE_THROUGH = richTextPlugin
- .getImageDescriptor(IMG_PATH_STRIKE_THROUGH);
-
- public static final ImageDescriptor IMG_DESC_SUBSCRIPT = richTextPlugin
- .getImageDescriptor(IMG_PATH_SUBSCRIPT);
-
- public static final ImageDescriptor IMG_DESC_SUPERSCRIPT = richTextPlugin
- .getImageDescriptor(IMG_PATH_SUPERSCRIPT);
-
- public static final ImageDescriptor IMG_DESC_UNDERLINE = richTextPlugin
- .getImageDescriptor(IMG_PATH_UNDERLINE);
-
- public static final ImageDescriptor IMG_DESC_TIDY = richTextPlugin
- .getImageDescriptor(IMG_PATH_TIDY);
-
- public static final ImageDescriptor IMG_DESC_ADD_CODE = richTextPlugin
- .getImageDescriptor(IMG_PATH_ADD_CODE);
-
-
- public static final String DISABLED_IMG_PATH_ADD_IMAGE = DTOOL16
- + "AddImage.gif"; //$NON-NLS-1$
-
-// public static final String DISABLED_IMG_PATH_ADD_LINE = DTOOL16
-// + "AddLine.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_ADD_LINK = DTOOL16
- + "AddLink.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_ADD_ORDERED_LIST = DTOOL16
- + "AddOrderedList.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_ADD_TABLE = DTOOL16
- + "AddTable.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_ADD_UNORDERED_LIST = DTOOL16
- + "AddUnorderedList.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_BOLD = DTOOL16 + "Bold.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_CLEAR_CONTENT = DTOOL16
- + "ClearContent.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_COPY = DTOOL16 + "Copy.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_CUT = DTOOL16 + "Cut.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_FIND_REPLACE = DTOOL16
- + "FindReplace.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_INDENT = DTOOL16
- + "Indent.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_ITALIC = DTOOL16
- + "Italic.gif"; //$NON-NLS-1$
-
-// public static final String DISABLED_IMG_PATH_JUSTIFY_CENTER = DTOOL16
-// + "JustifyCenter.gif"; //$NON-NLS-1$
-//
-// public static final String DISABLED_IMG_PATH_JUSTIFY_FULL = DTOOL16
-// + "JustifyFull.gif"; //$NON-NLS-1$
-//
-// public static final String DISABLED_IMG_PATH_JUSTIFY_LEFT = DTOOL16
-// + "JustifyLeft.gif"; //$NON-NLS-1$
-//
-// public static final String DISABLED_IMG_PATH_JUSTIFY_RIGHT = DTOOL16
-// + "JustifyRight.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_OUTDENT = DTOOL16
- + "Outdent.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_PASTE = DTOOL16 + "Paste.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_PASTE_PLAIN_TEXT = DTOOL16 + "PastePlainText.gif"; //$NON-NLS-1$
-
-// public static final String DISABLED_IMG_PATH_STRIKE_THROUGH = DTOOL16
-// + "StrikeThrough.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_SUBSCRIPT = DTOOL16
- + "Subscript.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_SUPERSCRIPT = DTOOL16
- + "Superscript.gif"; //$NON-NLS-1$
-
- private static String DISABLED_IMG_PATH_TIDY = DTOOL16 + "TidyHTML.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_UNDERLINE = DTOOL16
- + "Underline.gif"; //$NON-NLS-1$
-
- public static final String DISABLED_IMG_PATH_ADD_CODE = DTOOL16
- + "AddCode.gif"; //$NON-NLS-1$
-
- public static final Image DISABLED_IMG_ADD_IMAGE = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_ADD_IMAGE);
-
-// public static final Image DISABLED_IMG_ADD_LINE = richTextPlugin
-// .getSharedImage(DISABLED_IMG_PATH_ADD_LINE);
-
- public static final Image DISABLED_IMG_ADD_LINK = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_ADD_LINK);
-
- public static final Image DISABLED_IMG_ADD_ORDERED_LIST = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_ADD_ORDERED_LIST);
-
- public static final Image DISABLED_IMG_ADD_TABLE = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_ADD_TABLE);
-
- public static final Image DISABLED_IMG_ADD_UNORDERED_LIST = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_ADD_UNORDERED_LIST);
-
- public static final Image DISABLED_IMG_BOLD = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_BOLD);
-
- public static final Image DISABLED_IMG_CLEAR_CONTENT = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_CLEAR_CONTENT);
-
- public static final Image DISABLED_IMG_COPY = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_COPY);
-
- public static final Image DISABLED_IMG_CUT = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_CUT);
-
- public static final Image DISABLED_IMG_FIND_REPLACE = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_FIND_REPLACE);
-
- public static final Image DISABLED_IMG_INDENT = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_INDENT);
-
- public static final Image DISABLED_IMG_ITALIC = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_ITALIC);
-
-// public static final Image DISABLED_IMG_JUSTIFY_CENTER = richTextPlugin
-// .getSharedImage(DISABLED_IMG_PATH_JUSTIFY_CENTER);
-//
-// public static final Image DISABLED_IMG_JUSTIFY_FULL = richTextPlugin
-// .getSharedImage(DISABLED_IMG_PATH_JUSTIFY_FULL);
-//
-// public static final Image DISABLED_IMG_JUSTIFY_LEFT = richTextPlugin
-// .getSharedImage(DISABLED_IMG_PATH_JUSTIFY_LEFT);
-//
-// public static final Image DISABLED_IMG_JUSTIFY_RIGHT = richTextPlugin
-// .getSharedImage(DISABLED_IMG_PATH_JUSTIFY_RIGHT);
-
- public static final Image DISABLED_IMG_OUTDENT = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_OUTDENT);
-
- public static final Image DISABLED_IMG_PASTE = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_PASTE);
-
-// public static final Image DISABLED_IMG_STRIKE_THROUGH = richTextPlugin
-// .getSharedImage(DISABLED_IMG_PATH_STRIKE_THROUGH);
-
- public static final Image DISABLED_IMG_SUBSCRIPT = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_SUBSCRIPT);
-
- public static final Image DISABLED_IMG_SUPERSCRIPT = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_SUPERSCRIPT);
-
- public static final Image DISABLED_IMG_UNDERLINE = richTextPlugin
- .getSharedImage(DISABLED_IMG_PATH_UNDERLINE);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_ADD_IMAGE = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_ADD_IMAGE);
-
-// public static final ImageDescriptor DISABLED_IMG_DESC_ADD_LINE = richTextPlugin
-// .getImageDescriptor(DISABLED_IMG_PATH_ADD_LINE);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_ADD_LINK = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_ADD_LINK);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_ADD_ORDERED_LIST = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_ADD_ORDERED_LIST);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_ADD_TABLE = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_ADD_TABLE);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_ADD_UNORDERED_LIST = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_ADD_UNORDERED_LIST);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_BOLD = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_BOLD);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_CLEAR_CONTENT = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_CLEAR_CONTENT);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_COPY = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_COPY);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_CUT = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_CUT);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_FIND_REPLACE = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_FIND_REPLACE);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_INDENT = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_INDENT);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_ITALIC = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_ITALIC);
-
-// public static final ImageDescriptor DISABLED_IMG_DESC_JUSTIFY_CENTER = richTextPlugin
-// .getImageDescriptor(DISABLED_IMG_PATH_JUSTIFY_CENTER);
-//
-// public static final ImageDescriptor DISABLED_IMG_DESC_JUSTIFY_FULL = richTextPlugin
-// .getImageDescriptor(DISABLED_IMG_PATH_JUSTIFY_FULL);
-//
-// public static final ImageDescriptor DISABLED_IMG_DESC_JUSTIFY_LEFT = richTextPlugin
-// .getImageDescriptor(DISABLED_IMG_PATH_JUSTIFY_LEFT);
-//
-// public static final ImageDescriptor DISABLED_IMG_DESC_JUSTIFY_RIGHT = richTextPlugin
-// .getImageDescriptor(DISABLED_IMG_PATH_JUSTIFY_RIGHT);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_OUTDENT = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_OUTDENT);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_PASTE = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_PASTE);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_PASTE_PLAIN_TEXT = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_PASTE_PLAIN_TEXT);
-
-// public static final ImageDescriptor DISABLED_IMG_DESC_STRIKE_THROUGH = richTextPlugin
-// .getImageDescriptor(DISABLED_IMG_PATH_STRIKE_THROUGH);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_SUBSCRIPT = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_SUBSCRIPT);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_SUPERSCRIPT = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_SUPERSCRIPT);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_UNDERLINE = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_UNDERLINE);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_TIDY = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_TIDY);
-
- public static final ImageDescriptor DISABLED_IMG_DESC_ADD_CODE = richTextPlugin
- .getImageDescriptor(DISABLED_IMG_PATH_ADD_CODE);
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextListener.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextListener.java
deleted file mode 100644
index 8e6116ab635..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextListener.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Listens to a rich text editing event.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextListener {
-
- private int eventType;
-
- private Listener listener;
-
- /**
- * Creates a new instance.
- *
- * @param eventType
- * the event type
- * @param listener
- * the event listener
- */
- public RichTextListener(int eventType, Listener listener) {
- this.eventType = eventType;
- this.listener = listener;
- }
-
- /**
- * Returns the event type.
- *
- * @return the event type
- */
- public int getEventType() {
- return eventType;
- }
-
- /**
- * Returns the event listener.
- */
- public Listener getListener() {
- return listener;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextPlugin.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextPlugin.java
deleted file mode 100644
index b204b83a44b..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextPlugin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import java.util.Date;
-
-import org.eclipse.epf.common.ui.AbstractPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Rich Text plug-in class.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextPlugin extends AbstractPlugin {
-
- // The shared plug-in instance.
- private static RichTextPlugin plugin;
-
- // The date and time when this plug-in was started.
- private Date startTime;
-
- /**
- * Default constructor.
- */
- public RichTextPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * @see AbstractPlugin#start(BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- startTime = new Date();
- }
-
- /**
- * @see AbstractPlugin#stop(BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared plug-in instance.
- */
- public static RichTextPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the date and time when this plug-in was started.
- */
- public Date getStartTime() {
- return startTime;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextResources.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextResources.java
deleted file mode 100644
index 0dc234b29f3..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextResources.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The RichText resources.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public final class RichTextResources extends NLS {
-
- private static String BUNDLE_NAME = RichTextResources.class
- .getPackage().getName() + ".Resources"; //$NON-NLS-1$
-
- private RichTextResources() {
- // Do not instantiate.
- }
-
- public static String fontNameAction_CSS_Default;
- public static String fontNameAction_CSS_Default_Mozilla;
- public static String fontNameAction_DefaultFontName;
- public static String fontStyle_normal;
- public static String fontStyle_sectionHeading;
- public static String fontStyle_subsectionHeading;
- public static String fontStyle_subSubsectionHeading;
- public static String fontStyle_quote;
- public static String fontStyle_codeSample;
- public static String blockTag_paragraph;
- public static String blockTag_heading1;
- public static String blockTag_heading2;
- public static String blockTag_heading3;
- public static String blockTag_heading4;
- public static String blockTag_heading5;
- public static String blockTag_heading6;
- public static String blockTag_address;
- public static String blockTag_preformattedText;
- public static String fontName_default;
- public static String fontName_arial;
- public static String fontName_courierNew;
- public static String fontName_timesNewRoman;
- public static String fontName_verdana;
- public static String addHorizontalBarAction_toolTipText;
- public static String addImageAction_toolTipText;
- public static String addLineAction_toolTipText;
- public static String addLinkAction_toolTipText;
- public static String addOrderedListAction_toolTipText;
- public static String addTableAction_toolTipText;
- public static String addUnorderedListAction_toolTipText;
- public static String boldAction_toolTipText;
- public static String clearContentAction_toolTipText;
- public static String copyAction_toolTipText;
- public static String cutAction_toolTipText;
- public static String findReplaceAction_toolTipText;
- public static String indentAction_toolTipText;
- public static String italicAction_toolTipText;
- public static String justifyCenterAction_toolTipText;
- public static String justifyFullAction_toolTipText;
- public static String justifyLeftAction_toolTipText;
- public static String justifyRightAction_toolTipText;
- public static String outdentAction_toolTipText;
- public static String pasteAction_toolTipText;
- public static String pastePlainTextAction_toolTipText;
- public static String subscriptAction_toolTipText;
- public static String superscriptAction_toolTipText;
- public static String underlineAction_toolTipText;
- public static String fontStyleAction_toolTipText;
- public static String blockTagAction_toolTipText;
- public static String fontNameAction_toolTipText;
- public static String fontSizeAction_toolTipText;
- public static String cutAction_text;
- public static String copyAction_text;
- public static String pasteAction_text;
- public static String pastePlainTextAction_text;
- public static String richTextTab_text;
- public static String richTextTab_toolTipText;
- public static String htmlTab_text;
- public static String htmlTab_toolTipText;
- public static String addImageDialog_title;
- public static String addLinkDialog_title;
- public static String addTableDialog_title;
- public static String findReplaceDialog_title;
- public static String urlDisplayNameLabel_text;
- public static String urlLabel_text;
- public static String summaryLabel_text;
- public static String captionLabel_text;
- public static String rowsLabel_text;
- public static String columnsLabel_text;
- public static String widthLabel_text;
- public static String tableStyleLabel_text;
- public static String tableHeaderNone_text;
- public static String tableHeaderCols_text;
- public static String tableHeaderRows_text;
- public static String tableHeaderBoth_text;
- public static String browseButton_text;
- public static String clearContentDialog_title;
- public static String clearContentDialog_text;
- public static String findLabel_text;
- public static String replaceLabel_text;
- public static String optionsGroup_text;
- public static String caseSensitiveCheckbox_text;
- public static String wholeWordCheckbox_text;
- public static String directionGroup_text;
- public static String forwardRadioButton_text;
- public static String backwardRadioButton_text;
- public static String findButton_text;
- public static String replaceButton_text;
- public static String replaceFindButton_text;
- public static String replaceallButton_text;
- public static String FindReplace_Status_noMatch_label;
- public static String maxCharsPerLineLabel_text;
- public static String indentHTMLCheckbox_text;
- public static String indentSizeLabel_text;
- public static String tidy_clean_text;
- public static String tidy_cleaner_text;
- public static String tidy_cleanest_text;
- public static String tidy_clean_toolTipText;
- public static String tidy_cleaner_toolTipText;
- public static String tidy_cleanest_toolTipText;
- public static String addCodeAction_toolTipText;
- public static String addCodeDialog_title;
- public static String addCodeDialog_Msg;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, RichTextResources.class);
- }
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextSelection.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextSelection.java
deleted file mode 100644
index ee9c7671704..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextSelection.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-/**
- * Models a text selection in a rich text control and editor.
- *
- * @author Jeff Hardy
- * @since 1.2
- */
-public class RichTextSelection {
-
- // The control's text selection.
- protected String text = ""; //$NON-NLS-1$
-
- // The control's text selection offset
- protected int offsetStart = 0;
-
- // The control's text selection font
- protected String fontName = ""; //$NON-NLS-1$
-
- // The control's text selection font size
- // could be in point size (12pt), or HTML size (1-7)
- protected String fontSize = ""; //$NON-NLS-1$
-
- // The control's text current style
- protected String blockStyle = ""; //$NON-NLS-1$
-
- // The control's text current flags
- protected int flags = 0;
-
- // Text status flags
- public static final int BOLD = 1;
-
- public static final int ITALIC = BOLD << 1;
-
- public static final int UNDERLINE = ITALIC << 1;
-
- public static final int SUBSCRIPT = UNDERLINE << 1;
-
- public static final int SUPERSCRIPT = SUBSCRIPT << 1;
-
- public String getBlockStyle() {
- return blockStyle;
- }
-
- public void setBlockStyle(String blockStyle) {
- this.blockStyle = blockStyle;
- }
-
- public int getFlags() {
- return flags;
- }
-
- public void setFlags(int flags) {
- this.flags = flags;
- }
-
- public String getFontName() {
- return fontName;
- }
-
- public void setFontName(String fontName) {
- this.fontName = fontName;
- }
-
- public String getFontSize() {
- return fontSize;
- }
-
- public void setFontSize(String fontSize) {
- this.fontSize = fontSize;
- }
-
- public int getOffsetStart() {
- return offsetStart;
- }
-
- public void setOffsetStart(int offsetStart) {
- this.offsetStart = offsetStart;
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public boolean isBold() {
- return (flags & BOLD) != 0;
- }
-
- public boolean isItalic() {
- return (flags & ITALIC) != 0;
- }
-
- public boolean isUnderLine() {
- return (flags & UNDERLINE) != 0;
- }
-
- public boolean isSubscript() {
- return (flags & SUBSCRIPT) != 0;
- }
-
- public boolean isSuperscript() {
- return (flags & SUPERSCRIPT) != 0;
- }
-
- /**
- * Clears the selection info
- */
- public void clear() {
- text = ""; //$NON-NLS-1$
- offsetStart = 0;
- fontName = ""; //$NON-NLS-1$
- fontSize = ""; //$NON-NLS-1$
- blockStyle = ""; //$NON-NLS-1$
- flags = 0;
- }
-
- public String toString() {
- String str = "Text: " + text + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
- str += "fontName: " + fontName + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
- str += "fontSize: " + fontSize + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
- str += "blockStyle: " + blockStyle + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
- str += "flags: " + flags + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
- return str;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextToolBar.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextToolBar.java
deleted file mode 100644
index 70252607447..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/RichTextToolBar.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.richtext.actions.IRichTextAction;
-import org.eclipse.epf.richtext.actions.RichTextAction;
-import org.eclipse.epf.richtext.actions.RichTextComboAction;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * The default rich text tool bar implementation.
- *
- * Split into 2 toolbars (one for CCombos, one for buttons) for tabbing purposes.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class RichTextToolBar implements IRichTextToolBar {
-
- // The parent rich text control.
- private IRichText richText;
-
- // If true, add a new tool bar.
- private boolean addToolBar = true;
-
- // The current tool bar manager used to populate the tool actions.
- private ToolBarManager toolbarMgr;
-
- // The current tool bar manager used to populate the tool actions.
- private ToolBarManager toolbarMgrCombo;
-
- // The action items in the tool bar(s).
- private List<Object> actionItems = new ArrayList<Object>();
-
- private static int lastWidth = -1;
-
- protected Composite parent;
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent composite
- * @param style
- * the tool bar style
- * @param richText
- * the parent rich text control
- */
- public RichTextToolBar(Composite parent, int style, IRichText richText) {
- this.parent = parent;
- this.richText = richText;
-
- addToolBar();
- }
-
- public void addAction(final IAction action) {
- if (action != null) {
- ActionContributionItem item = new ActionContributionItem(action);
- toolbarMgr.add(item);
- toolbarMgr.update(true);
- actionItems.add(item);
- }
- }
-
- /**
- * Adds a combo action to the tool bar.
- *
- * @param action
- * the action to add
- */
- public void addAction(final RichTextComboAction item) {
- if (item != null) {
- item.init();
- toolbarMgrCombo.add(item);
- toolbarMgrCombo.update(true);
- actionItems.add(item);
- }
- }
-
- /**
- * Adds a separator to the tool bar.
- */
- public void addSeparator() {
- toolbarMgr.add(new Separator());
- }
-
- /**
- * Updates the toolbar state.
- * <p>
- * Enables/disables actions depending on the currently selected
- * RichTextEditor tab (RichText vs. HTML)
- *
- * @param editable
- * specifies whether to enable non-ReadOnly commands
- */
- public void updateToolBar(boolean editable) {
- boolean richTextMode = true;
- if (richText instanceof RichTextEditor
- && ((RichTextEditor) richText).isHTMLTabSelected()) {
- richTextMode = false;
- }
- for (Iterator i = actionItems.iterator(); i.hasNext();) {
- Object item = i.next();
- if (item instanceof ToolItem) {
- boolean enabledToolItem = true;
- ToolItem toolItem = (ToolItem) item;
- IRichTextAction action = (IRichTextAction) toolItem.getData();
- if (action != null && !editable
- && action.disableInReadOnlyMode()) {
- enabledToolItem = false;
- }
- if (action != null && !richTextMode
- && action.disableInSourceMode()) {
- enabledToolItem = false;
- }
- toolItem.setEnabled(enabledToolItem);
- } else if (item instanceof Combo) {
- if (richTextMode && editable) {
- ((Combo) item).setEnabled(true);
- } else {
- ((Combo) item).setEnabled(false);
- }
- } else if (item instanceof ActionContributionItem) {
- boolean enabledToolItem = true;
- RichTextAction action = (RichTextAction) ((ActionContributionItem) item)
- .getAction();
- if (action != null && !editable
- && action.disableInReadOnlyMode()) {
- enabledToolItem = false;
- }
- if (action != null && !richTextMode
- && action.disableInSourceMode()) {
- enabledToolItem = false;
- }
- action.setEnabled(enabledToolItem);
- }
- }
- }
-
- /**
- * Adds a tool bar, if necessary, to contain a button action or separator.
- */
- protected void addToolBar() {
- if (addToolBar) {
- toolbarMgrCombo = new ToolBarManager(SWT.WRAP | SWT.FLAT | parent.getStyle());
- toolbarMgrCombo.createControl(parent);
- toolbarMgr = new ToolBarManager(SWT.WRAP | SWT.FLAT | parent.getStyle());
- toolbarMgr.createControl(parent);
- addToolBar = false;
- }
- }
-
- public ToolBarManager getToolbarMgr() {
- return toolbarMgr;
- }
-
- public ToolBarManager getToolbarMgrCombo() {
- return toolbarMgrCombo;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddCodeAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddCodeAction.java
deleted file mode 100644
index 49a63617e24..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddCodeAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
-* Licensed Materials - Property of IBM
-* (c) Copyright IBM Corporation 2007,2011. All Rights Reserved.
-*
-* Note to U.S. Government Users Restricted Rights:
-* Use, duplication or disclosure restricted by GSA ADP Schedule
-* Contract with IBM Corp.
-*******************************************************************************/
-
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.dialogs.AddCodeDialog;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-public class AddCodeAction extends RichTextAction {
-
- public AddCodeAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_ADD_CODE);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_ADD_CODE);
- setToolTipText(RichTextResources.addCodeAction_toolTipText);
- }
-
- public void execute(IRichText richText) {
- if (richText != null ) {
- AddCodeDialog dialog = new AddCodeDialog(Display.getCurrent().getActiveShell());
- dialog.open();
- if (dialog.getReturnCode() == Window.OK) {
- String html = RichText.workaroundForObjectParamNode(dialog.getCode());
- richText.executeCommand(RichTextCommand.ADD_HTML, html);
- }
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddImageAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddImageAction.java
deleted file mode 100644
index c5b9ece213b..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddImageAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.dialogs.AddImageDialog;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Adds an image to a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddImageAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public AddImageAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_ADD_IMAGE);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_ADD_IMAGE);
- setToolTipText(RichTextResources.addImageAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- AddImageDialog dialog = new AddImageDialog(Display.getCurrent()
- .getActiveShell());
- dialog.open();
- if (dialog.getReturnCode() == Window.OK) {
- String imageURL = dialog.getImage().getURL();
- if (imageURL.length() > 0) {
- richText
- .executeCommand(RichTextCommand.ADD_IMAGE, imageURL);
- }
- }
- }
- }
-
- public boolean disableInSourceMode() {
- return false;
- }
-
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLineAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLineAction.java
deleted file mode 100644
index 206e287bc88..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLineAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Adds a horizontal bar to a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddLineAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public AddLineAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_ADD_LINE);
- setToolTipText(RichTextResources.addLineAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.ADD_LINE);
- }
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLinkAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLinkAction.java
deleted file mode 100644
index 91d0ec0fba3..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddLinkAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.dialogs.AddLinkDialog;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Adds a link to a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddLinkAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public AddLinkAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_ADD_LINK);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_ADD_LINK);
- setToolTipText(RichTextResources.addLinkAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- AddLinkDialog dialog = new AddLinkDialog(Display.getCurrent()
- .getActiveShell(), richText.getBasePath());
- dialog.open();
- if (dialog.getReturnCode() == Window.OK) {
- String linkURL = dialog.getLink().getURL();
- if (linkURL.length() > 0) {
- richText.executeCommand(RichTextCommand.ADD_LINK, linkURL);
- }
- }
- }
- }
-
- public boolean disableInSourceMode() {
- return false;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddOrderedListAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddOrderedListAction.java
deleted file mode 100644
index 60eca82eb26..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddOrderedListAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Adds an ordered list to a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddOrderedListAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public AddOrderedListAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_ADD_ORDERED_LIST);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_ADD_ORDERED_LIST);
- setToolTipText(RichTextResources.addOrderedListAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.ADD_ORDERED_LIST);
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddTableAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddTableAction.java
deleted file mode 100644
index e3d68dab496..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddTableAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.dialogs.AddTableDialog;
-import org.eclipse.epf.richtext.html.Table;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Adds a table to a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddTableAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public AddTableAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_ADD_TABLE);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_ADD_TABLE);
- setToolTipText(RichTextResources.addTableAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- AddTableDialog dialog = new AddTableDialog(Display.getCurrent()
- .getActiveShell());
- dialog.open();
- if (dialog.getReturnCode() == Window.OK) {
- Table table = dialog.getTable();
- int rows = table.getRows();
- int cols = table.getColumns();
- String width = table.getWidth();
- int tableheaders = table.getTableHeaders();
- String summary = table.getSummary();
- String caption = table.getCaption();
- if (rows > 0 && cols > 0) {
- richText
- .executeCommand(
- RichTextCommand.ADD_TABLE,
- new String[] {
- "" + rows, "" + cols, "" + width, summary, caption, "" + tableheaders }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
- }
- }
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddUnorderedListAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddUnorderedListAction.java
deleted file mode 100644
index fa9c0b8fcef..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/AddUnorderedListAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Adds an unordered list to a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddUnorderedListAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public AddUnorderedListAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_ADD_UNORDERED_LIST);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_ADD_UNORDERED_LIST);
- setToolTipText(RichTextResources.addUnorderedListAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.ADD_UNORDERED_LIST);
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BaseRichTextAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BaseRichTextAction.java
deleted file mode 100644
index e5024d72520..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BaseRichTextAction.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-/**
- * The abstract base class for all rich text action.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public abstract class BaseRichTextAction implements IBaseRichTextAction {
-
- protected String toolTipText;
-
- protected boolean enabled = true;
-
- /**
- * Creates a new instance.
- *
- * @param richText
- * a rich text control
- */
- public BaseRichTextAction() {
- }
-
- /**
- * Returns the tool tip for the action.
- *
- * @return the tool tip text
- */
- public String getToolTipText() {
- return toolTipText;
- }
-
- /**
- * Sets the tool tip for the action.
- *
- * @param toolTipText
- * the tool tip text
- */
- public void setToolTipText(String toolTipText) {
- this.toolTipText = toolTipText;
- }
-
- /**
- * Returns the enabled status of the action.
- *
- * @return <code>true</code> if enabled, <code>false</code> if not
- */
- public boolean getEnabled() {
- return enabled;
- }
-
- /**
- * Enables or disables the action.
- *
- * @param enabled
- * if <code>true</code>, enable the action. if
- * <code>false</code>, disable it.
- */
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BlockTagAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BlockTagAction.java
deleted file mode 100644
index 92dd320a3a2..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BlockTagAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.BlockTag;
-
-/**
- * Sets the font name for the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class BlockTagAction extends RichTextComboAction {
-
- /**
- * Creates a new instance.
- */
- public BlockTagAction(final IRichText richText) {
- super(richText);
- setToolTipText(RichTextResources.blockTagAction_toolTipText);
- }
-
- @Override
- public Collection<String> getInput() {
- Collection<String> returnList = new ArrayList<String>();
-
- returnList.add(BlockTag.PARAGRAPH.getName());
- returnList.add(BlockTag.HEADING_1.getName());
- returnList.add(BlockTag.HEADING_2.getName());
- returnList.add(BlockTag.HEADING_3.getName());
- returnList.add(BlockTag.HEADING_4.getName());
- returnList.add(BlockTag.HEADING_5.getName());
- returnList.add(BlockTag.HEADING_6.getName());
- returnList.add(BlockTag.ADDRESS.getName());
- returnList.add(BlockTag.PREFORMATTED_TEXT.getName());
-
- return returnList;
- }
-
-
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- * @param index
- * the index of the selected item
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- String selected = getCComboSelection();
- richText.executeCommand(RichTextCommand.FORMAT_BLOCK, selected);
- }
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BoldAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BoldAction.java
deleted file mode 100644
index be193e621d1..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/BoldAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the 'bold' attribute of the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class BoldAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public BoldAction(final IRichText richText) {
- super(richText, IAction.AS_CHECK_BOX);
- setImageDescriptor(RichTextImages.IMG_DESC_BOLD);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_BOLD);
- setToolTipText(RichTextResources.boldAction_toolTipText);
- // add listener
- richText.addListener(SWT.SELECTED, new Listener() {
- public void handleEvent(Event event) {
- setChecked(richText.getSelected().isBold());
- }
- });
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.BOLD);
- }
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ClearContentAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ClearContentAction.java
deleted file mode 100644
index a6a6d0dc676..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ClearContentAction.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Clears the content of a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class ClearContentAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public ClearContentAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_CLEAR_CONTENT);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_CLEAR_CONTENT);
- setToolTipText(RichTextResources.clearContentAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * s rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- if (RichTextPlugin.getDefault().getMsgDialog().displayPrompt(
- RichTextResources.clearContentDialog_title,
- RichTextResources.clearContentDialog_text)) {
- richText.executeCommand(RichTextCommand.CLEAR_CONTENT);
- }
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CopyAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CopyAction.java
deleted file mode 100644
index e8796f6e854..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CopyAction.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.custom.StyledText;
-
-/**
- * Copies the selected text in a rich text control to the clipboard.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class CopyAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public CopyAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_COPY);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_COPY);
- setToolTipText(RichTextResources.copyAction_toolTipText);
- }
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in readonly mode.
- */
- public boolean disableInReadOnlyMode() {
- return false;
- }
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in source edit mode.
- */
- public boolean disableInSourceMode() {
- return false;
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- if (richText instanceof RichTextEditor
- && ((RichTextEditor) richText).isHTMLTabSelected()) {
- StyledText styledText = ((RichTextEditor) richText).getSourceEdit();
- styledText.copy();
- } else {
- richText.setCopyURL();
- richText.executeCommand(RichTextCommand.COPY);
- }
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CutAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CutAction.java
deleted file mode 100644
index 4e03e253654..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/CutAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.custom.StyledText;
-
-/**
- * Cuts the selected text in the rich text control to the clipboard.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class CutAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public CutAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_CUT);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_CUT);
- setToolTipText(RichTextResources.cutAction_toolTipText);
- }
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in source edit mode.
- */
- public boolean disableInSourceMode() {
- return false;
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- if (richText instanceof RichTextEditor
- && ((RichTextEditor) richText).isHTMLTabSelected()) {
- StyledText styledText = ((RichTextEditor) richText)
- .getSourceEdit();
- styledText.cut();
- } else {
- richText.setCopyURL();
- richText.executeCommand(RichTextCommand.CUT);
- }
- }
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FindReplaceAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FindReplaceAction.java
deleted file mode 100644
index 267d7b97465..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FindReplaceAction.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.common.utils.XMLUtil;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.dialogs.FindReplaceDialog;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Finds and replaces text in a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class FindReplaceAction extends RichTextAction {
-
- /**
- * Finds text sub action.
- */
- public static final int FIND_TEXT = 1;
-
- /**
- * Replaces text sub action.
- */
- public static final int REPLACE_TEXT = 2;
-
- /**
- * Replaces and finds text sub action.
- */
- public static final int REPLACE_FIND_TEXT = 3;
-
- /**
- * Replaces all sub action.
- */
- public static final int REPLACE_ALL_TEXT = 4;
-
- /**
- * Find match in a forward direction.
- */
- public static final int FORWARD_MATCH = 1;
-
- /**
- * Find match in a backward direction.
- */
- public static final int BACKWARD_MATCH = -1;
-
- /**
- * Whole word match.
- */
- public static final int WHOLE_WORD_MATCH = 2;
-
- /**
- * Case sensitive match.
- */
- public static final int CASE_SENSITIVE_MATCH = 4;
-
- // Encoded single quote.
- protected static final String ENCODED_SINGLE_QUOTE = "%sq%"; //$NON-NLS-1$
-
- protected IRichText richText;
-
- protected StyledText styledText;
-
- protected boolean foundMatch = false;
-
- // the dialog instance
- protected FindReplaceDialog dialog;
-
- /**
- * Creates a new instance.
- */
- public FindReplaceAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_FIND_REPLACE);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_FIND_REPLACE);
- setToolTipText(RichTextResources.findReplaceAction_toolTipText);
- }
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in readonly mode.
- */
- public boolean disableInReadOnlyMode() {
- return false;
- }
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in source edit mode.
- */
- public boolean disableInSourceMode() {
- return false;
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (this.richText == null)
- this.richText = richText;
- if (this.richText != null) {
- try {
- if (dialog != null) {
- dialog.setFindOnly(!this.richText.getEditable());
- dialog.open();
- } else {
- dialog = new FindReplaceDialog(Display
- .getCurrent().getActiveShell(), this, !this.richText
- .getEditable());
- dialog.open();
- }
- } catch (Exception e) {
- RichTextPlugin.getDefault().getLogger().logError(e);
- }
- }
- }
-
- /**
- * Returns <code>true</code> if a match is found.
- *
- * @return <code>true</code> if a match is found.
- */
- public boolean getFoundMatch() {
- return foundMatch;
- }
-
- /**
- * Executes the action.
- *
- * @param subAction
- * the sub action to execute
- * @param findText
- * the find text
- * @param replaceText
- * the replace text
- * @param matchDir
- * the match direction; the value can either be
- * <code>FIND_FORWARD</code> or <code>FIND_BACKWARD</code>.
- * @param matchOptions
- * the match options
- */
- public void run(int subAction, String findText, String replaceText,
- int matchDir, int matchOptions) {
- styledText = null;
- if (richText instanceof RichTextEditor
- && ((RichTextEditor) richText).isHTMLTabSelected()) {
- styledText = ((RichTextEditor) richText).getSourceEdit();
- }
- if (styledText == null) {
- if (findText.indexOf("'") != -1) { //$NON-NLS-1$
- findText = findText.replaceAll("'", ENCODED_SINGLE_QUOTE); //$NON-NLS-1$
- }
- if (replaceText.indexOf("'") != -1) { //$NON-NLS-1$
- replaceText = replaceText.replaceAll("'", ENCODED_SINGLE_QUOTE); //$NON-NLS-1$
- }
- }
- try {
- foundMatch = false;
- int status = 0;
- switch (subAction) {
- case FIND_TEXT:
- status = findText(findText, matchDir, matchOptions);
- break;
- case REPLACE_TEXT:
- status = replaceText(replaceText, matchDir, matchOptions);
- break;
- case REPLACE_FIND_TEXT:
- status = replaceFindText(findText, replaceText, matchDir,
- matchOptions);
- break;
- case REPLACE_ALL_TEXT:
- replaceAll(findText, replaceText, matchOptions);
- break;
- }
- if (status > 0)
- foundMatch = true;
- } catch (Exception e) {
- RichTextPlugin.getDefault().getLogger().logError(e);
- }
- }
-
- /**
- * Escapes the given text.
- *
- * @param text
- * text to be escaped
- */
- protected static String escape(String text) {
- if (text == null || text.length() == 0)
- return ""; //$NON-NLS-1$
- StringBuffer sb = new StringBuffer();
- int textSize = text.length();
- for (int i = 0; i < textSize; i++) {
- char ch = text.charAt(i);
- switch (ch) {
- case '<':
- sb.append(XMLUtil.XML_LT);
- break;
- case '>':
- sb.append(XMLUtil.XML_GT);
- break;
- case '&':
- sb.append(XMLUtil.XML_AMP);
- break;
- default:
- sb.append(ch);
- break;
- }
- }
- return sb.toString();
- }
-
- protected int findText(String findText, int matchDir, int matchOptions) {
- int status = 0;
- if (styledText != null) {
- status = styledTextFindTextAndSelect(findText, matchDir,
- matchOptions);
- } else {
- status = richText
- .executeCommand(RichTextCommand.FIND_TEXT, new String[] {
- findText, "" + matchDir, "" + matchOptions }); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return status;
- }
-
- protected int replaceText(String replaceText, int matchDir, int matchOptions) {
- int status = 0;
- if (styledText != null) {
- status = styledTextReplaceTextAndSelect(replaceText);
- } else {
- status = richText.executeCommand(RichTextCommand.REPLACE_TEXT,
- new String[] { replaceText,
- "" + matchDir, "" + matchOptions }); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return status;
- }
-
- protected int replaceFindText(String findText, String replaceText,
- int matchDir, int matchOptions) {
- int status = 0;
- if (styledText != null) {
- styledTextReplaceTextAndSelect(replaceText);
- status = styledTextFindTextAndSelect(findText, matchDir,
- matchOptions);
- } else {
- richText.executeCommand(RichTextCommand.REPLACE_TEXT, new String[] {
- replaceText, "" + matchDir, "" + matchOptions }); //$NON-NLS-1$ //$NON-NLS-2$
- status = richText
- .executeCommand(RichTextCommand.FIND_TEXT, new String[] {
- findText, "" + matchDir, "" + matchOptions }); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return status;
- }
-
- protected void replaceAll(String findText, String replaceText,
- int matchOptions) {
- if (styledText != null) {
- styledTextReplaceAll(findText, replaceText, matchOptions);
- } else {
- richText.executeCommand(RichTextCommand.REPLACE_ALL_TEXT,
- new String[] { escape(findText), escape(replaceText),
- "" + matchOptions }); //$NON-NLS-1$
- }
- }
-
- protected int styledTextFindTextAndSelect(String findText, int matchDir,
- int matchOptions) {
- Point selectionOffset = styledText.getSelectionRange();
- int firstSelectedOffset = selectionOffset.x;
- int lastSelectedOffset = selectionOffset.x + selectionOffset.y - 1;
- String htmlText = styledText.getText();
- int indexOfMatch = -1;
- if ((matchOptions & CASE_SENSITIVE_MATCH) == 0) {
- // TODO: use toUpperCase(Locale) once library has locale attribute
- htmlText = htmlText.toUpperCase();
- findText = findText.toUpperCase();
- }
- do {
- if (indexOfMatch != -1) {
- lastSelectedOffset = indexOfMatch + 1;
- firstSelectedOffset = indexOfMatch - 1;
- }
- if (matchDir == FORWARD_MATCH) {
- indexOfMatch = htmlText.indexOf(findText,
- lastSelectedOffset + 1);
- } else {
- indexOfMatch = htmlText.lastIndexOf(findText,
- firstSelectedOffset - 1);
- }
- } while (indexOfMatch != -1
- && ((matchOptions & WHOLE_WORD_MATCH) == WHOLE_WORD_MATCH)
- && isPartOfWord(htmlText, indexOfMatch, findText.length()));
- if (indexOfMatch != -1) {
- styledText.setSelectionRange(indexOfMatch, findText.length());
- styledText.showSelection();
- } else {
- String selectedText = styledText.getSelectionText();
- if ((matchOptions & CASE_SENSITIVE_MATCH) == 0) {
- selectedText = selectedText.toUpperCase();
- }
- if (selectedText.equals(findText)) {
- indexOfMatch = styledText.getSelectionRange().x;
- }
- }
- return indexOfMatch;
-
- }
-
- protected int styledTextReplaceTextAndSelect(String replaceText) {
- Point selectionOffset = styledText.getSelectionRange();
- styledText.replaceTextRange(selectionOffset.x, selectionOffset.y,
- replaceText);
- styledText.setSelectionRange(selectionOffset.x, replaceText.length());
-
- return 1;
- }
-
- protected void styledTextReplaceAll(String findText, String replaceText,
- int matchOptions) {
- styledText.setSelectionRange(0, 0);
- while (styledTextFindTextAndSelect(findText, FORWARD_MATCH,
- matchOptions) != -1) {
- styledTextReplaceTextAndSelect(replaceText);
- }
- }
-
- protected boolean isWordChar(char c) {
- if (Character.isLetterOrDigit(c))
- return true;
- return false;
- }
-
- protected boolean isPartOfWord(String text, int index, int length) {
- if (index > 0)
- if (isWordChar(text.charAt(index - 1)))
- return true;
- if (text.length() >= index + length)
- if (isWordChar(text.charAt(index + length)))
- return true;
- return false;
- }
-
- public IRichText getRichText() {
- return richText;
- }
-
- public void setRichText(IRichText richText) {
- this.richText = richText;
- }
-
- public void dispose() {
- if (dialog != null) {
- dialog.close();
- dialog = null;
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontNameAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontNameAction.java
deleted file mode 100644
index 94de2201f6a..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontNameAction.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Sets the font name for the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class FontNameAction extends RichTextComboAction {
-
- /**
- * Creates a new instance.
- */
- public FontNameAction(final IRichText richText) {
- super(richText);
- setToolTipText(RichTextResources.fontNameAction_toolTipText);
- // get system fonts
- SortedSet<String> fontSet = new TreeSet<String>();
- FontData[] fonts = Display.getCurrent().getFontList(null, true);
- for (int i = 0; i < fonts.length; i++) {
- fontSet.add(((FontData) fonts[i]).getName());
- }
- input = new ArrayList<String>();
- input.add(RichTextResources.fontNameAction_DefaultFontName);
- for (Iterator<String> iter = fontSet.iterator(); iter.hasNext();) {
- String fontName = iter.next();
- input.add(fontName);
- }
-
- // add listener
- richText.addListener(SWT.SELECTED, new Listener() {
- public void handleEvent(Event event) {
- String fontName = richText.getSelected().getFontName();
- if (fontName
- .equals(RichTextResources.fontNameAction_CSS_Default)
- || fontName
- .equals(RichTextResources.fontNameAction_CSS_Default_Mozilla)
- || fontName.equals("default")) { //$NON-NLS-1$
- fontName = RichTextResources.fontNameAction_DefaultFontName;
- }
- int index = findFontNameInItems(fontName);
- setNotifyListeners(false);
- getCCombo().select(index);
- setNotifyListeners(true);
- }
- });
- }
-
- private int findFontNameInItems(String fontName) {
- int index = -1;
- for (Iterator<String> iter = input.iterator(); iter.hasNext();) {
- String font = iter.next();
- index++;
- if (font.equalsIgnoreCase(fontName)) {
- return index;
- }
- }
- return -1;
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- * @param index
- * the index of the selected item
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- String selected = getCComboSelection();
- if (selected.equals(RichTextResources.fontNameAction_DefaultFontName)) {
- richText.executeCommand(RichTextCommand.SET_FONT_NAME, ""); //$NON-NLS-1$
- } else {
- richText.executeCommand(RichTextCommand.SET_FONT_NAME, selected);
- }
- }
- }
-
- @Override
- public Collection<String> getInput() {
- return input;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontSizeAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontSizeAction.java
deleted file mode 100644
index f0629c017f4..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontSizeAction.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Sets the font size for the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class FontSizeAction extends RichTextComboAction {
-
- /**
- * Creates a new instance.
- */
- public FontSizeAction(final IRichText richText) {
- super(richText);
- setToolTipText(RichTextResources.fontSizeAction_toolTipText);
- input = new ArrayList<String>();
-
- input.add("Default"); //$NON-NLS-1$
- input.add("1"); //$NON-NLS-1$
- input.add("2"); //$NON-NLS-1$
- input.add("3"); //$NON-NLS-1$
- input.add("4"); //$NON-NLS-1$
- input.add("5"); //$NON-NLS-1$
- input.add("6"); //$NON-NLS-1$
- input.add("7"); //$NON-NLS-1$
- // add listener
- richText.addListener(SWT.SELECTED, new Listener() {
- public void handleEvent(Event event) {
- // mozilla returns "default" if no size is applied
- // IE returns 2 if no size is applied
- String fontSize = richText.getSelected().getFontSize();
- int index = -1;
- if (fontSize.equals("default")) { //$NON-NLS-1$
- index = 0;
- } else {
- try {
- index = Integer.parseInt(fontSize);
- } catch (NumberFormatException e) {
- // leave index at -1 so nothing is selected
- }
- }
- setNotifyListeners(false);
- getCCombo().select(index);
- setNotifyListeners(true);
- }
- });
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- * @param index
- * the index of the selected item
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- String selected = getCComboSelection();
- if ("Default".equals(selected)) { //$NON-NLS-1$
- richText.executeCommand(RichTextCommand.SET_FONT_SIZE, ""); //$NON-NLS-1$
- } else {
- richText.executeCommand(RichTextCommand.SET_FONT_SIZE,
- selected);
- }
- }
- }
-
- @Override
- public Collection<String> getInput() {
- return input;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontStyleAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontStyleAction.java
deleted file mode 100644
index b0ed90fdc55..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/FontStyleAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.FontStyle;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Sets the font style for the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class FontStyleAction extends RichTextComboAction {
-
- /**
- * Creates a new instance.
- */
- public FontStyleAction(final IRichText richText) {
- super(richText);
- setToolTipText(RichTextResources.fontStyleAction_toolTipText);
-
- input = new ArrayList<String>();
- input.add(FontStyle.NORMAL.getName());
- input.add(FontStyle.SECTION_HEADING.getName());
- input.add(FontStyle.SUBSECTION_HEADING.getName());
- input.add(FontStyle.SUB_SUBSECTION_HEADING.getName());
- input.add(FontStyle.QUOTE.getName());
- input.add(FontStyle.CODE_SAMPLE.getName());
- // add listener
- richText.addListener(SWT.SELECTED, new Listener() {
- public void handleEvent(Event event) {
- String blockStyle = richText.getSelected().getBlockStyle();
- String name = FontStyle.getFontStyleName(blockStyle);
-
- int index = ((List<String>)input).indexOf(name);
- setNotifyListeners(false);
- getCCombo().select(index);
- setNotifyListeners(true);
- }
- });
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- * @param index
- * the index of the selected item
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- String selected = getCComboSelection();
- String value = FontStyle.getFontStyleValue(selected);
- richText.executeCommand(RichTextCommand.SET_FONT_STYLE, value);
- }
- }
-
- @Override
- public Collection<String> getInput() {
- return input;
- }
-
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IBaseRichTextAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IBaseRichTextAction.java
deleted file mode 100644
index 0566ceef0d7..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IBaseRichTextAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-/**
- * The base interface for a rich text action.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public interface IBaseRichTextAction {
-
- /**
- * Returns the tool tip for the action.
- *
- * @return the tool tip text
- */
- public String getToolTipText();
-
- /**
- * Sets the tool tip for the action.
- *
- * @param toolTipText
- * the tool tip text
- */
- public void setToolTipText(String toolTipText);
-
- /**
- * Returns the enabled status of the action.
- *
- * @return <code>true</code> if enabled, <code>false</code> if not
- */
- public boolean getEnabled();
-
- /**
- * Enables or disables the action.
- *
- * @param enabled
- * If <code>true</code>, enable the action. if
- * <code>false</code>, disable it
- */
- public void setEnabled(boolean enabled);
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextAction.java
deleted file mode 100644
index 572a2b640a0..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextAction.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * The interface for a rich text button action.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public interface IRichTextAction extends IBaseRichTextAction {
-
- /**
- * Returns the image for the action.
- *
- * @return the image for the action
- */
- public Image getImage();
-
- /**
- * Sets the image for the action.
- *
- * @param image
- * the image for the action
- */
- public void setImage(Image image);
-
- /**
- * Returns the disabled image for the action.
- *
- * @return the disabled image for the action
- */
- public Image getDisabledImage();
-
- /**
- * Sets the disabled image for the action.
- *
- * @param image
- * the disabled image for the action
- */
- public void setDisabledImage(Image image);
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in readonly mode.
- */
- public boolean disableInReadOnlyMode();
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in source edit mode.
- */
- public boolean disableInSourceMode();
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText);
-
- /**
- * Sets the action's ToolItem
- * @param toolItem
- */
- public void setToolItem(ToolItem toolItem);
-
- /**
- * Gets the SWT ToolItem Style to be used for this action
- */
- public int getStyle();
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextComboAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextComboAction.java
deleted file mode 100644
index baeaf167cc7..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IRichTextComboAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.common.ui.actions.CComboContributionItem;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-
-/**
- * The interface for a rich text combo action.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- *
- * @deprecated unused
- */
-public interface IRichTextComboAction extends IBaseRichTextAction {
-
-// /**
-// * Adds an item.
-// *
-// * @param item
-// * the item to be added
-// */
-// public void addItem(String item);
-//
-// /**
-// * Returns all items.
-// *
-// * @return an array of items
-// */
-// public String[] getItems();
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- * @param index
- * the index of the selected item
- */
- public void execute(IRichText richText, int index);
-
- public IStructuredContentProvider getContentProvider();
-
- public ILabelProvider getLabelProvider();
-
- public Object getInput();
-
- /**
- * Sets the action's ContributionItem
- *
- */
- public void setContributionItem(CComboContributionItem item);
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IndentAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IndentAction.java
deleted file mode 100644
index 7bd985a7b13..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/IndentAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Indents the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class IndentAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public IndentAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_INDENT);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_INDENT);
- setToolTipText(RichTextResources.indentAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.INDENT);
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ItalicAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ItalicAction.java
deleted file mode 100644
index aae6fc1fe6d..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/ItalicAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the 'italic' attribute of the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class ItalicAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public ItalicAction(final IRichText richText) {
- super(richText, IAction.AS_CHECK_BOX);
- setImageDescriptor(RichTextImages.IMG_DESC_ITALIC);
- setToolTipText(RichTextResources.italicAction_toolTipText);
- // add listener
- richText.addListener(SWT.SELECTED, new Listener() {
- public void handleEvent(Event event) {
- setChecked(richText.getSelected().isItalic());
- }
- });
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.ITALIC);
- }
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyCenterAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyCenterAction.java
deleted file mode 100644
index 74b6b86fbe6..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyCenterAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Center justifies the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class JustifyCenterAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public JustifyCenterAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_JUSTIFY_CENTER);
- setToolTipText(RichTextResources.justifyCenterAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.JUSTIFY_CENTER);
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyFullAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyFullAction.java
deleted file mode 100644
index ca1a4e06d4f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyFullAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Fully justifies the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class JustifyFullAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public JustifyFullAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_JUSTIFY_FULL);
- setToolTipText(RichTextResources.justifyFullAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.JUSTIFY_FULL);
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyLeftAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyLeftAction.java
deleted file mode 100644
index 7da611fa759..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyLeftAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Left justifies the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class JustifyLeftAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public JustifyLeftAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_JUSTIFY_LEFT);
- setToolTipText(RichTextResources.justifyLeftAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.JUSTIFY_LEFT);
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyRightAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyRightAction.java
deleted file mode 100644
index e53aba5e31e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/JustifyRightAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Right justifies the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class JustifyRightAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public JustifyRightAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_JUSTIFY_RIGHT);
- setToolTipText(RichTextResources.justifyRightAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.JUSTIFY_RIGHT);
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/OutdentAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/OutdentAction.java
deleted file mode 100644
index a2c642a06c4..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/OutdentAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Indents the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class OutdentAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public OutdentAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_OUTDENT);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_OUTDENT);
- setToolTipText(RichTextResources.outdentAction_toolTipText);
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.OUTDENT);
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PasteAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PasteAction.java
deleted file mode 100644
index 7affed86025..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PasteAction.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.io.File;
-import java.net.URL;
-import java.util.Stack;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.common.ui.util.ClipboardUtil;
-import org.eclipse.epf.common.utils.FileUtil;
-import org.eclipse.epf.common.utils.NetUtil;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.HTMLTransfer;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Pastes text from the clipboard onto a rich text control.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class PasteAction extends RichTextAction {
-
- private static final String SOURCE_URL = "SourceURL:"; //$NON-NLS-1$
-
- private static final String HTM_EXT = ".htm"; //$NON-NLS-1$
-
- private static final String HTML_EXT = ".html"; //$NON-NLS-1$
-
- private static final Pattern HREF_REFERENCES = Pattern
- .compile(
- "href\\s*=\\s*\"(.*?)\"", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-
- protected static final Pattern p_image_ref = Pattern
- .compile(
- "(<(img|iframe).*?src\\s*=\\s*\")(.*?)(\")", Pattern.CASE_INSENSITIVE | Pattern.DOTALL); //$NON-NLS-1$
-
- protected static String sourceURLStr = ""; //$NON-NLS-1$
-
- private Logger logger;
-
- private static String RESOURCES = "resources"; //$NON-NLS-1$
-
- /**
- * Creates a new instance.
- */
- public PasteAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_PASTE);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_PASTE);
- setToolTipText(RichTextResources.pasteAction_toolTipText);
- logger = RichTextPlugin.getDefault().getLogger();
- }
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in source edit mode.
- */
- public boolean disableInSourceMode() {
- return false;
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- copyLinkResources(richText);
- if (richText instanceof RichTextEditor
- && ((RichTextEditor) richText).isHTMLTabSelected()) {
- StyledText styledText = ((RichTextEditor) richText)
- .getSourceEdit();
- styledText.paste();
- } else {
- richText.executeCommand(RichTextCommand.PASTE, sourceURLStr);
- }
- }
- }
-
- /**
- * Copies the link resources.
- *
- * @param richText
- * a rich text control
- */
- protected void copyLinkResources(IRichText richText) {
- try {
- sourceURLStr = ClipboardUtil.getHTMLSourceURL();
- Clipboard clipboard = new Clipboard(Display.getCurrent());
- String html = (String) clipboard.getContents(HTMLTransfer
- .getInstance());
- if (html != null && html.length() > 0) {
- String basePath = richText.getBasePath();
- URL sourceURL = null;
- if (sourceURLStr == null || sourceURLStr.length() == 0
- || sourceURLStr.equals("about:blank")) { //$NON-NLS-1$
- sourceURL = richText.getCopyURL();
- } else {
- sourceURL = new URL(sourceURLStr);
- }
-
- Matcher matcher = HREF_REFERENCES.matcher(html);
- while (matcher.find()) {
- String href = NetUtil.decodeURL(matcher.group(1));
- try {
- URL hrefURL = new URL(sourceURL, href);
- String scheme = hrefURL.getProtocol();
- if (scheme != null
- && scheme
- .equalsIgnoreCase(NetUtil.FILE_SCHEME)) {
- String url = hrefURL.getPath();
- File srcFile = new File(NetUtil.decodeURL(url));
- File tgtFile = null;
- File tgtDir = null;
- if (href.startsWith("#") || sourceURL.sameFile(hrefURL)) { //$NON-NLS-1$
- continue;
- } else if (href.startsWith(RESOURCES) || href.startsWith("./" + RESOURCES)) { //$NON-NLS-1$
- tgtFile = new File(basePath, href);
- tgtDir = tgtFile.getParentFile();
- } else {
- String resPath = getSubdirectoryOfResources(href);
- tgtFile = new File(basePath + RESOURCES, resPath);
- tgtDir = tgtFile;
- }
- tgtDir.mkdirs();
- FileUtil.copyFile(srcFile, tgtDir);
- }
- } catch (Exception e) {
- logger.logError(e);
- }
- }
-
- matcher = p_image_ref.matcher(html);
- while (matcher.find()) {
- String src = NetUtil.decodeURL(matcher.group(3));
- try {
- URL srcURL = new URL(sourceURL, src);
- String scheme = srcURL.getProtocol();
- if (scheme != null
- && scheme.equalsIgnoreCase(NetUtil.FILE_SCHEME)) {
- File srcFile = null;
- String authority = srcURL.getAuthority();
- if (authority != null) {
- srcFile = new File(NetUtil.decodeURL(authority + srcURL.getPath()));
- } else {
- srcFile = new File(NetUtil.decodeURL(srcURL.getPath()));
- }
- File tgtFile = null;
- File tgtDir = null;
- if (src.startsWith(RESOURCES) || src.startsWith("./" + RESOURCES)) { //$NON-NLS-1$
- tgtFile = new File(basePath, src);
- tgtDir = tgtFile.getParentFile();
- } else {
- String resPath = getSubdirectoryOfResources(src);
- tgtFile = new File(basePath + RESOURCES, resPath);
- tgtDir = tgtFile;
- }
- tgtDir.mkdirs();
- FileUtil.copyFile(srcFile, tgtDir);
- }
- } catch (Exception e) {
- logger.logError(e);
- }
- }
- }
- } catch (Exception e) {
- logger.logError(e);
- }
- }
-
- /**
- * Parses the given HTML content from the clipboard and returns the source
- * URL.
- *
- * @param htmlContent
- * the HTML content from the clipboard
- * @return the source URL or <code>null</code>
- */
- protected String getSourceURL(String htmlContent) {
- String sourceURL = null;
- int sourceURLIndex = htmlContent.indexOf(SOURCE_URL);
- if (sourceURLIndex > 0) {
- sourceURL = htmlContent.substring(sourceURLIndex
- + SOURCE_URL.length());
- sourceURL = sourceURL.substring(0, sourceURL
- .indexOf(FileUtil.LINE_SEP));
- if (sourceURL.toLowerCase().endsWith(HTM_EXT)
- || sourceURL.toLowerCase().endsWith(HTML_EXT)) {
- sourceURL = sourceURL.substring(0, sourceURL.indexOf(FileUtil
- .getFileName(sourceURL)) - 1);
- sourceURL = sourceURL.replace('\\', '/');
- }
- sourceURL = FileUtil.appendSeparator(sourceURL, "/"); //$NON-NLS-1$
- }
- return sourceURL;
- }
-
- protected String getSubdirectoryOfResources(String path) {
- String result = ""; //$NON-NLS-1$
- int res_idx = path.indexOf(RESOURCES);
- if (res_idx != -1) {
- Stack<String> stack = new Stack<String>();
- File relative = new File(path).getParentFile();
- while (!relative.getName().equals(RESOURCES)) {
- stack.push(relative.getName());
- relative = relative.getParentFile();
- }
- while (!stack.isEmpty()) {
- result = result + (String)stack.pop() + File.separator;
- }
- }
- return result;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PastePlainTextAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PastePlainTextAction.java
deleted file mode 100644
index 3f797dc66c3..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/PastePlainTextAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.common.utils.StrUtil;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.widgets.Display;
-
-public class PastePlainTextAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public PastePlainTextAction(IRichText richText) {
- super(richText, IAction.AS_PUSH_BUTTON);
- setImageDescriptor(RichTextImages.IMG_DESC_PASTE_PLAIN_TEXT);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_PASTE_PLAIN_TEXT);
- setToolTipText(RichTextResources.pastePlainTextAction_toolTipText);
- setEnabled(true);
- }
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in source edit mode.
- */
- public boolean disableInSourceMode() {
- return false;
- }
-
- public void execute(IRichText richText) {
- if (richText != null) {
- // get text from clipboard
- Clipboard clipboard = new Clipboard(Display.getCurrent());
- String text = (String) clipboard.getContents(TextTransfer
- .getInstance());
- if (text != null && text.length() > 0) {
- text = StrUtil.convertNewlinesToHTML(text);
- if (richText instanceof RichTextEditor) {
- ((RichTextEditor)richText).addHTML(text);
- } else {
- richText.executeCommand(RichTextCommand.ADD_HTML, text);
- }
- }
- }
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextAction.java
deleted file mode 100644
index 3dfa39996ae..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextAction.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * The abstract implementation of a rich text action.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public abstract class RichTextAction extends Action {
-
- protected IRichText richText;
-
- protected ToolItem toolItem;
-
- protected Collection<IAction> fMenuActions = new LinkedHashSet<IAction>();
-
- protected IMenuCreator menuCreator = new IMenuCreator() {
-
- private MenuManager dropDownMenuMgr;
-
- /**
- * Creates the menu manager for the drop-down.
- */
- private void createDropDownMenuMgr() {
- if (dropDownMenuMgr == null) {
- dropDownMenuMgr = new MenuManager();
- for (Iterator<IAction> iter = getMenuActions().iterator();iter.hasNext();) {
- IAction item = iter.next();
- dropDownMenuMgr.add(item);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
- */
- public Menu getMenu(Control parent) {
- createDropDownMenuMgr();
- return dropDownMenuMgr.createContextMenu(parent);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
- */
- public Menu getMenu(Menu parent) {
- createDropDownMenuMgr();
- Menu menu = new Menu(parent);
- IContributionItem[] items = dropDownMenuMgr.getItems();
- for (int i = 0; i < items.length; i++) {
- IContributionItem item = items[i];
- IContributionItem newItem = item;
- if (item instanceof ActionContributionItem) {
- newItem = new ActionContributionItem(
- ((ActionContributionItem) item).getAction());
- }
- newItem.fill(menu, -1);
- }
- return menu;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IMenuCreator#dispose()
- */
- public void dispose() {
- if (dropDownMenuMgr != null) {
- dropDownMenuMgr.dispose();
- dropDownMenuMgr = null;
- }
- }
- };
-
- /**
- * Creates a new instance.
- *
- * @param richText
- * a rich text control
- */
- public RichTextAction(IRichText richText, int style) {
- super(null, style);
- this.richText = richText;
- }
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in readonly mode.
- */
- public boolean disableInReadOnlyMode() {
- return true;
- }
-
- /**
- * Returns <code>true</code> if this action should be disabled when the
- * rich text editor is in source edit mode.
- */
- public boolean disableInSourceMode() {
- return true;
- }
-
- public void setToolItem(ToolItem toolItem) {
- this.toolItem = toolItem;
- }
-
- @Override
- public void run() {
- execute(richText);
- }
-
- @Override
- public String getId() {
- return getClass().getCanonicalName();
- }
-
- public Collection<IAction> getMenuActions() {
- return fMenuActions;
- }
-
- public void addActionToMenu(IAction action) {
- fMenuActions.add(action);
- }
-
- public abstract void execute(IRichText richText);
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextComboAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextComboAction.java
deleted file mode 100644
index d000ee26a3f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/RichTextComboAction.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.util.Collection;
-
-import org.eclipse.epf.common.ui.actions.CComboContributionItem;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.swt.SWT;
-
-/**
- * The abstract implementation of a rich text combo action.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public abstract class RichTextComboAction extends CComboContributionItem {
-
- protected IRichText richText;
-
- protected String toolTipText;
-
- protected boolean enabled = true;
-
- protected boolean notifyListeners = false;
-
-
- /**
- * Creates a new instance.
- *
- * @param richText
- * a rich text control
- */
- public RichTextComboAction(IRichText richText) {
- super(SWT.READ_ONLY | SWT.FLAT | SWT.BORDER);
- this.richText = richText;
- }
-
- /**
- * Creates a new instance.
- *
- * @param richText
- * a rich text control
- */
- public RichTextComboAction(IRichText richText, int style) {
- super(SWT.READ_ONLY | SWT.FLAT | SWT.BORDER | style);
- this.richText = richText;
- }
-
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- * @param index
- * the index of the selected item
- */
- public abstract void execute(IRichText richText);
-
- public abstract Collection<String> getInput();
-
- public void init() {
- setInput(getInput());
- setNotifyListeners(true);
- }
-
- protected String getCComboSelection() {
- if (getCCombo() != null) {
- int index = getSelectionIndex();
- return getCCombo().getItem(index);
- }
- return null;
- }
-
- /**
- * Returns the tool tip for the action.
- *
- * @return the tool tip text
- */
- public String getToolTipText() {
- return toolTipText;
- }
-
- /**
- * Sets the tool tip for the action.
- *
- * @param toolTipText
- * the tool tip text
- */
- public void setToolTipText(String toolTipText) {
- this.toolTipText = toolTipText;
- }
-
- /**
- * Returns the enabled status of the action.
- *
- * @return <code>true</code> if enabled, <code>false</code> if not
- */
- public boolean getEnabled() {
- return enabled;
- }
-
- /**
- * Enables or disables the action.
- *
- * @param enabled
- * if <code>true</code>, enable the action. if
- * <code>false</code>, disable it.
- */
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- @Override
- protected void performSelectionChanged() {
- if (notifyListeners) {
- execute(richText);
- }
- }
-
- public boolean isNotifyListeners() {
- return notifyListeners;
- }
-
- public void setNotifyListeners(boolean notifyListeners) {
- this.notifyListeners = notifyListeners;
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SubscriptAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SubscriptAction.java
deleted file mode 100644
index 4dd42bf05c2..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SubscriptAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the subscript attribute of the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class SubscriptAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public SubscriptAction(final IRichText richText) {
- super(richText, IAction.AS_CHECK_BOX);
- setImageDescriptor(RichTextImages.IMG_DESC_SUBSCRIPT);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_SUBSCRIPT);
- setToolTipText(RichTextResources.subscriptAction_toolTipText);
- // add listener
- richText.addListener(SWT.SELECTED, new Listener() {
- public void handleEvent(Event event) {
- setChecked(richText.getSelected().isSubscript());
- }
- });
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.SUBSCRIPT);
- }
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SuperscriptAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SuperscriptAction.java
deleted file mode 100644
index d5a1a294c3a..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/SuperscriptAction.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the superscript attribute of the selected text in a rich text
- * control.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class SuperscriptAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public SuperscriptAction(final IRichText richText) {
- super(richText, IAction.AS_CHECK_BOX);
- setImageDescriptor(RichTextImages.IMG_DESC_SUPERSCRIPT);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_SUPERSCRIPT);
- setToolTipText(RichTextResources.superscriptAction_toolTipText);
- // add listener
- richText.addListener(SWT.SELECTED, new Listener() {
- public void handleEvent(Event event) {
- setChecked(richText.getSelected().isSuperscript());
- }
- });
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.SUPERSCRIPT);
- }
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/TidyAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/TidyAction.java
deleted file mode 100644
index 7ad78fb9190..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/TidyAction.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.epf.common.CommonPlugin;
-import org.eclipse.epf.common.IHTMLFormatter;
-import org.eclipse.epf.common.utils.ExtensionHelper;
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextEditor;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Runs JTidy on the HTML
- *
- * @author Jeff Hardy
- * @since 1.2
- */
-public class TidyAction extends RichTextAction {
-
- boolean forceOutput = false;
- boolean makeBare = false;
- boolean word2000 = false;
-
- // The HTML source formatter.
- protected IHTMLFormatter htmlFormatter;
-
-
-
- /**
- * Creates a new instance.
- */
- public TidyAction(IRichText richText, boolean forceOutput, boolean makeBare, boolean word2000) {
- super(richText, IAction.AS_PUSH_BUTTON);
- this.forceOutput = forceOutput;
- this.makeBare = makeBare;
- this.word2000 = word2000;
- setImageDescriptor(RichTextImages.IMG_DESC_TIDY);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_TIDY);
-// htmlFormatter = new HTMLFormatter();
- htmlFormatter = (IHTMLFormatter) ExtensionHelper.createExtensionForJTidy(
- CommonPlugin.getDefault().getId(), "htmlFormatter"); //$NON-NLS-1$
- }
-
- @Override
- public void execute(IRichText richText) {
- // get current text
- String html;
- if (richText instanceof RichTextEditor) {
- html = ((RichTextEditor)richText).getText();
- } else {
- html = richText.getText();
- }
- // call JTidy with the options
- try {
- html = htmlFormatter.formatHTML(html, false, forceOutput, makeBare, word2000);
- } catch (UnsupportedEncodingException e) {
- RichTextPlugin.getDefault().getLogger().logError(e);
- }
- // set text
- if (richText instanceof RichTextEditor) {
- ((RichTextEditor)richText).setText(html);
- } else {
- richText.setText(html);
- }
- richText.checkModify();
-
- }
-
- @Override
- public boolean disableInSourceMode() {
- return false;
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/TidyActionGroup.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/TidyActionGroup.java
deleted file mode 100644
index 0624bbdf76f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/TidyActionGroup.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-
-/**
- * Runs JTidy on the HTML
- *
- * @author Jeff Hardy
- * @since 1.2
- */
-public class TidyActionGroup extends RichTextAction {
-
- TidyAction tidyActionDefault;
- TidyAction tidyActionCleanMS;
- TidyAction tidyActionCleanWord2000;
-
- public TidyActionGroup(IRichText richText) {
- super(richText, IAction.AS_DROP_DOWN_MENU);
- // TODO need image
- setImageDescriptor(RichTextImages.IMG_DESC_TIDY);
- // TODO need image
-// setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_PASTE);
- setToolTipText(RichTextResources.tidy_clean_text);
-
- createActions();
- setMenuCreator(menuCreator);
- }
-
- private void createActions() {
- tidyActionDefault = new TidyAction(richText, true, false, false);
- tidyActionDefault.setText(RichTextResources.tidy_clean_text);
- tidyActionDefault.setToolTipText(RichTextResources.tidy_clean_toolTipText);
- tidyActionCleanMS = new TidyAction(richText, true, true, false);
- tidyActionCleanMS.setText(RichTextResources.tidy_cleaner_text);
- tidyActionCleanMS.setToolTipText(RichTextResources.tidy_cleaner_toolTipText);
- tidyActionCleanWord2000 = new TidyAction(richText, true, true, true);
- tidyActionCleanWord2000.setText(RichTextResources.tidy_cleanest_text);
- tidyActionCleanWord2000.setToolTipText(RichTextResources.tidy_cleanest_toolTipText);
- addActionToMenu(tidyActionDefault);
- addActionToMenu(tidyActionCleanMS);
- addActionToMenu(tidyActionCleanWord2000);
- }
-
- @Override
- public void execute(IRichText richText) {
- // TODO Auto-generated method stub
-
- // call normal clean
- tidyActionDefault.execute(richText);
-
- }
-
- @Override
- public boolean disableInSourceMode() {
- return false;
- }
-
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/UnderlineAction.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/UnderlineAction.java
deleted file mode 100644
index 27825aca080..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/UnderlineAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.actions;
-
-import org.eclipse.epf.richtext.IRichText;
-import org.eclipse.epf.richtext.RichTextCommand;
-import org.eclipse.epf.richtext.RichTextImages;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-/**
- * Toggles the underline attribute of the selected text in a rich text control.
- *
- * @author Kelvin Low
- * @author Jeff Hardy
- * @since 1.0
- */
-public class UnderlineAction extends RichTextAction {
-
- /**
- * Creates a new instance.
- */
- public UnderlineAction(final IRichText richText) {
- super(richText, IAction.AS_CHECK_BOX);
- setImageDescriptor(RichTextImages.IMG_DESC_UNDERLINE);
- setDisabledImageDescriptor(RichTextImages.DISABLED_IMG_DESC_UNDERLINE);
- setToolTipText(RichTextResources.underlineAction_toolTipText);
- // add listener
- richText.addListener(SWT.SELECTED, new Listener() {
- public void handleEvent(Event event) {
- setChecked(richText.getSelected().isUnderLine());
- }
- });
- }
-
- /**
- * Executes the action.
- *
- * @param richText
- * a rich text control
- */
- public void execute(IRichText richText) {
- if (richText != null) {
- richText.executeCommand(RichTextCommand.UNDERLINE);
- }
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/package.html b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/package.html
deleted file mode 100644
index 8e923674e79..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/actions/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides editing actions for the rich text control and editor.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddCodeDialog.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddCodeDialog.java
deleted file mode 100644
index 982efb716c3..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddCodeDialog.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
-* Licensed Materials - Property of IBM
-* (c) Copyright IBM Corporation 2007,2011. All Rights Reserved.
-*
-* Note to U.S. Government Users Restricted Rights:
-* Use, duplication or disclosure restricted by GSA ADP Schedule
-* Contract with IBM Corp.
-*******************************************************************************/
-
-package org.eclipse.epf.richtext.dialogs;
-
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-public class AddCodeDialog extends BaseDialog {
- private Text html;
- private String htmlStr;
-
- public AddCodeDialog(Shell parent) {
- super(parent);
- }
-
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
-
- Label label = new Label(composite, SWT.NONE);
- label.setText(RichTextResources.addCodeDialog_Msg);
- {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- label.setLayoutData(gd);
- }
-
- html = new Text(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- {
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 2;
- gd.widthHint = 300;
- gd.heightHint = 200;
- html.setLayoutData(gd);
- }
- html.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- okButton.setEnabled(html.getText().trim().length() > 0);
- }
- });
-
- super.getShell().setText(RichTextResources.addCodeDialog_title);
-
- return composite;
- }
-
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
- okButton.setEnabled(false);
- }
-
- protected void okPressed() {
- //add the extra "<br/>" to avoid Jtidy problem
- String br = "<br/>"; //$NON-NLS-1$
- String customHtml = html.getText().trim();
- htmlStr = br + customHtml;
-
- super.okPressed();
- }
-
- public String getCode() {
- return htmlStr;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddImageDialog.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddImageDialog.java
deleted file mode 100644
index 2d2ec28b782..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddImageDialog.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import java.io.File;
-
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.Image;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Prompts the user to specify the image that will be used to create a HTML
- * &lt;image&gt; tag in the rich text editor.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddImageDialog extends BaseDialog {
-
- protected Image image = new Image();
-
- protected Text urlText;
-
- protected Button browseButton;
-
- protected SelectionAdapter browseSelectionAdapter = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- FileDialog dialog = new FileDialog(Display.getCurrent()
- .getActiveShell(), SWT.OPEN);
- dialog
- .setFilterExtensions(new String[] {
- "*.gif", "*.jpg", "*.bmp" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- String imageFile = dialog.open();
- if (imageFile != null && imageFile.length() > 0) {
- File file = new File(imageFile);
- try {
- String url = file.toURL().toExternalForm();
- urlText.setText(url);
- } catch (Exception e) {
- logger.logError(e);
- }
- }
- }
- };
-
- protected ModifyListener urlTextListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- if (okButton != null) {
- okButton.setEnabled(urlText.getText().trim().length() > 0);
- }
- }
- };
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent shell
- */
- public AddImageDialog(Shell parent) {
- super(parent);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- GridLayout layout = (GridLayout) composite.getLayout();
- layout.numColumns = 3;
-
- Label urlLabel = new Label(composite, SWT.NONE);
- urlLabel.setText(RichTextResources.urlLabel_text);
- urlText = new Text(composite, SWT.BORDER);
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.widthHint = 300;
- urlText.setLayoutData(gridData);
- urlText.addModifyListener(urlTextListener);
-
- browseButton = new Button(composite, SWT.NONE);
- browseButton.setText(RichTextResources.browseButton_text);
- browseButton.addSelectionListener(browseSelectionAdapter);
-
- super.getShell().setText(RichTextResources.addImageDialog_title);
-
- return composite;
- }
-
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
- okButton.setEnabled(false);
- }
-
- @Override
- protected void okPressed() {
- String url = urlText.getText();
- if (url != null && url.length() > 0) {
- image.setURL(url);
- }
- super.okPressed();
- }
-
- /**
- * Gets the user specified image.
- *
- * @return an <code>Image</code> object
- */
- public Image getImage() {
- return image;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddLinkDialog.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddLinkDialog.java
deleted file mode 100644
index 5a78077f933..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddLinkDialog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.Link;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Prompts the user to specify the file that will be used to create a HTML
- * &lt;a&gt; tag in the rich text editor.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddLinkDialog extends BaseDialog {
-
- protected Link link = new Link();
-
- protected Text urlText;
-
- protected String basePath;
-
- protected Composite composite;
-
- protected Label urlLabel;
-
- protected Text urlDisplayNameText;
-
- protected Label urlDisplayNameLabel;
-
- protected ModifyListener urlTextModifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- if (okButton != null) {
- okButton.setEnabled(urlText.getText().trim().length() > 0);
- }
- }
- };
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent shell
- */
- public AddLinkDialog(Shell parent, String basePath) {
- super(parent);
- this.basePath = basePath;
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- composite = (Composite) super.createDialogArea(parent);
-
- urlLabel = new Label(composite, SWT.NONE);
- urlLabel.setText(RichTextResources.urlLabel_text);
- urlText = new Text(composite, SWT.BORDER);
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.widthHint = 300;
- urlText.setLayoutData(gridData);
- urlText.addModifyListener(urlTextModifyListener);
-
- urlDisplayNameLabel = new Label(composite, SWT.NONE);
- urlDisplayNameLabel.setText(RichTextResources.urlDisplayNameLabel_text);
- urlDisplayNameText = new Text(composite, SWT.BORDER);
- GridData gridData2 = new GridData(GridData.FILL_HORIZONTAL);
- gridData2.widthHint = 300;
- urlDisplayNameText.setLayoutData(gridData2);
-
- super.getShell().setText(RichTextResources.addLinkDialog_title);
-
- return composite;
- }
-
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
- okButton.setEnabled(false);
- }
-
- @Override
- protected void okPressed() {
- String url = urlText.getText();
- if (url != null && url.length() > 0) {
- link.setURL(url);
- link.setName(urlDisplayNameText.getText());
- }
- super.okPressed();
- }
-
- /**
- * Gets the user specified link.
- *
- * @return an <code>Link</code> object
- */
- public Link getLink() {
- return link;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddTableDialog.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddTableDialog.java
deleted file mode 100644
index 27832d5527b..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/AddTableDialog.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.html.Table;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Prompts the user to specify the attributes that will be used to create a HTML
- * &lt;table&gt; tag in the rich text editor.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class AddTableDialog extends BaseDialog {
-
- private static final int DEFAULT_ROWS = 2;
-
- private static final int DEFAULT_COLUMNS = 2;
-
- private static final String DEFAULT_WIDTH = "85%"; //$NON-NLS-1$
-
- private static final String[] TABLE_STYLE_LABELS = {
- RichTextResources.tableHeaderNone_text,
- RichTextResources.tableHeaderCols_text,
- RichTextResources.tableHeaderRows_text,
- RichTextResources.tableHeaderBoth_text, };
-
- private Table table = new Table();
-
- private Text rowsText;
-
- private Text colsText;
-
- private Text widthText;
-
- private Combo tableTypeCombo;
-
- private Text summaryText;
-
- private Text captionText;
-
- private ModifyListener modifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent event) {
- if (okButton != null) {
- try {
- int rows = Integer.parseInt(rowsText.getText().trim());
- int cols = Integer.parseInt(colsText.getText().trim());
- String width = widthText.getText().trim();
- okButton.setEnabled(rows > 0 && cols > 0
- && width.length() > 0);
- } catch (Exception e) {
- okButton.setEnabled(false);
- }
- }
- }
- };
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent shell
- */
- public AddTableDialog(Shell parent) {
- super(parent);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
-
- Label rowsLabel = new Label(composite, SWT.NONE);
- rowsLabel.setText(RichTextResources.rowsLabel_text);
-
- rowsText = new Text(composite, SWT.BORDER);
- rowsText.setTextLimit(2);
- rowsText.setText("" + DEFAULT_ROWS); //$NON-NLS-1$
- {
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- rowsText.setLayoutData(gridData);
- }
- rowsText.addModifyListener(modifyListener);
-
- Label colsLabel = new Label(composite, SWT.NONE);
- colsLabel.setText(RichTextResources.columnsLabel_text);
-
- colsText = new Text(composite, SWT.BORDER);
- colsText.setTextLimit(2);
- colsText.setText("" + DEFAULT_COLUMNS); //$NON-NLS-1$
- {
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- colsText.setLayoutData(gridData);
- }
- colsText.addModifyListener(modifyListener);
-
- Label widthLabel = new Label(composite, SWT.NONE);
- widthLabel.setText(RichTextResources.widthLabel_text);
-
- widthText = new Text(composite, SWT.BORDER);
- widthText.setText("" + DEFAULT_WIDTH); //$NON-NLS-1$
- {
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- widthText.setLayoutData(gridData);
- }
- widthText.addModifyListener(modifyListener);
-
- Label headerTypeLabel = new Label(composite, SWT.NONE);
- headerTypeLabel.setText(RichTextResources.tableStyleLabel_text);
-
- tableTypeCombo = new Combo(composite, SWT.BORDER | SWT.READ_ONLY);
- tableTypeCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- tableTypeCombo.setItems(TABLE_STYLE_LABELS);
- tableTypeCombo.setText(TABLE_STYLE_LABELS[0]);
-
- Label summaryLabel = new Label(composite, SWT.NONE);
- summaryLabel.setText(RichTextResources.summaryLabel_text);
- summaryText = new Text(composite, SWT.BORDER);
- {
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- summaryText.setLayoutData(gridData);
- }
-
- Label captionLabel = new Label(composite, SWT.NONE);
- captionLabel.setText(RichTextResources.captionLabel_text);
- captionText = new Text(composite, SWT.BORDER);
- {
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL
- | GridData.GRAB_HORIZONTAL);
- captionText.setLayoutData(gridData);
- }
-
- super.getShell().setText(RichTextResources.addTableDialog_title);
-
- return composite;
- }
-
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
- }
-
- @Override
- protected void okPressed() {
- String rowsValue = rowsText.getText();
- if (rowsValue != null && rowsValue.length() > 0) {
- try {
- int rows = Integer.parseInt(rowsValue);
- table.setRows(rows);
- } catch (Exception e) {
- table.setRows(DEFAULT_ROWS);
- }
- }
-
- String colsValue = colsText.getText();
- if (colsValue != null && colsValue.length() > 0) {
- try {
- int cols = Integer.parseInt(colsValue);
- table.setColumns(cols);
- } catch (Exception e) {
- table.setColumns(DEFAULT_COLUMNS);
- }
- }
-
- String widthValue = widthText.getText();
- if (widthValue != null && widthValue.length() > 0) {
- table.setWidth(widthValue);
- } else {
- table.setWidth(DEFAULT_WIDTH);
- }
-
- table.setSummary(summaryText.getText().trim());
- table.setCaption(captionText.getText().trim());
- table.setTableHeaders(tableTypeCombo.getSelectionIndex());
-
- super.okPressed();
- }
-
- /**
- * Gets the user specified table.
- *
- * @return an <code>Table</code> object
- */
- public Table getTable() {
- return table;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/BaseDialog.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/BaseDialog.java
deleted file mode 100644
index ad92d9f2255..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/BaseDialog.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import org.eclipse.epf.common.serviceability.Logger;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The base class for all dialogs used by the rich text editor.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class BaseDialog extends Dialog {
-
- // A logger for logging runtime warnings and errors.
- protected Logger logger;
-
- // The OK button.
- protected Button okButton;
-
- // The Cancel button.
- protected Button cancelButton;
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent shell
- */
- public BaseDialog(Shell parent) {
- super(parent);
- logger = RichTextPlugin.getDefault().getLogger();
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- GridLayout layout = (GridLayout) composite.getLayout();
- layout.marginWidth = 10;
- layout.marginHeight = 10;
- layout.numColumns = 2;
- GridData gridData = (GridData) composite.getLayoutData();
- gridData.verticalIndent = 10;
- return composite;
- }
-
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- // Create the OK button.
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- true);
-
- // Create the Cancel button.
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
-
- // Set help context for the OK button.
- okButton = super.getButton(IDialogConstants.OK_ID);
-
- // Set help context for the Cancel button.
- cancelButton = super.getButton(IDialogConstants.CANCEL_ID);
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/FindReplaceDialog.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/FindReplaceDialog.java
deleted file mode 100644
index c03c6d75e3e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/FindReplaceDialog.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.dialogs;
-
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.epf.richtext.actions.FindReplaceAction;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Prompts the user to specify the search and replace strings and options.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class FindReplaceDialog extends BaseDialog {
-
- private FindReplaceAction findReplaceAction;
-
- private boolean findOnly;
-
- private Text findText;
-
- private Text replaceText;
-
- private Button searchForwardRadioButton;
-
- private Button searchBackwardRadioButton;
-
- private Button caseSensitiveCheckbox;
-
- private Button wholeWordCheckbox;
-
- private Button findButton;
-
- private Button replaceButton;
-
- private Button replaceFindButton;
-
- private Button replaceAllButton;
-
- private Label statusLabel;
-
- /**
- * Creates a new instance.
- *
- * @param parent
- * the parent shell
- * @param findReplaceAction
- * the Find and Replace action
- * @param findOnly
- * if <code>true</code>, disable the replace and replace all
- * functionalities
- */
- public FindReplaceDialog(Shell parent, FindReplaceAction findReplaceAction,
- boolean findOnly) {
- super(parent);
- setShellStyle(SWT.DIALOG_TRIM | SWT.MODELESS | getDefaultOrientation());
- setBlockOnOpen(false);
- this.findReplaceAction = findReplaceAction;
- this.findOnly = findOnly;
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
- GridLayout layout = (GridLayout) composite.getLayout();
- layout.numColumns = 1;
-
- Composite textComposite = new Composite(composite, SWT.NONE);
- textComposite.setLayout(new GridLayout(2, false));
- textComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label findLabel = new Label(textComposite, SWT.NONE);
- findLabel.setText(RichTextResources.findLabel_text);
- findText = new Text(textComposite, SWT.BORDER);
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.widthHint = 200;
- findText.setLayoutData(gridData);
- findText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- if (findButton != null) {
- findButton
- .setEnabled(findText.getText().trim().length() > 0);
- }
- if (replaceAllButton != null && !findOnly) {
- replaceAllButton.setEnabled(findText.getText().trim()
- .length() > 0);
- }
- }
- });
-
- Label replaceLabel = new Label(textComposite, SWT.NONE);
- replaceLabel.setText(RichTextResources.replaceLabel_text);
- replaceText = new Text(textComposite, SWT.BORDER);
- replaceText.setLayoutData(gridData);
- if (findOnly) {
- replaceText.setEnabled(false);
- } else {
- replaceText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- if (replaceButton != null) {
- replaceButton.setEnabled(findReplaceAction
- .getFoundMatch());
- }
- if (replaceFindButton != null) {
- replaceFindButton.setEnabled(findReplaceAction
- .getFoundMatch());
- }
- }
- });
- }
-
- Composite optionsComposite = new Composite(composite, SWT.NONE);
- optionsComposite.setLayout(new GridLayout(2, true));
- optionsComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Group directionGroup = new Group(optionsComposite, SWT.NONE);
- directionGroup.setText(RichTextResources.directionGroup_text);
- directionGroup.setLayout(new GridLayout(1, false));
- directionGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- searchForwardRadioButton = new Button(directionGroup, SWT.RADIO);
- searchForwardRadioButton
- .setText(RichTextResources.forwardRadioButton_text);
- searchForwardRadioButton.setSelection(true);
- searchBackwardRadioButton = new Button(directionGroup, SWT.RADIO);
- searchBackwardRadioButton
- .setText(RichTextResources.backwardRadioButton_text);
-
- Group optionsGroup = new Group(optionsComposite, SWT.NONE);
- optionsGroup.setText(RichTextResources.optionsGroup_text);
- optionsGroup.setLayout(new GridLayout(1, false));
- optionsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- caseSensitiveCheckbox = new Button(optionsGroup, SWT.CHECK);
- caseSensitiveCheckbox
- .setText(RichTextResources.caseSensitiveCheckbox_text);
- wholeWordCheckbox = new Button(optionsGroup, SWT.CHECK);
- wholeWordCheckbox.setText(RichTextResources.wholeWordCheckbox_text);
-
- statusLabel = new Label(composite, SWT.NONE);
- statusLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- super.getShell().setText(RichTextResources.findReplaceDialog_title);
-
- return composite;
- }
-
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.CLIENT_ID + 1,
- RichTextResources.findButton_text, true);
- findButton = super.getButton(IDialogConstants.CLIENT_ID + 1);
- findButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- findReplaceAction.run(FindReplaceAction.FIND_TEXT,
- getFindText(), getReplaceText(), getMatchDirection(),
- getMatchOptions());
- if (!findOnly) {
- replaceButton.setEnabled(findReplaceAction.getFoundMatch());
- replaceFindButton.setEnabled(findReplaceAction
- .getFoundMatch());
- }
- if (findReplaceAction.getFoundMatch()) {
- statusLabel.setText(""); //$NON-NLS-1$
- } else {
- statusLabel
- .setText(RichTextResources.FindReplace_Status_noMatch_label);
- }
- findButton.setFocus();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
-
- createButton(parent, IDialogConstants.CLIENT_ID + 2,
- RichTextResources.replaceButton_text, false);
- replaceButton = super.getButton(IDialogConstants.CLIENT_ID + 2);
- if (!findOnly) {
- replaceButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- findReplaceAction.run(FindReplaceAction.REPLACE_TEXT,
- getFindText(), getReplaceText(),
- getMatchDirection(), getMatchOptions());
- replaceButton.setFocus();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
- }
-
- createButton(parent, IDialogConstants.CLIENT_ID + 3,
- RichTextResources.replaceFindButton_text, false);
- replaceFindButton = super.getButton(IDialogConstants.CLIENT_ID + 3);
- if (!findOnly) {
- replaceFindButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- findReplaceAction.run(FindReplaceAction.REPLACE_FIND_TEXT,
- getFindText(), getReplaceText(),
- getMatchDirection(), getMatchOptions());
- replaceButton.setEnabled(findReplaceAction.getFoundMatch());
- replaceFindButton.setEnabled(findReplaceAction
- .getFoundMatch());
- replaceFindButton.setFocus();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
- }
-
- createButton(parent, IDialogConstants.CLIENT_ID + 4,
- RichTextResources.replaceallButton_text, false);
- replaceAllButton = super.getButton(IDialogConstants.CLIENT_ID + 4);
- if (!findOnly) {
- replaceAllButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- findReplaceAction.run(FindReplaceAction.REPLACE_ALL_TEXT,
- getFindText(), getReplaceText(),
- getMatchDirection(), getMatchOptions());
- replaceButton.setEnabled(false);
- replaceFindButton.setEnabled(false);
- replaceAllButton.setFocus();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
- }
-
- // Create the Cancel button.
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
- cancelButton = super.getButton(IDialogConstants.CANCEL_ID);
-
- findButton.setEnabled(false);
- replaceButton.setEnabled(false);
- replaceFindButton.setEnabled(false);
- replaceAllButton.setEnabled(false);
- }
-
- /**
- * Gets the user specified find text.
- *
- * @return the find text
- */
- public String getFindText() {
- return findText.getText();
- }
-
- /**
- * Gets the user specified replace text.
- *
- * @return the replace text
- */
- public String getReplaceText() {
- return replaceText.getText();
- }
-
- /**
- * Gets the text match direction.
- *
- * @return <code>FIND_FORWARD</code> or <code>FIND_BACKWARD</code>
- */
- public int getMatchDirection() {
- return searchForwardRadioButton.getSelection() ? FindReplaceAction.FORWARD_MATCH
- : FindReplaceAction.BACKWARD_MATCH;
- }
-
- /**
- * Gets the text match options.
- *
- * @return the text match options
- */
- public int getMatchOptions() {
- int options = 0;
- if (wholeWordCheckbox.getSelection() == true) {
- options |= FindReplaceAction.WHOLE_WORD_MATCH;
- }
- if (caseSensitiveCheckbox.getSelection() == true) {
- options |= FindReplaceAction.CASE_SENSITIVE_MATCH;
- }
- return options;
- }
-
- /**
- * Checks the find only option.
- *
- * @return <code>true</code> if find only option is enabled
- */
- public boolean isFindOnly() {
- return findOnly;
- }
-
- /**
- * Sets the find only option.
- *
- * @param findOnly,
- * if <code>true</code>, enable the find only option
- */
- public void setFindOnly(boolean findOnly) {
- this.findOnly = findOnly;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/package.html b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/package.html
deleted file mode 100644
index f2a46edb8e6..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/dialogs/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides editing dialogs for the rich text control and editor.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/BlockTag.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/BlockTag.java
deleted file mode 100644
index 57c8433a6a6..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/BlockTag.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Models a HTML block tag.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class BlockTag {
-
- // The user friendly names.
- private static final String NAME_PARAGRAPH = RichTextResources.blockTag_paragraph;
-
- private static final String NAME_HEADING_1 = RichTextResources.blockTag_heading1;
-
- private static final String NAME_HEADING_2 = RichTextResources.blockTag_heading2;
-
- private static final String NAME_HEADING_3 = RichTextResources.blockTag_heading3;
-
- private static final String NAME_HEADING_4 = RichTextResources.blockTag_heading4;
-
- private static final String NAME_HEADING_5 = RichTextResources.blockTag_heading5;
-
- private static final String NAME_HEADING_6 = RichTextResources.blockTag_heading6;
-
- private static final String NAME_ADDRESS = RichTextResources.blockTag_address;
-
- private static final String NAME_PREFORMATTED_TEXT = RichTextResources.blockTag_preformattedText;
-
- // The internal values.
- private static final String VALUE_PARAGRAPH = "<p>"; //$NON-NLS-1$
-
- private static final String VALUE_HEADING_1 = "<h1>"; //$NON-NLS-1$
-
- private static final String VALUE_HEADING_2 = "<h2>"; //$NON-NLS-1$
-
- private static final String VALUE_HEADING_3 = "<h3>"; //$NON-NLS-1$
-
- private static final String VALUE_HEADING_4 = "<h4>"; //$NON-NLS-1$
-
- private static final String VALUE_HEADING_5 = "<h5>"; //$NON-NLS-1$
-
- private static final String VALUE_HEADING_6 = "<h6>"; //$NON-NLS-1$
-
- private static final String VALUE_ADDRESS = "<address>"; //$NON-NLS-1$
-
- private static final String VALUE_PREFORMATTED_TEXT = "<pre>"; //$NON-NLS-1$
-
- /**
- * The &lt;p&gt; tag.
- */
- static public final BlockTag PARAGRAPH = new BlockTag(NAME_PARAGRAPH,
- VALUE_PARAGRAPH);
-
- /**
- * &lt;h1&gt; tag.
- */
- static public final BlockTag HEADING_1 = new BlockTag(NAME_HEADING_1,
- VALUE_HEADING_1);
-
- /**
- * &lt;h2&gt; tag.
- */
- static public final BlockTag HEADING_2 = new BlockTag(NAME_HEADING_2,
- VALUE_HEADING_2);
-
- /**
- * &lt;h3&gt; tag.
- */
- static public final BlockTag HEADING_3 = new BlockTag(NAME_HEADING_3,
- VALUE_HEADING_3);
-
- /**
- * &lt;h4&gt; tag.
- */
- static public final BlockTag HEADING_4 = new BlockTag(NAME_HEADING_4,
- VALUE_HEADING_4);
-
- /**
- * &lt;h5&gt; tag.
- */
- static public final BlockTag HEADING_5 = new BlockTag(NAME_HEADING_5,
- VALUE_HEADING_5);
-
- /**
- * &lt;h6&gt; tag.
- */
- static public final BlockTag HEADING_6 = new BlockTag(NAME_HEADING_6,
- VALUE_HEADING_6);
-
- /**
- * &lt;address&gt; tag.
- */
- static public final BlockTag ADDRESS = new BlockTag(NAME_ADDRESS,
- VALUE_ADDRESS);
-
- /**
- * &lt;pre&gt; tag.
- */
- static public final BlockTag PREFORMATTED_TEXT = new BlockTag(
- NAME_PREFORMATTED_TEXT, VALUE_PREFORMATTED_TEXT);
-
- // A list of <code>BlockTag</code> objects.
- static private final List<BlockTag> BLOCK_TAGS = new ArrayList<BlockTag>();
- static {
- BLOCK_TAGS.add(PARAGRAPH);
- BLOCK_TAGS.add(HEADING_1);
- BLOCK_TAGS.add(HEADING_2);
- BLOCK_TAGS.add(HEADING_3);
- BLOCK_TAGS.add(HEADING_4);
- BLOCK_TAGS.add(HEADING_5);
- BLOCK_TAGS.add(HEADING_6);
- BLOCK_TAGS.add(ADDRESS);
- BLOCK_TAGS.add(PREFORMATTED_TEXT);
- }
-
- // The block tag name.
- private String name;
-
- // The block tag value.
- private String value;
-
- /**
- * Creates a new instance.
- *
- * @param name
- * the block tag name
- * @param value
- * the block tag value
- */
- public BlockTag(String name, String value) {
- this.name = name;
- this.value = value;
- }
-
- /**
- * Gets the block tag name.
- *
- * @return the block tag name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Gets the block tag value.
- *
- * @return the block tag value
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Gets the <code>BlockTag</code> object that is mapped to the given
- * index.
- *
- * @param index
- * an index into the <code>BlockTag</code> list
- * @return a <code>BlockTag</code> object
- */
- public static BlockTag getBlockTag(int index) {
- BlockTag result = (BlockTag) BLOCK_TAGS.get(index);
- if (result != null) {
- return result;
- }
- return PARAGRAPH;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontName.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontName.java
deleted file mode 100644
index 48714736f1e..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontName.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Models a HTML font name.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class FontName {
-
- // The user friendly names.
- private static final String NAME_DEFAULT = RichTextResources.fontName_default;
-
- private static final String NAME_ARIAL = RichTextResources.fontName_arial;
-
- private static final String NAME_COURIER_NEW = RichTextResources.fontName_courierNew;
-
- private static final String NAME_TIMES_NEW_ROMAN = RichTextResources.fontName_timesNewRoman;
-
- private static final String NAME_VERDANA = RichTextResources.fontName_verdana;
-
- // The internal values.
- private static final String VALUE_DEFAULT = ""; //$NON-NLS-1$
-
- private static final String VALUE_ARIAL = "Arial, Helvetica, sans-serif"; //$NON-NLS-1$
-
- private static final String VALUE_COURIER_NEW = "Courier New, Courier, mono"; //$NON-NLS-1$
-
- private static final String VALUE_TIMES_NEW_ROMAN = "Times New Roman, Times, serif"; //$NON-NLS-1$
-
- private static final String VALUE_VERDANA = "Verdana, Arial, Helvetica, sans-serif"; //$NON-NLS-1$
-
- /**
- * Default font.
- */
- static public final FontName DEFAULT = new FontName(NAME_DEFAULT,
- VALUE_DEFAULT);
-
- /**
- * Arial font.
- */
- static public final FontName ARIAL = new FontName(NAME_ARIAL, VALUE_ARIAL);
-
- /**
- * Courier New font.
- */
- static public final FontName COURIER_NEW = new FontName(NAME_COURIER_NEW,
- VALUE_COURIER_NEW);
-
- /**
- * Times New Roman font.
- */
- static public final FontName TIMES_NEW_ROMAN = new FontName(
- NAME_TIMES_NEW_ROMAN, VALUE_TIMES_NEW_ROMAN);
-
- /**
- * Verdana font.
- */
- static public final FontName VERDANA = new FontName(NAME_VERDANA,
- VALUE_VERDANA);
-
- // A list of <code>FontName</code> objects.
- static private final List<FontName> FONT_NAMES = new ArrayList<FontName>();
- static {
- FONT_NAMES.add(DEFAULT);
- FONT_NAMES.add(ARIAL);
- FONT_NAMES.add(COURIER_NEW);
- FONT_NAMES.add(TIMES_NEW_ROMAN);
- FONT_NAMES.add(VERDANA);
- }
-
- // The font name.
- private String name;
-
- // The font value.
- private String value;
-
- /**
- * Creates a new instance.
- *
- * @param name
- * the font name
- * @param value
- * the font value
- */
- public FontName(String name, String value) {
- this.name = name;
- this.value = value;
- }
-
- /**
- * Gets the font name.
- *
- * @return the font name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Gets the font value.
- *
- * @return the font value
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Gets the <code>FontName</code> object that is mapped to the given
- * index.
- *
- * @param index
- * an index into the <code>FontName</code> list
- * @return a <code>FontName</code> object
- */
- public static FontName getFontName(int index) {
- FontName result = (FontName) FONT_NAMES.get(index);
- if (result != null) {
- return result;
- }
- return DEFAULT;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontStyle.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontStyle.java
deleted file mode 100644
index 55211d74cbd..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/FontStyle.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.epf.richtext.RichTextResources;
-
-/**
- * Models a HTML font style.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class FontStyle {
-
- // The user friendly names.
- private static final String NAME_NORMAL = RichTextResources.fontStyle_normal;
-
- private static final String NAME_SECTION_HEADING = RichTextResources.fontStyle_sectionHeading;
-
- private static final String NAME_SUBSECTION_HEADING = RichTextResources.fontStyle_subsectionHeading;
-
- private static final String NAME_SUB_SUBSECTION_HEADING = RichTextResources.fontStyle_subSubsectionHeading;
-
- private static final String NAME_QUOTE = RichTextResources.fontStyle_quote;
-
- private static final String NAME_CODE_SAMPLE = RichTextResources.fontStyle_codeSample;
-
- // The internal values.
- private static final String VALUE_NORMAL = "<p>"; //$NON-NLS-1$
-
- private static final String VALUE_SECTION_HEADING = "<h3>"; //$NON-NLS-1$
-
- private static final String VALUE_SUBSECTION_HEADING = "<h4>"; //$NON-NLS-1$
-
- private static final String VALUE_SUB_SUBSECTION_HEADING = "<h5>"; //$NON-NLS-1$
-
- private static final String VALUE_QUOTE = "<quote>"; //$NON-NLS-1$
-
- private static final String VALUE_CODE_SAMPLE = "<code>"; //$NON-NLS-1$
-
- /**
- * Font style for normal text.
- */
- static public final FontStyle NORMAL = new FontStyle(NAME_NORMAL,
- VALUE_NORMAL);
-
- /**
- * Font style for section heading.
- */
- static public final FontStyle SECTION_HEADING = new FontStyle(
- NAME_SECTION_HEADING, VALUE_SECTION_HEADING);
-
- /**
- * Font style for sub section heading.
- */
- static public final FontStyle SUBSECTION_HEADING = new FontStyle(
- NAME_SUBSECTION_HEADING, VALUE_SUBSECTION_HEADING);
- /**
- * Font style for sub sub section heading.
- */
- static public final FontStyle SUB_SUBSECTION_HEADING = new FontStyle(
- NAME_SUB_SUBSECTION_HEADING, VALUE_SUB_SUBSECTION_HEADING);
-
- /**
- * Font style for quotations.
- */
- static public final FontStyle QUOTE = new FontStyle(NAME_QUOTE, VALUE_QUOTE);
-
- /**
- * Font style for displaying program codes.
- */
- static public final FontStyle CODE_SAMPLE = new FontStyle(NAME_CODE_SAMPLE,
- VALUE_CODE_SAMPLE);
-
- // A list of <code>FontStyle</code> objects.
- static private final List<FontStyle> FONT_STYLES = new ArrayList<FontStyle>();
- static {
- FONT_STYLES.add(NORMAL);
- FONT_STYLES.add(SECTION_HEADING);
- FONT_STYLES.add(SUBSECTION_HEADING);
- FONT_STYLES.add(SUB_SUBSECTION_HEADING);
- FONT_STYLES.add(QUOTE);
- FONT_STYLES.add(CODE_SAMPLE);
- }
-
- // The font style name.
- private String name;
-
- // The font style value.
- private String value;
-
- /**
- * Creates a new instance.
- *
- * @param name
- * the font style name
- * @param value
- * the font style value
- */
- public FontStyle(String name, String value) {
- this.name = name;
- this.value = value;
- }
-
- /**
- * Gets the font style name.
- *
- * @return the font style name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Gets the font style value.
- *
- * @return the font style value
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Gets the <code>FontStyle</code> object that is mapped to the given
- * index.
- *
- * @param index
- * an index into the <code>FontStyle</code> list
- * @return a <code>FontStyle</code> object
- */
- public static FontStyle getFontStyle(int index) {
- FontStyle result = (FontStyle) FONT_STYLES.get(index);
- if (result != null) {
- return result;
- }
- return NORMAL;
- }
-
- /**
- * Gets the display name of the <code>FontStyle</code> object with the
- * given value.
- *
- * @param value
- * one of the FontStyles
- * @return a display name of a FontStyle, or null if none found
- */
- public static String getFontStyleName(String value) {
- for (Iterator<FontStyle> iter = FONT_STYLES.iterator(); iter.hasNext();) {
- FontStyle style = iter.next();
- if (style.getValue().equals(value)) {
- return style.getName();
- }
- }
- return null;
- }
-
- /**
- * Gets the value of the <code>FontStyle</code> object with the
- * given display name.
- *
- * @param name
- * one of the FontStyles
- * @return a value of a FontStyle, or null if none found
- */
- public static String getFontStyleValue(String name) {
- for (Iterator<FontStyle> iter = FONT_STYLES.iterator(); iter.hasNext();) {
- FontStyle style = iter.next();
- if (style.getName().equals(name)) {
- return style.getValue();
- }
- }
- return null;
- }
-
-} \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Image.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Image.java
deleted file mode 100644
index 8a3a3a85e29..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Image.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-/**
- * Models a simplified HTML &lt;image&gt; tag.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class Image {
-
- // The image URL.
- private String url = ""; //$NON-NLS-1$
-
- /**
- * Creates a new instance.
- */
- public Image() {
- }
-
- /**
- * Gets the image URL.
- *
- * @return the image URL
- */
- public String getURL() {
- return url;
- }
-
- /**
- * Sets the image URL.
- *
- * @param url
- * the image URL
- */
- public void setURL(String url) {
- this.url = url;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Link.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Link.java
deleted file mode 100644
index 6c5573cc515..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Link.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-/**
- * Models a simplified HTML &lt;link&gt; tag.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class Link {
-
- // The link name.
- private String name = ""; //$NON-NLS-1$
-
- // The link URL.
- private String url = ""; //$NON-NLS-1$
-
- /**
- * Creates a new instance.
- */
- public Link() {
- }
-
- /**
- * Gets the link name.
- *
- * @return the link name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the link name.
- *
- * @param name
- * the link name
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Gets the link URL.
- *
- * @return the link URL
- */
- public String getURL() {
- return url;
- }
-
- /**
- * Sets the link URL.
- *
- * @param url
- * the link URL
- */
- public void setURL(String url) {
- this.url = url;
- }
-
- /**
- * @Gets the HTML representation of this link.
- *
- * @return the HTML representation of this link
- */
- public String toHTML() {
- return null;
- }
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Table.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Table.java
deleted file mode 100644
index a02b28f89b4..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/Table.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2007 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.html;
-
-/**
- * Models a simplified HTML &lt;table&gt; tag.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class Table {
-
- /**
- * A table with no headers.
- */
- public static final int TABLE_HEADERS_NONE = 0;
-
- /**
- * A table with column headers.
- */
- public static final int TABLE_HEADERS_COLS = 1;
-
- /**
- * A table with row headers.
- */
- public static final int TABLE_HEADERS_ROWS = 2;
-
- /**
- * A table with both column and row headers.
- */
- public static final int TABLE_HEADERS_BOTH = 3;
-
- // The number of rows.
- private int rows = 2;
-
- // The number of columns.
- private int cols = 2;
-
- // The table width.
- private String width = "85%"; //$NON-NLS-1$
-
- // The type of tableheaders for this table.
- private int tableHeaders = 0;
-
- // The table summary.
- private String summary;
-
- // The table caption.
- private String caption;
-
- /**
- * Creates a new instance.
- */
- public Table() {
- }
-
- /**
- * Gets the number of rows in the table.
- *
- * @return the number of rows
- */
- public int getRows() {
- return rows;
- }
-
- /**
- * Sets the number of rows in the table.
- *
- * @param rows
- * the number of rows
- */
- public void setRows(int rows) {
- this.rows = rows;
- }
-
- /**
- * Gets the number of columns in the table.
- *
- * @return the number of columns
- */
- public int getColumns() {
- return cols;
- }
-
- /**
- * Sets the number of columns in the table.
- *
- * @param cols
- * the number of columns
- */
- public void setColumns(int cols) {
- this.cols = cols;
- }
-
- /**
- * Gets the table width.
- *
- * @return the width of the table
- */
- public String getWidth() {
- return width;
- }
-
- /**
- * Sets the table width.
- *
- * @param width
- * the width of the table
- */
- public void setWidth(String width) {
- this.width = width;
- }
-
- /**
- * Gets the table caption.
- *
- * @return the table caption
- */
- public String getCaption() {
- return caption;
- }
-
- /**
- * Sets the table caption.
- *
- * @para caption the table caption
- */
- public void setCaption(String caption) {
- this.caption = caption;
- }
-
- /**
- * Gets the table summary.
- *
- * @return the table summary
- */
- public String getSummary() {
- return summary;
- }
-
- /**
- * Sets the table summary.
- *
- * @param summary
- * the table summary
- */
- public void setSummary(String summary) {
- this.summary = summary;
- }
-
- /**
- * Gets the table headers style.
- *
- * @return the integer with value representing
- * <code>TABLE_HEADERS_NONE</code>,
- * <code>TABLE_HEADERS_COLS</code>,
- * <code>TABLE_HEADERS_ROWS</code> or
- * <code>TABLE_HEADERS_BOTH</code>
- */
- public int getTableHeaders() {
- return tableHeaders;
- }
-
- /**
- * Sets the table headers style.
- *
- * @param tableHeaders
- * an integer with value representing
- * <code>TABLE_HEADERS_NONE</code>,
- * <code>TABLE_HEADERS_COLS</code>,
- * <code>TABLE_HEADERS_ROWS</code> or
- * <code>TABLE_HEADERS_BOTH</code>
- */
- public void setTableHeaders(int tableHeaders) {
- this.tableHeaders = tableHeaders;
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/package.html b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/package.html
deleted file mode 100644
index 7e143c8cf34..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/html/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides implementation support for the rich text control and editor.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/package.html b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/package.html
deleted file mode 100644
index 0238fc370ea..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides the interfaces and implementation for the rich text control and editor.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencePage.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencePage.java
deleted file mode 100644
index 6d3379fc763..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencePage.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.preferences;
-
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.epf.richtext.RichTextResources;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * The Preference page for the rich text editor.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage, SelectionListener, ModifyListener {
-
- private IPreferenceStore store;
-
- private Text lineWidthText;
-
- private Button indentCheckbox;
-
- private Text indentSizeText;
-
- /**
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
- public void init(IWorkbench workbench) {
- store = RichTextPlugin.getDefault().getPreferenceStore();
- }
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite widthComposite = new Composite(composite, SWT.NONE);
- widthComposite.setLayout(new GridLayout(2, false));
- widthComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label lineWidthLabel = new Label(widthComposite, SWT.NONE);
- lineWidthLabel.setText(RichTextResources.maxCharsPerLineLabel_text);
-
- lineWidthText = new Text(widthComposite, SWT.BORDER);
- lineWidthText.setText(store.getString(RichTextPreferences.LINE_WIDTH));
- lineWidthText.setTextLimit(3);
- GridData gridData = new GridData();
- gridData.widthHint = 25;
- lineWidthText.setLayoutData(gridData);
- lineWidthText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- }
- });
-
- Composite indentComposite = new Composite(composite, SWT.NONE);
- indentComposite.setLayout(new GridLayout(2, false));
- indentComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- indentCheckbox = new Button(indentComposite, SWT.CHECK);
- indentCheckbox.setText(RichTextResources.indentHTMLCheckbox_text);
- indentCheckbox.setSelection(store
- .getBoolean(RichTextPreferences.INDENT));
-
- new Label(indentComposite, SWT.NONE);
-
- Label indentSizeLabel = new Label(indentComposite, SWT.NONE);
- gridData = new GridData();
- gridData.horizontalIndent = 20;
- indentSizeLabel.setLayoutData(gridData);
- indentSizeLabel.setText(RichTextResources.indentSizeLabel_text);
-
- indentSizeText = new Text(indentComposite, SWT.BORDER);
- indentSizeText
- .setText(store.getString(RichTextPreferences.INDENT_SIZE));
- indentSizeText.setTextLimit(1);
- gridData = new GridData();
- gridData.widthHint = 10;
- indentSizeText.setLayoutData(gridData);
- indentSizeText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- }
- });
-
- return composite;
- }
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage.performDefaults
- */
- protected void performDefaults() {
- super.performDefaults();
- lineWidthText.setText(store
- .getDefaultString(RichTextPreferences.LINE_WIDTH));
- indentCheckbox.setSelection(store
- .getDefaultBoolean(RichTextPreferences.INDENT));
- indentSizeText.setText(store
- .getDefaultString(RichTextPreferences.INDENT_SIZE));
- }
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage.performOk
- */
- public boolean performOk() {
- String lineWidthValue = lineWidthText.getText();
- if (lineWidthValue != null && lineWidthValue.length() > 0) {
- try {
- int lineWidth = Integer.parseInt(lineWidthValue);
- store.setValue(RichTextPreferences.LINE_WIDTH, lineWidth);
- } catch (Exception e) {
- }
- }
-
- boolean indentValue = indentCheckbox.getSelection();
- store.setValue(RichTextPreferences.INDENT, indentValue);
-
- String indentSizeValue = indentSizeText.getText();
- if (indentSizeValue != null && indentSizeValue.length() > 0) {
- try {
- int indentSize = Integer.parseInt(indentSizeValue);
- store.setValue(RichTextPreferences.INDENT_SIZE, indentSize);
- } catch (Exception e) {
- }
- }
-
- return true;
- }
-
- /**
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- /**
- * @see org.eclipse.swt.events.ModifyListener#modifyText(ModifyEvent)
- */
- public void modifyText(ModifyEvent e) {
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferences.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferences.java
deleted file mode 100644
index f593198c73f..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferences.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * Preferences for the rich text editor.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextPreferences {
-
- /**
- * rich text Editor preference keys.
- */
- public static final String LINE_WIDTH = "htmlEditor.lineWidth"; //$NON-NLS-1$
-
- public static final String INDENT = "htmlEditor.indent"; //$NON-NLS-1$
-
- public static final String INDENT_SIZE = "htmlEditor.indentSize"; //$NON-NLS-1$
-
- /**
- * Initializes the default preferences.
- */
- public static void initializeDefaultPreferences(IPreferenceStore store) {
- store.setDefault(LINE_WIDTH, 120);
- store.setDefault(INDENT, true);
- store.setDefault(INDENT_SIZE, 4);
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencesInitializer.java b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencesInitializer.java
deleted file mode 100644
index 8bdeb071fed..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/RichTextPreferencesInitializer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-//------------------------------------------------------------------------------
-// Copyright (c) 2005, 2006 IBM Corporation and others.
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// which accompanies this distribution, and is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// Contributors:
-// IBM Corporation - initial implementation
-//------------------------------------------------------------------------------
-package org.eclipse.epf.richtext.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.epf.richtext.RichTextPlugin;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/**
- * The rich text preferences initializer.
- *
- * @author Kelvin Low
- * @since 1.0
- */
-public class RichTextPreferencesInitializer extends
- AbstractPreferenceInitializer {
-
- /**
- * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
- */
- public void initializeDefaultPreferences() {
- IPreferenceStore store = RichTextPlugin.getDefault()
- .getPreferenceStore();
- RichTextPreferences.initializeDefaultPreferences(store);
- }
-
-}
diff --git a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/package.html b/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/package.html
deleted file mode 100644
index 292b3aeec02..00000000000
--- a/extraplugins/epf-richtext/org.eclipse.epf.richtext/src/org/eclipse/epf/richtext/preferences/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-Provides preference support for the rich text control and editor.
-</body>
-</html> \ No newline at end of file
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/bin/org/eclipse/papyrus/qvttransformation/Activator.class b/extraplugins/org.eclipse.papyrus.qvtTransformation/bin/org/eclipse/papyrus/qvttransformation/Activator.class
deleted file mode 100644
index 4f172d963f5..00000000000
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/bin/org/eclipse/papyrus/qvttransformation/Activator.class
+++ /dev/null
Binary files differ
diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/bin/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.class b/extraplugins/org.eclipse.papyrus.qvtTransformation/bin/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.class
deleted file mode 100644
index 39b4f182f0f..00000000000
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/bin/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.class
+++ /dev/null
Binary files differ
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java
index 305dd5319c9..bafb282bd89 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.qompass.designer.core;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Namespace;
import org.eclipse.uml2.uml.Package;
@@ -55,7 +55,7 @@ public class CreationUtils {
if(pkg == null) {
// package does not exist => create it.
pkg = root.createNestedPackage(ns.getName());
- Copy.copyID(ns, pkg);
+ LazyCopier.copyID(ns, pkg);
// copy stereotype to create package
StUtils.copyStereotypes(ns, pkg);
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java
index 36c6182b57b..d0a77e9f4ab 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java
@@ -75,6 +75,11 @@ public class ModelManagement {
public Model getModel() {
return model;
}
+
+ public void saveModel(IProject project, String modelFolder, String modelPostfix) {
+ String path = this.getPath(project, modelFolder, this.getModel().getName() + modelPostfix);
+ this.saveModel(path);
+ }
/**
* Save a model within a passed project and a specified folder
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/OperationUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/OperationUtils.java
index c01bd7a6932..04779cd1e99 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/OperationUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/OperationUtils.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.qompass.designer.core;
import java.util.Iterator;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Parameter;
@@ -141,7 +141,7 @@ public class OperationUtils {
*/
public static void syncOperation(Operation sourceOp, Operation targetOp) {
if(targetOp != null) {
- Copy.copyFeatureModifiers(sourceOp, targetOp);
+ LazyCopier.copyFeatureModifiers(sourceOp, targetOp);
// ordered and unique are derived from ret-parameter
targetOp.setIsQuery(sourceOp.isQuery());
targetOp.setIsAbstract(sourceOp.isAbstract());
@@ -152,7 +152,7 @@ public class OperationUtils {
Parameter newParameter =
targetOp.createOwnedParameter(parameter.getLabel(), type);
newParameter.setDirection(parameter.getDirection());
- Copy.copyMultElemModifiers(parameter, newParameter);
+ LazyCopier.copyMultElemModifiers(parameter, newParameter);
StUtils.copyStereotypes(parameter, newParameter);
}
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java
index c484f764b1b..b387ae32341 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
import org.eclipse.uml2.uml.Connector;
import org.eclipse.uml2.uml.Element;
@@ -43,7 +43,7 @@ public class StUtils {
* @param destination
* @return
*/
- public static void copyStereotypes(Copy copy, Element source, Element destination) {
+ public static void copyStereotypes(LazyCopier copy, Element source, Element destination) {
for(Stereotype stereotype : source.getAppliedStereotypes()) {
copyAttributes(copy, stereotype.getQualifiedName(), source, destination);
}
@@ -66,7 +66,7 @@ public class StUtils {
* @return
*/
@SuppressWarnings({ "unchecked" })
- public static boolean copyAttributes(Copy copy, String stereotypeName, Element source, Element destination) {
+ public static boolean copyAttributes(LazyCopier copy, String stereotypeName, Element source, Element destination) {
Stereotype stereoSource = source.getAppliedStereotype(stereotypeName);
Stereotype stereoDest = destination.getApplicableStereotype(stereotypeName);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java
index e1e5d8eb9a0..e010bcc1140 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java
@@ -135,6 +135,7 @@ public class EnumService {
}
public static void createEnumPackage(Package root) {
+ init();
enumPkg = root.createNestedPackage(GLOBALENUMS);
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
index 70f319beed4..1109a6fa230 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.qompass.designer.core.StUtils;
import org.eclipse.papyrus.qompass.designer.core.Utils;
import org.eclipse.papyrus.qompass.designer.core.acceleo.UMLTool;
import org.eclipse.papyrus.qompass.designer.core.transformations.CompImplTrafos;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.PrefixConstants;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
@@ -77,7 +77,7 @@ public class BootLoaderGen {
* @param The
* package in which the bootloader should be created
*/
- public BootLoaderGen(Copy copy, int nodeIndex, int numberOfNodes)
+ public BootLoaderGen(LazyCopier copy, int nodeIndex, int numberOfNodes)
throws TransformationException {
// Class composite = (Class) ut.getClassifier (mainInstance);
// place in root (getModel()) to avoid the problem that the declaration of the bootLoader
@@ -300,7 +300,7 @@ public class BootLoaderGen {
* @param containerSlot
* @return
*/
- public static boolean hasUnconnectedStartRoutine(Copy copy, Class implementation, Slot containerSlot) {
+ public static boolean hasUnconnectedStartRoutine(LazyCopier copy, Class implementation, Slot containerSlot) {
if(implementation != null) {
Port startPort = AllocUtils.getStartPort(implementation);
if (startPort != null) {
@@ -320,7 +320,7 @@ public class BootLoaderGen {
* @param name
* @return
*/
- public static boolean hasUnconnectedLifeCycle(Copy copy, Class implementation, Slot containerSlot) {
+ public static boolean hasUnconnectedLifeCycle(LazyCopier copy, Class implementation, Slot containerSlot) {
if(implementation != null) {
Element lcPortElem = Utils.getNamedElementFromList(implementation.getAllAttributes(), "lc"); //$NON-NLS-1$
if(lcPortElem instanceof Port) {
@@ -344,7 +344,7 @@ public class BootLoaderGen {
* @Param a port that is checked for being connected
* @return true, if connected
*/
- private static boolean isConnected(Copy copy, Slot containerSlot, Port port) {
+ private static boolean isConnected(LazyCopier copy, Slot containerSlot, Port port) {
if(containerSlot != null) {
StructuralFeature sf = containerSlot.getDefiningFeature();
if(sf instanceof Property) {
@@ -523,7 +523,7 @@ public class BootLoaderGen {
/**
* copy variable (instances still point to non-copied classes)
*/
- private Copy m_copy;
+ private LazyCopier m_copy;
/**
* Store a map with index values to manage configuration of arrays
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
index 29c9fd2685e..10b3c5bde4e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
@@ -19,7 +19,7 @@ import java.util.Stack;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
@@ -48,7 +48,7 @@ public class Deploy {
* @param instance
* @throws TransformationException
*/
- public Deploy(Copy copy, ILangSupport langSupport, InstanceSpecification node,
+ public Deploy(LazyCopier copy, ILangSupport langSupport, InstanceSpecification node,
int nodeIndex, int numberOfNodes)
throws TransformationException
{
@@ -71,7 +71,7 @@ public class Deploy {
* distribute an instance, its contained sub-instances and the referenced
* classifiers to a certain node
*
- * @param copy
+ * @param copier
* @param node
* @param nodeIndex
* @param numberOfNodes
@@ -181,5 +181,5 @@ public class Deploy {
protected InstanceDeployer depInstance;
- protected Copy copy;
+ protected LazyCopier copy;
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java
index d1b707e3573..22739bcaeb6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/GatherConfigData.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.qompass.designer.core.deployment;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.uml2.uml.Class;
/**
@@ -27,7 +27,7 @@ import org.eclipse.uml2.uml.Class;
*
* @author ansgar
*/
-public class GatherConfigData implements CopyListener {
+public class GatherConfigData implements PreCopyListener {
/**
* Gather configuration data for a code generation project
@@ -40,7 +40,7 @@ public class GatherConfigData implements CopyListener {
this.langSupport = langSupport;
}
- public EObject copyEObject(Copy copy, EObject sourceEObj) {
+ public EObject preCopyEObject(LazyCopier copy, EObject sourceEObj) {
if(sourceEObj instanceof Class) {
langSupport.gatherConfigData((Class)sourceEObj);
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java
index c3ccc2ea8fb..e15562044f8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.qompass.designer.core.deployment;
import java.util.Stack;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.Slot;
@@ -39,7 +39,7 @@ public interface InstanceDeployer {
* @param node
* the node onto which the allocation should be done.
*/
- public void init(Copy sat, BootLoaderGen bootloader, InstanceSpecification node);
+ public void init(LazyCopier sat, BootLoaderGen bootloader, InstanceSpecification node);
/**
* Deploy an instance and copy the required classes into the target model.
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
index a49c7627a27..f000234df5c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.qompass.designer.core.deployment;
import java.util.Stack;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Class;
@@ -46,7 +46,7 @@ import org.eclipse.uml2.uml.Slot;
*/
public class PartialCopy implements InstanceDeployer {
- public void init(Copy copy, BootLoaderGen bootloader,
+ public void init(LazyCopier copy, BootLoaderGen bootloader,
InstanceSpecification node) {
this.copy = copy;
this.node = node; // only needed for debug output
@@ -120,5 +120,5 @@ public class PartialCopy implements InstanceDeployer {
private InstanceSpecification node;
- private Copy copy;
+ private LazyCopier copy;
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java
index c8e363d11a9..9ed97f25fb9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java
@@ -18,8 +18,9 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.FCM.BindingHelper;
import org.eclipse.papyrus.FCM.util.IBindingHelper;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PostCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationRTException;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.TemplateBinding;
@@ -39,16 +40,33 @@ public class BindingHelperExt {
* containing composite (container)
* @param instance
*/
- public static EObject applyHelper(BindingHelper helper, Copy copy, TemplateBinding binding, EObject sourceEObj) {
+ public static EObject applyPreHelper(BindingHelper helper, LazyCopier copier, TemplateBinding binding, EObject sourceEObj) {
IBindingHelper ihelper = getBindingHelper(helper.getBase_Class().getName());
if (sourceEObj instanceof Element) {
ihelper.handleElement(binding, (Element) sourceEObj);
}
- if(ihelper instanceof CopyListener) {
- return ((CopyListener) ihelper).copyEObject(copy, sourceEObj);
+ if(ihelper instanceof PreCopyListener) {
+ return ((PreCopyListener) ihelper).preCopyEObject(copier, sourceEObj);
}
return sourceEObj;
}
+
+ /**
+ *
+ * @param iConfiguratorName
+ * @param component
+ * containing composite (container)
+ * @param instance
+ */
+ public static void applyPostHelper(BindingHelper helper, LazyCopier copier, TemplateBinding binding, EObject targetEObj) {
+ IBindingHelper ihelper = getBindingHelper(helper.getBase_Class().getName());
+ if (targetEObj instanceof Element) {
+ ihelper.handleElement(binding, (Element) targetEObj);
+ }
+ if(ihelper instanceof PostCopyListener) {
+ ((PostCopyListener) ihelper).postCopyEObject(copier, targetEObj);
+ }
+ }
public static IBindingHelper getBindingHelper(BindingHelper helper) {
if (helper != null) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java
index de5417e6931..163216422fa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ILangSupport.java
@@ -45,6 +45,8 @@ public interface ILangSupport {
* the project (must already been initialized)
*/
public void setProject(IProject project);
+
+ public IProject getProject();
/**
* Re-create the project settings from model information
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterComments.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PostCopyListener.java
index 163d333c6b2..1500627eb64 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterComments.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PostCopyListener.java
@@ -12,34 +12,24 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.qompass.designer.core.transformations.filters;
+package org.eclipse.papyrus.qompass.designer.core.listeners;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
-import org.eclipse.uml2.uml.Comment;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
/**
- * Do not copy comments
- *
- * @author ansgar
- *
+ * Interface for listeners that are notified when an eObject
+ * is copied
+ *
+ * @see org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier
*/
-public class FilterComments implements CopyListener {
-
- public static FilterComments getInstance() {
- if(instance == null) {
- instance = new FilterComments();
- }
- return instance;
- }
-
- public EObject copyEObject(Copy copy, EObject sourceEObj) {
- if(sourceEObj instanceof Comment) {
- return null;
- }
- return sourceEObj;
- }
+public interface PostCopyListener {
- private static FilterComments instance = null;
+ /**
+ * Is called for each EObject after is has been copied.
+ *
+ * @param targetEObj
+ * the EObject that has been copied
+ */
+ public void postCopyEObject(LazyCopier copy, EObject targetEObj);
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/CopyListener.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PreCopyListener.java
index 4052008abd3..f4a1a874e23 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/CopyListener.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/PreCopyListener.java
@@ -15,15 +15,15 @@
package org.eclipse.papyrus.qompass.designer.core.listeners;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
/**
- * Interface for listeners that are notified for the addition of a classifier
- * via copy
+ * Interface for listeners that are notified when an eObject
+ * is copied
*
- * @see org.eclipse.papyrus.qompass.designer.core.transformations.Copy
+ * @see org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier
*/
-public interface CopyListener {
+public interface PreCopyListener {
/**
* Is called for each EObject that is copied. If it returns null, the
@@ -34,5 +34,5 @@ public interface CopyListener {
* @param sourceEObj
* the added classifier
*/
- public EObject copyEObject(Copy copy, EObject sourceEObj);
+ public EObject preCopyEObject(LazyCopier copy, EObject sourceEObj);
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/SyncBehaviorParameters.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/SyncBehaviorParameters.java
index c7867b27203..1d06985049e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/SyncBehaviorParameters.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/SyncBehaviorParameters.java
@@ -15,7 +15,7 @@
package org.eclipse.papyrus.qompass.designer.core.sync;
import org.eclipse.papyrus.qompass.designer.core.StUtils;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Parameter;
@@ -36,7 +36,7 @@ public class SyncBehaviorParameters {
for (Parameter parameter : bf.getOwnedParameters()) {
Parameter newParameter = method.createOwnedParameter(parameter.getName(), parameter.getType());
newParameter.setDirection(parameter.getDirection());
- Copy.copyMultElemModifiers(parameter, newParameter);
+ LazyCopier.copyMultElemModifiers(parameter, newParameter);
StUtils.copyStereotypes(parameter, newParameter);
}
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java
index 27293a7923a..6dc84b895fd 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.C_Cpp.ConstInit;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.PortUtils;
import org.eclipse.papyrus.qompass.designer.core.acceleo.AcceleoDriverWrapper;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.uml2.uml.Class;
@@ -44,7 +44,7 @@ public class BindingUtils {
* @param operation The operation template
* @return
*/
- public static Operation instantiateOperation(Copy copy, Element actual, Operation operation) {
+ public static Operation instantiateOperation(LazyCopier copy, Element actual, Operation operation) {
try {
Operation newOperation = copy.getCopy(operation);
if(actual instanceof Operation) {
@@ -76,7 +76,7 @@ public class BindingUtils {
* @return instantiated (bound) behavior.
* @throws TransformationException
*/
- public static OpaqueBehavior instantiateBehavior(Copy copy, Element actual, OpaqueBehavior opaqueBehavior) throws TransformationException {
+ public static OpaqueBehavior instantiateBehavior(LazyCopier copy, Element actual, OpaqueBehavior opaqueBehavior) throws TransformationException {
OpaqueBehavior newBehavior = copy.getCopy(opaqueBehavior);
if(actual instanceof NamedElement) {
String newName = AcceleoDriverWrapper.evaluate(opaqueBehavior.getName(), actual, null);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PostTemplateInstantiationListener.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PostTemplateInstantiationListener.java
new file mode 100644
index 00000000000..2809ac60fb5
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PostTemplateInstantiationListener.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ansgar Radermacher ansgar.radermacher@cea.fr
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.qompass.designer.core.templates;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.FCM.BindingHelper;
+import org.eclipse.papyrus.FCM.Template;
+import org.eclipse.papyrus.qompass.designer.core.extensions.BindingHelperExt;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PostCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.TemplateBinding;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+/**
+ * Template instantiation is implemented by means of a PostCopyListener that
+ * evaluates the template stereotype.
+ */
+
+public class PostTemplateInstantiationListener implements PostCopyListener {
+
+ public static PostTemplateInstantiationListener getInstance() {
+ if(postTemplateInstantiationListener == null) {
+ postTemplateInstantiationListener = new PostTemplateInstantiationListener();
+ }
+ return postTemplateInstantiationListener;
+ }
+
+ public void init(LazyCopier copy, TemplateBinding binding, Object[] args) {
+ this.binding = binding;
+ }
+
+ private TemplateBinding binding;
+
+ private static PostTemplateInstantiationListener postTemplateInstantiationListener;
+
+ public void postCopyEObject(LazyCopier copy, EObject targetEObj) {
+ if(targetEObj instanceof Element) {
+
+ Template template = UMLUtil.getStereotypeApplication((Element)targetEObj, Template.class);
+ if((template != null)) {
+ BindingHelper helper = template.getHelper();
+ if (helper != null) {
+ BindingHelperExt.applyPostHelper(helper, copy, binding, targetEObj);
+ }
+ }
+ }
+ }
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiationListener.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java
index 9e3c5958ab4..1c97d6de0be 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiationListener.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java
@@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.FCM.BindingHelper;
import org.eclipse.papyrus.FCM.Template;
import org.eclipse.papyrus.qompass.designer.core.extensions.BindingHelperExt;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.uml2.uml.BehavioralFeature;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.OpaqueBehavior;
@@ -29,20 +29,19 @@ import org.eclipse.uml2.uml.util.UMLUtil;
/**
* Template instantiation is implemented by means of an CopyListener that
* evaluates the template stereotype.
- * This is a pre-copy listener.
*/
-public class TemplateInstantiationListener implements CopyListener {
+public class PreTemplateInstantiationListener implements PreCopyListener {
- public static TemplateInstantiationListener getInstance() {
- if(templateInstantiationListener == null) {
- templateInstantiationListener = new TemplateInstantiationListener();
- templateInstantiationListener.treatTemplate = false;
+ public static PreTemplateInstantiationListener getInstance() {
+ if(preTemplateInstantiationListener == null) {
+ preTemplateInstantiationListener = new PreTemplateInstantiationListener();
+ preTemplateInstantiationListener.treatTemplate = false;
}
- return templateInstantiationListener;
+ return preTemplateInstantiationListener;
}
- public void init(Copy copy, TemplateBinding binding, Object[] args) {
+ public void init(LazyCopier copy, TemplateBinding binding, Object[] args) {
this.binding = binding;
}
@@ -50,9 +49,9 @@ public class TemplateInstantiationListener implements CopyListener {
private boolean treatTemplate;
- private static TemplateInstantiationListener templateInstantiationListener;
+ private static PreTemplateInstantiationListener preTemplateInstantiationListener;
- public EObject copyEObject(Copy copy, EObject sourceEObj) {
+ public EObject preCopyEObject(LazyCopier copy, EObject sourceEObj) {
if(treatTemplate) {
return sourceEObj;
}
@@ -62,7 +61,7 @@ public class TemplateInstantiationListener implements CopyListener {
return targetEObj;
}
- protected EObject checkEObject(Copy copy, EObject sourceEObj) {
+ protected EObject checkEObject(LazyCopier copy, EObject sourceEObj) {
// Specific treatment of OpaqueBehaviors: Template instantiations are typically managed
// by the associated operation which instantiates operation and behavior. In this case, the
@@ -84,7 +83,7 @@ public class TemplateInstantiationListener implements CopyListener {
if((template != null)) {
BindingHelper helper = template.getHelper();
if (helper != null) {
- return BindingHelperExt.applyHelper(helper, copy, binding, sourceEObj);
+ return BindingHelperExt.applyPreHelper(helper, copy, binding, sourceEObj);
}
}
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java
index dd7ec368b62..2900ae8783f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.papyrus.FCM.BindingHelper;
import org.eclipse.papyrus.FCM.Template;
import org.eclipse.papyrus.qompass.designer.core.Messages;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterSignatures;
@@ -50,18 +50,18 @@ import org.eclipse.uml2.uml.util.UMLUtil;
public class TemplateInstantiation {
- public TemplateInstantiation(Copy copy, TemplateBinding binding) throws TransformationException {
+ public TemplateInstantiation(LazyCopier copy, TemplateBinding binding) throws TransformationException {
this(copy, binding, null);
}
/**
*
- * @param copy_ copier
+ * @param copier_ copier
* @param binding UML template binding
* @param args currently unused
* @throws TransformationException
*/
- public TemplateInstantiation(final Copy copy_, final TemplateBinding binding, Object args[]) throws TransformationException {
+ public TemplateInstantiation(final LazyCopier copier_, final TemplateBinding binding, Object args[]) throws TransformationException {
if(binding == null) {
// user should never see this exception
throw new TransformationException("Passed binding is null"); //$NON-NLS-1$
@@ -79,28 +79,28 @@ public class TemplateInstantiation {
* copy.postCopyListeners = new BasicEList<CopyListener>();
* copy.postCopyListeners.addAll(copy_.postCopyListeners);
*/
- copy = copy_;
+ copier = copier_;
Package boundPackage = (Package)binding.getBoundElement();
// set template instantiation parameter. Used by Acceleo templates to get relation between
// formal and actual parameters
TransformationContext.setTemplateInstantiation(this);
- copy.setPackageTemplate(packageTemplate, boundPackage);
+ copier.setPackageTemplate(packageTemplate, boundPackage);
// some parameters of the package template may not be owned. Thus, an additional package
// template is involved in the instantiation
for(TemplateParameter parameter : signature.getParameters()) {
//
if(parameter.getSignature() != signature) {
Package addedPkgTemplate = parameter.getSignature().getNearestPackage();
- copy.setPackageTemplate(addedPkgTemplate, boundPackage);
+ copier.setPackageTemplate(addedPkgTemplate, boundPackage);
}
}
if (boundPackage.getPackagedElements() != null) {
// bound package is not empty, but copy does not know about it. Fill copyMap with information about the relation
// This happens, if the original model already contains template instantiations, e.g. for template ports
- if (copy.getMap(signature).keySet().size() == 0) {
+ if (copier.getMap(signature).keySet().size() == 0) {
syncCopyMap(packageTemplate, boundPackage);
}
}
@@ -113,29 +113,28 @@ public class TemplateInstantiation {
for(TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) {
ParameterableElement formal = substitution.getFormal().getParameteredElement();
ParameterableElement actual = substitution.getActual();
- copy.putPair(formal, actual);
+ copier.putPair(formal, actual);
}
// add copy listeners ---
// remove template signature
- if(!copy.preCopyListeners.contains(FilterSignatures.getInstance())) {
- copy.preCopyListeners.add(FilterSignatures.getInstance());
+ if(!copier.preCopyListeners.contains(FilterSignatures.getInstance())) {
+ copier.preCopyListeners.add(FilterSignatures.getInstance());
}
- // 2. special treatment for elements stereotyped with template parameter
- if(!copy.preCopyListeners.contains(TemplateInstantiationListener.getInstance())) {
- copy.preCopyListeners.add(TemplateInstantiationListener.getInstance());
+ // 2a. special treatment for elements stereotyped with template parameter
+ if(!copier.preCopyListeners.contains(PreTemplateInstantiationListener.getInstance())) {
+ copier.preCopyListeners.add(PreTemplateInstantiationListener.getInstance());
}
- TemplateInstantiationListener.getInstance().init(copy, binding, args);
-
- if(!copy.postCopyListeners.contains(FixTemplateSync.getInstance())) {
- copy.postCopyListeners.add(FixTemplateSync.getInstance());
+ PreTemplateInstantiationListener.getInstance().init(copier, binding, args);
+ // 2b. special treatment for elements stereotyped with template parameter
+ if(!copier.postCopyListeners.contains(PostTemplateInstantiationListener.getInstance())) {
+ copier.postCopyListeners.add(PostTemplateInstantiationListener.getInstance());
}
+ PostTemplateInstantiationListener.getInstance().init(copier, binding, args);
- // TODO: programming language specific code!!
- InstantiateCppInclude.getInstance().init(binding, args);
- if(!copy.postCopyListeners.contains(InstantiateCppInclude.getInstance())) {
- copy.postCopyListeners.add(InstantiateCppInclude.getInstance());
+ if(!copier.postCopyListeners.contains(FixTemplateSync.getInstance())) {
+ copier.postCopyListeners.add(FixTemplateSync.getInstance());
}
}
@@ -149,7 +148,7 @@ public class TemplateInstantiation {
* @param targetPkg The bound package (target)
*/
public void syncCopyMap(Package sourcePkg, Package targetPkg) {
- copy.put(sourcePkg, targetPkg);
+ copier.put(sourcePkg, targetPkg);
for (PackageableElement target : targetPkg.getPackagedElements()) {
if (target instanceof NamedElement) {
String targetName = ((NamedElement) target).getName();
@@ -158,7 +157,7 @@ public class TemplateInstantiation {
syncCopyMap((Package) source, (Package) target);
}
else {
- copy.put(source, target);
+ copier.put(source, target);
}
}
}
@@ -168,7 +167,7 @@ public class TemplateInstantiation {
public TemplateBinding binding;
- public Copy copy;
+ public LazyCopier copier;
TemplateSignature signature;
@@ -183,7 +182,7 @@ public class TemplateInstantiation {
* actually created within the bound package. We call this mechanism lazy
* instantiation/binding
*
- * @param copy
+ * @param copier
* Source and target model
* @param namedElement
* A member within the package template which should be bound,
@@ -225,7 +224,7 @@ public class TemplateInstantiation {
Element owner = TemplateUtils.getTemplateOwner(namedElement, signature);
if(owner != null) {
// note that we might overwrite an existing value
- copy.put(owner, boundPackage);
+ copier.put(owner, boundPackage);
}
}
else {
@@ -238,8 +237,8 @@ public class TemplateInstantiation {
// template parameter)
TemplateSignature signatureOfNE = TemplateUtils.getSignature((TemplateableElement)namedElement);
if((signatureOfNE != null) && (signature != signatureOfNE)) {
- TemplateBinding subBinding = TemplateUtils.getSubBinding(copy.target, (TemplateableElement)namedElement, binding);
- TemplateInstantiation ti = new TemplateInstantiation(copy, subBinding, args);
+ TemplateBinding subBinding = TemplateUtils.getSubBinding(copier.target, (TemplateableElement)namedElement, binding);
+ TemplateInstantiation ti = new TemplateInstantiation(copier, subBinding, args);
NamedElement ret = ti.bindNamedElement(namedElement);
return (T)ret;
}
@@ -249,13 +248,13 @@ public class TemplateInstantiation {
// since the template is potentially instantiated in another model,
// the referenced element might need to be copied.
- return copy.getCopy(namedElement);
+ return copier.getCopy(namedElement);
}
// element is contained in the template package, examine whether it
// already exists in the
// bound package.
- NamedElement existingMember = (NamedElement)copy.get(namedElement);
+ NamedElement existingMember = (NamedElement)copier.get(namedElement);
/*
if((existingMember != null) && (templateKind != TemplateKind.ACCUMULATE)) {
// element is already existing (and thus bound), nothing to do
@@ -271,9 +270,9 @@ public class TemplateInstantiation {
*/
if(existingMember == null) {
FilterTemplate.getInstance().setActive(false);
- T copiedElement = copy.getCopy(namedElement);
+ T copiedElement = copier.getCopy(namedElement);
FilterTemplate.getInstance().setActive(true);
- copy.setPackageTemplate(null, null);
+ copier.setPackageTemplate(null, null);
return copiedElement;
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
index ef8ea120182..51f7ac4e79f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.qompass.designer.core.Log;
import org.eclipse.papyrus.qompass.designer.core.Messages;
import org.eclipse.papyrus.qompass.designer.core.PortUtils;
import org.eclipse.papyrus.qompass.designer.core.Utils;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.papyrus.uml.tools.utils.ConnectorUtil;
import org.eclipse.uml2.uml.Classifier;
@@ -228,7 +228,7 @@ public class TemplateUtils {
* @param sat
* @param binding
*/
- public static void adaptActualsToTargetModel(Copy copy, TemplateBinding binding) {
+ public static void adaptActualsToTargetModel(LazyCopier copy, TemplateBinding binding) {
for(TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) {
substitution.setActual(copy.getCopy(substitution.getActual()));
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java
index eb6e8fee831..7f7646ad10d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java
@@ -85,7 +85,7 @@ public abstract class AbstractContainerTrafo {
/**
* Copy class from source to target model
*/
- protected Copy copy;
+ protected LazyCopier copier;
/**
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AcceleoException.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AcceleoException.java
new file mode 100644
index 00000000000..2eb51c4c4ca
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AcceleoException.java
@@ -0,0 +1,10 @@
+package org.eclipse.papyrus.qompass.designer.core.transformations;
+
+public class AcceleoException extends Exception {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java
index 95f6cfbf170..7c3e1c4a04f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AllocTransfo.java
@@ -31,7 +31,7 @@ public class AllocTransfo {
* @param composite A composite. We analyze the allocations of the properties within this
* Composite. The composite must be an element of the target model that can be modified.
*/
- public void transformAllocs(Copy copy, Class composite) {
+ public void transformAllocs(LazyCopier copy, Class composite) {
EList<Property> attributeList = new BasicEList<Property>();
attributeList.addAll(composite.getOwnedAttributes()); // use a copy, since the loop eventually destroys an element of the list.
for (Property attribute : attributeList) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ApplyInstanceConfigurators.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ApplyInstanceConfigurators.java
deleted file mode 100644
index 35839a25539..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ApplyInstanceConfigurators.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ansgar Radermacher ansgar.radermacher@cea.fr
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.qompass.designer.core.transformations;
-
-import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
-import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Slot;
-
-
-/**
- * Apply instance configurators
- *
- */
-public class ApplyInstanceConfigurators {
- public static void applyInstanceConfigurators(InstanceSpecification instance) {
- for (Slot slot : instance.getSlots()) {
- InstanceSpecification subInstance = DepUtils.getInstance(slot);
- if (!DepUtils.isShared(slot) && (subInstance != null)) {
- if (slot.getDefiningFeature() instanceof Property) {
- InstanceConfigurator.configureInstance(subInstance, (Property) slot.getDefiningFeature(), instance);
- }
- applyInstanceConfigurators(subInstance);
- }
- }
- }
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java
index da51cfadac2..77f44c5219f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java
@@ -36,6 +36,7 @@ import org.eclipse.uml2.uml.Connector;
import org.eclipse.uml2.uml.ConnectorEnd;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.OpaqueBehavior;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Package;
@@ -48,19 +49,19 @@ import org.eclipse.uml2.uml.Type;
import org.eclipse.uml2.uml.UMLPackage;
/**
- * This class realizes the transformations for a component implementation (the executor)
- * It includes:
- * 1. add the get_p operation for a port with a provided interface.
- * 2. add the connect_q operation and realization (*including a storage attribute*) for
- * a port with a required interface
- * 3. add an implementation for the getcnx_q operation for a port with a required interface
- * (the operation itself has been added before)
+ * This class realizes the transformations for a component implementation (the
+ * executor) It includes: 1. add the get_p operation for a port with a provided
+ * interface. 2. add the connect_q operation and realization (*including a
+ * storage attribute*) for a port with a required interface 3. add an
+ * implementation for the getcnx_q operation for a port with a required
+ * interface (the operation itself has been added before)
*
* TODO: C++ specific, support different "component to OO" mappings
*
- * Caveat: Assure that the folder derivedInterfaces already exists in a model. Otherwise
- * the call to getProvided/getRequired interface might trigger its creation resulting in
- * the corruption of list iterators (ConcurrentAccess exception)
+ * Caveat: Assure that the folder derivedInterfaces already exists in a model.
+ * Otherwise the call to getProvided/getRequired interface might trigger its
+ * creation resulting in the corruption of list iterators (ConcurrentAccess
+ * exception)
*
*/
public class CompImplTrafos {
@@ -68,20 +69,25 @@ public class CompImplTrafos {
public static Class bootloader;
public static final String retParamName = "ret"; //$NON-NLS-1$
-
+
public static final String progLang = "C/C++"; //$NON-NLS-1$
-
- public static void addPortOperations(Copy copy, Package pkg) throws TransformationException {
+
+ public static void addPortOperations(LazyCopier copy, Package pkg)
+ throws TransformationException {
EList<PackageableElement> peList = new BasicEList<PackageableElement>();
peList.addAll(pkg.getPackagedElements());
- for(PackageableElement element : peList) {
- if(element instanceof Package) {
- addPortOperations(copy, (Package)element);
- } else if(element instanceof Class) {
- Class implementation = (Class)element;
- // we may not apply the transformation to the boot-loader itself, in particular it would transform
+ for (PackageableElement element : peList) {
+ if (element instanceof Package) {
+ addPortOperations(copy, (Package) element);
+ } else if (element instanceof Class) {
+ Class implementation = (Class) element;
+ // we may not apply the transformation to the boot-loader
+ // itself, in particular it would transform
// singletons into pointers.
- if(Utils.isCompImpl(implementation) && (implementation != bootloader) && !StereotypeUtil.isApplied(implementation, PortKind.class)) {
+ if (Utils.isCompImpl(implementation)
+ && (implementation != bootloader)
+ && !StereotypeUtil.isApplied(implementation,
+ PortKind.class)) {
addGetPortOperation(copy, implementation);
addConnectPortOperation(copy, implementation);
markPartsPointer(implementation);
@@ -92,80 +98,103 @@ public class CompImplTrafos {
}
/**
- * Add the get_p operation for each port with a provided interface. It also adds a suitable
- * implementation that evaluates delegation connectors from the port to a property within
- * the composite. The delegation target could either be a normal class (no port) or an
- * inner component.
+ * Add the get_p operation for each port with a provided interface. It also
+ * adds a suitable implementation that evaluates delegation connectors from
+ * the port to a property within the composite. The delegation target could
+ * either be a normal class (no port) or an inner component.
*
* @param implementation
*/
- private static void addGetPortOperation(Copy copy, Class implementation) {
- for(PortInfo portInfo : PortUtils.flattenExtendedPorts(PortUtils.getAllPorts2(implementation))) {
+ private static void addGetPortOperation(LazyCopier copy, Class implementation) {
+ for (PortInfo portInfo : PortUtils.flattenExtendedPorts(PortUtils
+ .getAllPorts2(implementation))) {
Interface providedIntf = portInfo.getProvided();
- if(providedIntf != null) {
- // port provides an interface, add "get_p" operation & implementation
+ if (providedIntf != null) {
+ // port provides an interface, add "get_p" operation &
+ // implementation
- String opName = PrefixConstants.getP_Prefix + portInfo.getName();
- Operation op = implementation.getOwnedOperation(opName, null, null);
+ String opName = PrefixConstants.getP_Prefix
+ + portInfo.getName();
+ Operation op = implementation.getOwnedOperation(opName, null,
+ null);
if (op != null) {
- // operation already exists. Assume that user wants to override standard delegation
+ // operation already exists. Assume that user wants to
+ // override standard delegation
if (op.getType() != providedIntf) {
op.createOwnedParameter(retParamName, providedIntf);
}
continue;
}
- op = implementation.createOwnedOperation(opName, null, null, providedIntf);
+ op = implementation.createOwnedOperation(opName, null, null,
+ providedIntf);
Parameter retParam = op.getOwnedParameters().get(0);
retParam.setName(retParamName);
StereotypeUtil.apply(retParam, Ptr.class);
- OpaqueBehavior behavior = (OpaqueBehavior)
- implementation.createOwnedBehavior(opName,
- UMLPackage.eINSTANCE.getOpaqueBehavior());
+ OpaqueBehavior behavior = (OpaqueBehavior) implementation
+ .createOwnedBehavior(opName,
+ UMLPackage.eINSTANCE.getOpaqueBehavior());
op.getMethods().add(behavior);
- ConnectorEnd ce = ConnectorUtil.getDelegation(implementation, portInfo.getModelPort());
- // if there is an delegation to an inner property, delegate to it
- // Make distinction between delegation to component (with a port) or
+ ConnectorEnd ce = ConnectorUtil.getDelegation(implementation,
+ portInfo.getModelPort());
+ // if there is an delegation to an inner property, delegate to
+ // it
+ // Make distinction between delegation to component (with a
+ // port) or
// "normal" class (without).
String body;
- if(ce != null) {
+ if (ce != null) {
Property part = ce.getPartWithPort();
ConnectableElement role = ce.getRole();
- body = "return "; //$NON-NLS-1$
- if(role instanceof Port) {
- // check whether the part exists within the implementation (might not be the case
+ body = "return "; //$NON-NLS-1$
+ if (role instanceof Port) {
+ // check whether the part exists within the
+ // implementation (might not be the case
// due to partially copied composites).
- // Check is based on names, since the connector points to elements within another
- // model (copyClassifier does not make a proper connector copy)
+ // Check is based on names, since the connector points
+ // to elements within another
+ // model (copyClassifier does not make a proper
+ // connector copy)
// body += part.getName() + refOp(part) + opName + "();"; //$NON-NLS-1$
// TODO: this will NOT work for extended ports!
- body += part.getName() + refOp(part) + PrefixConstants.getP_Prefix + role.getName() + "();"; //$NON-NLS-1$
- }
- else {
- // role is not a port: connector connects directly to a structural feature
+ body += part.getName() + refOp(part)
+ + PrefixConstants.getP_Prefix + role.getName()
+ + "();"; //$NON-NLS-1$
+ } else {
+ // role is not a port: connector connects directly to a
+ // structural feature
// without passing via a port
// TODO: check whether structural feature exists
body += role.getName();
}
} else {
- // no delegation, check whether port implements provided interface
- boolean implementsIntf = implementation.getInterfaceRealization(null, providedIntf) != null;
+ // no delegation, check whether port implements provided
+ // interface
+ boolean implementsIntf = implementation
+ .getInterfaceRealization(null, providedIntf) != null;
if (!implementsIntf) {
- // The extended port itself is not copied to the target model (since referenced via a stereotype). Therefore,
- // a port of an extended port still points to the original model. We try whether the providedIntf within
- // the target model is within the interface realizations.
- Interface providedIntfInCopy = (Interface) copy.get(providedIntf);
- implementsIntf = implementation.getInterfaceRealization(null, providedIntfInCopy) != null;
+ // The extended port itself is not copied to the target
+ // model (since referenced via a stereotype). Therefore,
+ // a port of an extended port still points to the
+ // original model. We try whether the providedIntf
+ // within
+ // the target model is within the interface
+ // realizations.
+ Interface providedIntfInCopy = (Interface) copy
+ .get(providedIntf);
+ implementsIntf = implementation
+ .getInterfaceRealization(null,
+ providedIntfInCopy) != null;
}
if (implementsIntf) {
- body = "return this;"; //$NON-NLS-1$
- }
- else {
+ body = "return this;"; //$NON-NLS-1$
+ } else {
throw new RuntimeException(String.format(
- Messages.CompImplTrafos_IntfNotImplemented,
- providedIntf.getName(), portInfo.getPort().getName(), implementation.getName()));
+ Messages.CompImplTrafos_IntfNotImplemented,
+ providedIntf.getName(), portInfo.getPort()
+ .getName(), implementation.getName()));
}
}
// todo: defined by template
@@ -176,23 +205,24 @@ public class CompImplTrafos {
}
/**
- * if the bootloader is responsible for creating an instance (if it is a abstract type), mark
- * the associated part as a C++ pointer.
- * We do not want to change the aggregation kind, since it remains logically a composition, it
- * is merely an implementation issue that it must be a pointer for C++ if the concrete type is
- * not yet known.
+ * if the bootloader is responsible for creating an instance (if it is a
+ * abstract type), mark the associated part as a C++ pointer. We do not want
+ * to change the aggregation kind, since it remains logically a composition,
+ * it is merely an implementation issue that it must be a pointer for C++ if
+ * the concrete type is not yet known.
*
*
* @param implementation
*/
private static void markPartsPointer(Class implementation) {
- for(Property attribute : Utils.getParts(implementation)) {
+ for (Property attribute : Utils.getParts(implementation)) {
Type type = attribute.getType();
- if(type instanceof Class) {
- Class cl = (Class)type;
- // => requires adaptations of boot-loader which is then only responsible for creating instances
- // corresponding to types
- if(instantiateViaBootloader(cl)) {
+ if (type instanceof Class) {
+ Class cl = (Class) type;
+ // => requires adaptations of boot-loader which is then only
+ // responsible for creating instances
+ // corresponding to types
+ if (instantiateViaBootloader(cl)) {
StereotypeUtil.apply(attribute, Ptr.class);
}
}
@@ -201,63 +231,79 @@ public class CompImplTrafos {
/**
* Add a connect_<portName> operation for ports with a required interface.
- * Whereas operation and a behavior is added for each owned port, a behavior (method) is
- * needed for ports inherited from a component type (the behavior is implementation specific,
- * as it needs to take delegation to parts into account)
+ * Whereas operation and a behavior is added for each owned port, a behavior
+ * (method) is needed for ports inherited from a component type (the
+ * behavior is implementation specific, as it needs to take delegation to
+ * parts into account)
*
* @param implementation
*/
- private static void addConnectPortOperation(Copy sat, Class implementation) {
- for(PortInfo portInfo : PortUtils.flattenExtendedPorts(PortUtils.getAllPorts2(implementation))) {
+ private static void addConnectPortOperation(LazyCopier sat, Class implementation) {
+ for (PortInfo portInfo : PortUtils.flattenExtendedPorts(PortUtils
+ .getAllPorts2(implementation))) {
Interface requiredIntf = portInfo.getRequired();
- if(requiredIntf != null) {
- // port requires an interface, add "connect_p" operation & implementation
+ if (requiredIntf != null) {
+ // port requires an interface, add "connect_p" operation &
+ // implementation
- String opName = PrefixConstants.connectQ_Prefix + portInfo.getName();
+ String opName = PrefixConstants.connectQ_Prefix
+ + portInfo.getName();
if (implementation.getOwnedOperation(opName, null, null) != null) {
- // do not add the operation, if it already exists. This means that the
- // user wants to override it with custom behavior. In case of extended
+ // do not add the operation, if it already exists. This
+ // means that the
+ // user wants to override it with custom behavior. In case
+ // of extended
// ports, we may have to do that.
continue;
}
- Operation op = implementation.createOwnedOperation(opName, null, null);
- boolean multiPort = (portInfo.getUpper() > 1) || (portInfo.getUpper() == -1); // -1 indicates "*"
- if(multiPort) {
+ Operation op = implementation.createOwnedOperation(opName,
+ null, null);
+ boolean multiPort = (portInfo.getUpper() > 1)
+ || (portInfo.getUpper() == -1); // -1 indicates "*"
+ if (multiPort) {
// add index parameter
- Element eLong = Utils.getQualifiedElement(Utils.getTop(implementation), CompTypeTrafos.INDEX_TYPE_FOR_MULTI_RECEPTACLE);
- if(eLong instanceof Type) {
- op.createOwnedParameter("index", (Type)eLong); //$NON-NLS-1$
- }
- else {
+ Element eLong = Utils.getQualifiedElement(
+ Utils.getTop(implementation),
+ CompTypeTrafos.INDEX_TYPE_FOR_MULTI_RECEPTACLE);
+ if (eLong instanceof Type) {
+ op.createOwnedParameter("index", (Type) eLong); //$NON-NLS-1$
+ } else {
throw new RuntimeException(String.format(
- Messages.CompImplTrafos_CannotFindType,
- CompTypeTrafos.INDEX_TYPE_FOR_MULTI_RECEPTACLE));
+ Messages.CompImplTrafos_CannotFindType,
+ CompTypeTrafos.INDEX_TYPE_FOR_MULTI_RECEPTACLE));
}
}
- Parameter refParam = op.createOwnedParameter("ref", requiredIntf); //$NON-NLS-1$
+ Parameter refParam = op.createOwnedParameter(
+ "ref", requiredIntf); //$NON-NLS-1$
StereotypeUtil.apply(refParam, Ptr.class);
- OpaqueBehavior behavior = (OpaqueBehavior)
- implementation.createOwnedBehavior(opName,
- UMLPackage.eINSTANCE.getOpaqueBehavior());
+ OpaqueBehavior behavior = (OpaqueBehavior) implementation
+ .createOwnedBehavior(opName,
+ UMLPackage.eINSTANCE.getOpaqueBehavior());
op.getMethods().add(behavior);
- ConnectorEnd ce = ConnectorUtil.getDelegation(implementation, portInfo.getModelPort());
- // if there is an delegation to an inner property, delegate to it
- // Make distinction between delegation to component (with a port) or
+ ConnectorEnd ce = ConnectorUtil.getDelegation(implementation,
+ portInfo.getModelPort());
+ // if there is an delegation to an inner property, delegate to
+ // it
+ // Make distinction between delegation to component (with a
+ // port) or
// "normal" class (without).
String body;
- if(ce != null) {
+ if (ce != null) {
Property part = ce.getPartWithPort();
body = part.getName();
ConnectableElement role = ce.getRole();
- if(role instanceof Port) {
- // in case of a delegation, use name of target port which might be different
- String targetOpName = PrefixConstants.connectQ_Prefix + role.getName();
+ if (role instanceof Port) {
+ // in case of a delegation, use name of target port
+ // which might be different
+ String targetOpName = PrefixConstants.connectQ_Prefix
+ + role.getName();
body += refOp(part) + targetOpName;
// TODO: no check that multiplicity of both port matches
- if((portInfo.getUpper() > 1) || (portInfo.getUpper() == -1)) {
+ if ((portInfo.getUpper() > 1)
+ || (portInfo.getUpper() == -1)) {
body += "(index, ref);"; //$NON-NLS-1$
} else {
body += "(ref);"; //$NON-NLS-1$
@@ -268,42 +314,55 @@ public class CompImplTrafos {
}
} else {
// no delegation - create attribute for port
- String attributeName = PrefixConstants.attributePrefix + portInfo.getName();
- if(!Utils.hasNonPortOwnedAttribute(implementation, attributeName)) {
- Property attr = implementation.createOwnedAttribute(attributeName, requiredIntf);
- Copy.copyMultElemModifiers(portInfo.getPort(), attr);
+ String attributeName = PrefixConstants.attributePrefix
+ + portInfo.getName();
+ if (!Utils.hasNonPortOwnedAttribute(implementation,
+ attributeName)) {
+ Property attr = implementation.createOwnedAttribute(
+ attributeName, requiredIntf);
+ LazyCopier.copyMultElemModifiers(portInfo.getPort(), attr);
// is shared (should store a reference)
attr.setAggregation(AggregationKind.SHARED_LITERAL);
}
- body = attributeName + (multiPort ? "[index]" : "") + " = ref;"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ body = attributeName
+ + (multiPort ? "[index]" : "") + " = ref;"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
}
// TODO: defined by template
behavior.getLanguages().add(progLang);
behavior.getBodies().add(body);
// -------------------------
- // add body to get-connection operation (which exists already if the port is also
- // owned, since it is synchronized automatically during model edit)
- // getConnQ prefix may be empty to indicate that the port is accessed directly
- // TODO: reconsider optimization that delegated required ports do not have a
- // local attribute & associated operation (an inner class may delegate, but the
- // composite may be using it as well).
- if((PrefixConstants.getConnQ_Prefix.length() > 0) && (ce != null)) {
- opName = PrefixConstants.getConnQ_Prefix + portInfo.getName();
+ // add body to get-connection operation (which exists already if
+ // the port is also
+ // owned, since it is synchronized automatically during model
+ // edit)
+ // getConnQ prefix may be empty to indicate that the port is
+ // accessed directly
+ // TODO: reconsider optimization that delegated required ports
+ // do not have a
+ // local attribute & associated operation (an inner class may
+ // delegate, but the
+ // composite may be using it as well).
+ if ((PrefixConstants.getConnQ_Prefix.length() > 0)
+ && (ce != null)) {
+ opName = PrefixConstants.getConnQ_Prefix
+ + portInfo.getName();
op = implementation.getOwnedOperation(opName, null, null);
- if(op == null) {
- op = implementation.createOwnedOperation(opName, null, null, requiredIntf);
+ if (op == null) {
+ op = implementation.createOwnedOperation(opName, null,
+ null, requiredIntf);
Parameter retParam = op.getOwnedParameters().get(0);
retParam.setName(retParamName);
StereotypeUtil.apply(retParam, Ptr.class);
}
- behavior = (OpaqueBehavior)
- implementation.createOwnedBehavior(opName,
- UMLPackage.eINSTANCE.getOpaqueBehavior());
+ behavior = (OpaqueBehavior) implementation
+ .createOwnedBehavior(opName,
+ UMLPackage.eINSTANCE.getOpaqueBehavior());
op.getMethods().add(behavior);
// no delegation
- String name = PrefixConstants.attributePrefix + portInfo.getName();
+ String name = PrefixConstants.attributePrefix
+ + portInfo.getName();
body = "return " + name + ";"; //$NON-NLS-1$ //$NON-NLS-2$
behavior.getLanguages().add(progLang);
behavior.getBodies().add(body);
@@ -313,37 +372,42 @@ public class CompImplTrafos {
}
/**
- * Add an operation "createConnections" that implements the connections between composite
- * parts. It only takes the assembly connections into account, since delegation connectors
- * are handled by the get_ and connect_ port operations above.
+ * Add an operation "createConnections" that implements the connections
+ * between composite parts. It only takes the assembly connections into
+ * account, since delegation connectors are handled by the get_ and connect_
+ * port operations above.
*
* @param implementation
*/
private static void addCreateConnections(Class implementation)
- throws TransformationException {
+ throws TransformationException {
String createConnBody = ""; //$NON-NLS-1$
Map<ConnectorEnd, Integer> indexMap = new HashMap<ConnectorEnd, Integer>();
- for(Connector connector : implementation.getOwnedConnectors()) {
- if(ConnectorUtil.isAssembly(connector)) {
+ for (Connector connector : implementation.getOwnedConnectors()) {
+ if (ConnectorUtil.isAssembly(connector)) {
// Boolean associationBased = false;
if (connector.getEnds().size() != 2) {
- throw new TransformationException("Connector <" + connector.getName() + "> does not have two ends. This is currently not supported"); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new TransformationException(
+ "Connector <" + connector.getName() + "> does not have two ends. This is currently not supported"); //$NON-NLS-1$ //$NON-NLS-2$
}
ConnectorEnd end1 = connector.getEnds().get(0);
ConnectorEnd end2 = connector.getEnds().get(1);
String cmd;
- cmd = "// realization of connector <" + connector.getName() + ">\n"; //$NON-NLS-1$//$NON-NLS-2$
- if ((end1.getRole() instanceof Port) && PortUtils.isExtendedPort((Port) end1.getRole())) {
+ cmd = "// realization of connector <" + connector.getName() + ">\n"; //$NON-NLS-1$//$NON-NLS-2$
+ if ((end1.getRole() instanceof Port)
+ && PortUtils.isExtendedPort((Port) end1.getRole())) {
Port port = (Port) end1.getRole();
- EList<PortInfo> subPorts = PortUtils.flattenExtendedPort(port);
+ EList<PortInfo> subPorts = PortUtils
+ .flattenExtendedPort(port);
for (PortInfo subPort : subPorts) {
- cmd += " // realization of connection for sub-port " + subPort.getPort().getName() + "\n"; //$NON-NLS-1$//$NON-NLS-2$
- cmd += connectPorts(indexMap, connector, end1, end2, subPort.getPort());
- cmd += connectPorts(indexMap, connector, end2, end1, subPort.getPort());
+ cmd += " // realization of connection for sub-port " + subPort.getPort().getName() + "\n"; //$NON-NLS-1$//$NON-NLS-2$
+ cmd += connectPorts(indexMap, connector, end1, end2,
+ subPort.getPort());
+ cmd += connectPorts(indexMap, connector, end2, end1,
+ subPort.getPort());
}
- }
- else {
+ } else {
cmd += connectPorts(indexMap, connector, end1, end2, null);
cmd += connectPorts(indexMap, connector, end2, end1, null);
}
@@ -351,12 +415,13 @@ public class CompImplTrafos {
}
}
// TODO: use template, as in bootloader
- if(createConnBody.length() > 0) {
- Operation operation = implementation.createOwnedOperation("createConnections", null, null); //$NON-NLS-1$
+ if (createConnBody.length() > 0) {
+ Operation operation = implementation.createOwnedOperation(
+ "createConnections", null, null); //$NON-NLS-1$
- OpaqueBehavior behavior = (OpaqueBehavior)
- implementation.createOwnedBehavior("b:" + operation.getName(), //$NON-NLS-1$
- UMLPackage.eINSTANCE.getOpaqueBehavior());
+ OpaqueBehavior behavior = (OpaqueBehavior) implementation
+ .createOwnedBehavior("b:" + operation.getName(), //$NON-NLS-1$
+ UMLPackage.eINSTANCE.getOpaqueBehavior());
behavior.getLanguages().add(progLang);
behavior.getBodies().add(createConnBody);
behavior.setSpecification(operation);
@@ -364,100 +429,127 @@ public class CompImplTrafos {
}
/**
- * Create a connection between the two ends of a receptacle. This function checks whether the first end really is
- * a receptacle and the second really is a facet.
- * @param indexMap a map of indices that are used in case of multiplex receptacles
- * @param connector a connector
- * @param receptacleEnd an end of the connector that may point to a receptacle port
- * @param facetEnd an end of the connector that may point to a facet port
- * @param subPort a sub-port in case of extended ports
+ * Create a connection between the two ends of a receptacle. This function
+ * checks whether the first end really is a receptacle and the second really
+ * is a facet.
+ *
+ * @param indexMap
+ * a map of indices that are used in case of multiplex
+ * receptacles
+ * @param connector
+ * a connector
+ * @param receptacleEnd
+ * an end of the connector that may point to a receptacle port
+ * @param facetEnd
+ * an end of the connector that may point to a facet port
+ * @param subPort
+ * a sub-port in case of extended ports
* @return
* @throws TransformationException
*/
- public static String connectPorts(Map<ConnectorEnd, Integer> indexMap, Connector connector, ConnectorEnd receptacleEnd, ConnectorEnd facetEnd, Port subPort)
- throws TransformationException
- {
+ public static String connectPorts(Map<ConnectorEnd, Integer> indexMap,
+ Connector connector, ConnectorEnd receptacleEnd,
+ ConnectorEnd facetEnd, Port subPort) throws TransformationException {
Association association = connector.getType();
- if((receptacleEnd.getRole() instanceof Port) && (facetEnd.getRole() instanceof Port)) {
+ if ((receptacleEnd.getRole() instanceof Port)
+ && (facetEnd.getRole() instanceof Port)) {
Port facetPort = (Port) facetEnd.getRole();
Port receptaclePort = (Port) receptacleEnd.getRole();
PortInfo facetPI = PortInfo.fromSubPort(facetPort, subPort);
- PortInfo receptaclePI = PortInfo.fromSubPort(receptaclePort, subPort);
+ PortInfo receptaclePI = PortInfo.fromSubPort(receptaclePort,
+ subPort);
- if((facetPI.getProvided() != null) && (receptaclePI.getRequired() != null)) {
+ if ((facetPI.getProvided() != null)
+ && (receptaclePI.getRequired() != null)) {
Property facetPart = facetEnd.getPartWithPort();
Property receptaclePart = receptacleEnd.getPartWithPort();
-
+
String subPortName = (subPort != null) ? "_" + subPort.getName() : ""; //$NON-NLS-1$ //$NON-NLS-2$
- String indexName = getIndexName(indexMap, receptaclePort, receptacleEnd);
- String setter = receptaclePart.getName() + refOp(receptaclePart) + "connect_" + receptaclePort.getName() + subPortName; //$NON-NLS-1$
- String getter = facetPart.getName() + refOp(facetPart) + "get_" + facetPort.getName() + subPortName + "()"; //$NON-NLS-1$ //$NON-NLS-2$
+ String indexName = getIndexName(indexMap, receptaclePort,
+ receptacleEnd);
+ String setter = receptaclePart.getName()
+ + refOp(receptaclePart)
+ + "connect_" + receptaclePort.getName() + subPortName; //$NON-NLS-1$
+ String getter = facetPart.getName() + refOp(facetPart)
+ + "get_" + facetPort.getName() + subPortName + "()"; //$NON-NLS-1$ //$NON-NLS-2$
return setter + "(" + indexName + getter + ");\n"; //$NON-NLS-1$ //$NON-NLS-2$
}
-
- }
- else if(receptacleEnd.getRole() instanceof Port) {
+
+ } else if (receptacleEnd.getRole() instanceof Port) {
// only the receptacle end is of type port.
Port receptaclePort = (Port) receptacleEnd.getRole();
- if(PortUtils.getRequired(receptaclePort) != null) {
+ if (PortUtils.getRequired(receptaclePort) != null) {
Property facetPart = (Property) facetEnd.getRole();
Property receptaclePart = facetEnd.getPartWithPort();
-
- String indexName = getIndexName(indexMap, receptaclePort, receptacleEnd);
- String setter = receptaclePart.getName() + refOp(receptaclePart) + "connect_" + receptaclePort.getName(); //$NON-NLS-1$
- String getter = facetPart.getName() + refOp(facetPart) + facetPart.getName();
+
+ String indexName = getIndexName(indexMap, receptaclePort,
+ receptacleEnd);
+ String setter = receptaclePart.getName()
+ + refOp(receptaclePart)
+ + "connect_" + receptaclePort.getName(); //$NON-NLS-1$
+ String getter = facetPart.getName() + refOp(facetPart)
+ + facetPart.getName();
return setter + "(" + indexName + getter + ");\n"; //$NON-NLS-1$ //$NON-NLS-2$
}
- }
- else if(facetEnd.getRole() instanceof Port) {
+ } else if (facetEnd.getRole() instanceof Port) {
// only the receptacle end is of type port.
Port facetPort = (Port) facetEnd.getRole();
- if(PortUtils.getProvided(facetPort) != null) {
+ if (PortUtils.getProvided(facetPort) != null) {
Property facetPart = facetEnd.getPartWithPort();
Property receptaclePart = (Property) facetEnd.getRole();
-
+
String setter = receptaclePart.getName();
- String getter = facetPart.getName() + refOp(facetPart) + "get_" + facetPort.getName() + " ()"; //$NON-NLS-1$ //$NON-NLS-2$
+ String getter = facetPart.getName() + refOp(facetPart)
+ + "get_" + facetPort.getName() + " ()"; //$NON-NLS-1$ //$NON-NLS-2$
return setter + " = " + getter + ";\n"; //$NON-NLS-1$ //$NON-NLS-2$
}
- }
- else if(association != null) {
- // both connector ends do not target ports. In this case, we require that the connector is typed
- // with an association. We use this association to find out which end is navigable and assume that
- // the part pointed to by the other end is a pointer that gets initialized with the part of the
+ } else if (association != null) {
+ // both connector ends do not target ports. In this case, we require
+ // that the connector is typed
+ // with an association. We use this association to find out which
+ // end is navigable and assume that
+ // the part pointed to by the other end is a pointer that gets
+ // initialized with the part of the
// navigable end.
Property facetPart = (Property) facetEnd.getRole();
Property receptaclePart = (Property) receptacleEnd.getRole();
-
- Property assocProp1 = association.getMemberEnd(null, facetPart.getType());
+
+ Property assocProp1 = association.getMemberEnd(null,
+ facetPart.getType());
// Property assocProp2 = facetPart.getOtherEnd();
- if((assocProp1 != null) && assocProp1.isNavigable()) {
- String setter = receptaclePart.getName() + refOp(receptaclePart)+ assocProp1.getName();
+ if ((assocProp1 != null) && assocProp1.isNavigable()) {
+ String setter = receptaclePart.getName()
+ + refOp(receptaclePart) + assocProp1.getName();
String getter = "&" + facetPart.getName(); //$NON-NLS-1$
return setter + " = " + getter + ";\n"; //$NON-NLS-1$ //$NON-NLS-2$
}
- }
- else {
+ } else {
// not handled (a connector not targeting a port must be typed)
- throw new TransformationException("Connector <" + connector.getName() + //$NON-NLS-1$
- "> does not use ports, but it is not typed (only connectors between ports should not be typed)"); //$NON-NLS-1$
+ throw new TransformationException(
+ "Connector <" + connector.getName() + //$NON-NLS-1$
+ "> does not use ports, but it is not typed (only connectors between ports should not be typed)"); //$NON-NLS-1$
}
return ""; //$NON-NLS-1$
}
-
+
/**
- * Handle ports with multiplicity > 1. The idea is that we could have multiple connections targeting a receptacle.
- * The first connection would start with index 0. Implementations can make no assumption which connection is associated
- * with a certain index. [want to avoid associative array in runtime].
+ * Handle ports with multiplicity > 1. The idea is that we could have
+ * multiple connections targeting a receptacle. The first connection would
+ * start with index 0. Implementations can make no assumption which
+ * connection is associated with a certain index. [want to avoid associative
+ * array in runtime].
+ *
* @param port
* @param end
* @return
*/
- public static String getIndexName (Map<ConnectorEnd, Integer> indexMap, Port port, ConnectorEnd end) {
- if((port.getUpper() > 1) || (port.getUpper() == -1)) {
- // index depends of combination of property and port, use connector end as key
+ public static String getIndexName(Map<ConnectorEnd, Integer> indexMap,
+ Port port, ConnectorEnd end) {
+ if ((port.getUpper() > 1) || (port.getUpper() == -1)) {
+ // index depends of combination of property and port, use connector
+ // end as key
Integer indexValue = indexMap.get(end);
- if(indexValue == null) {
+ if (indexValue == null) {
indexValue = 0;
indexMap.put(end, indexValue);
}
@@ -465,67 +557,70 @@ public class CompImplTrafos {
indexValue++;
indexMap.put(end, indexValue);
return index;
- }
+ }
return ""; //$NON-NLS-1$
- }
-
+ }
+
public static void deleteConnectors(Package pkg) {
- Iterator<PackageableElement> elements = pkg.getPackagedElements().iterator();
- while(elements.hasNext()) {
+ Iterator<PackageableElement> elements = pkg.getPackagedElements()
+ .iterator();
+ while (elements.hasNext()) {
PackageableElement element = elements.next();
- if(element instanceof Package) {
- deleteConnectors((Package)element);
- } else if(element instanceof Class) {
- Class implementation = (Class)element;
+ if (element instanceof Package) {
+ deleteConnectors((Package) element);
+ } else if (element instanceof Class) {
+ Class implementation = (Class) element;
implementation.getOwnedConnectors().clear();
}
}
}
/**
- * Return true, if the bootloader is responsible for the instantiation of a part.
- * [Structual difference: bootloader can decide instance based - and instances are deployed]
+ * Return true, if the bootloader is responsible for the instantiation of a
+ * part. [Structual difference: bootloader can decide instance based - and
+ * instances are deployed]
*
- * If a part is a component type or an abstract implementation, it cannot be instantiated. Thus, a heir
- * has to be selected in the deployment plan. Since the selection might be different for different instances
- * of the composite, the instantiation is not done by the component itself, but by the bootloader.
- * The bootloader also has to instantiate, if different allocation variants are required.
- * (this is for instance the case for distribution connectors and for the system itself)
+ * If a part is a component type or an abstract implementation, it cannot be
+ * instantiated. Thus, a heir has to be selected in the deployment plan.
+ * Since the selection might be different for different instances of the
+ * composite, the instantiation is not done by the component itself, but by
+ * the bootloader. The bootloader also has to instantiate, if different
+ * allocation variants are required. (this is for instance the case for
+ * distribution connectors and for the system itself)
*
- * If possible, we want to let composites instantiate sub-components, since this eases
- * the transition to systems which support reconfiguration.
+ * If possible, we want to let composites instantiate sub-components, since
+ * this eases the transition to systems which support reconfiguration.
*
- * [TODO: optimization: analyze whether the deployment plan selects a single implementation. If yes, let the
- * composite instantiate]
+ * [TODO: optimization: analyze whether the deployment plan selects a single
+ * implementation. If yes, let the composite instantiate]
*
- * [TODO: elements within an assembly need to be instantiated by composite - if System - by bootloader.
- * assembly also need to be instantiated by composite!!
+ * [TODO: elements within an assembly need to be instantiated by composite -
+ * if System - by bootloader. assembly also need to be instantiated by
+ * composite!!
*
* @param implementation
* @return
*/
public static boolean instantiateViaBootloader(Class implementation) {
- return
- implementation.isAbstract() ||
- Utils.isAssembly(implementation);
+ return implementation.isAbstract() || Utils.isAssembly(implementation);
}
/**
- * Return whether a part needs to be instantiated by the bootloader instead by the
- * composite in which it is contained. The criteria is based on the question whether
- * the containing composite is flattened, as it is the case for the system
- * component and the interaction components for distribution.
+ * Return whether a part needs to be instantiated by the bootloader instead
+ * by the composite in which it is contained. The criteria is based on the
+ * question whether the containing composite is flattened, as it is the case
+ * for the system component and the interaction components for distribution.
+ *
* @param part
* @return
*/
public static boolean instantiateViaBootloader(StructuralFeature part) {
- if(part != null) {
- if(part.getType() instanceof Class) {
- Class implementation = (Class)part.getType();
+ if (part != null) {
+ if (part.getType() instanceof Class) {
+ Class implementation = (Class) part.getType();
// TODO: wrong criteria? (must be shared or not?)
return instantiateViaBootloader(implementation);
- }
- else {
+ } else {
// not a class, assume primitive type instantiated by composite
return false;
}
@@ -534,15 +629,40 @@ public class CompImplTrafos {
}
/**
- * return the operator for (de-) referencing a part. If the part is instantiate via the
- * bootloader, it becomes a pointer. If it is instantiated by the composite itself,
- * it is not a pointer, it will be instantiated along with the composite
+ * return the operator for (de-) referencing a part. If the part is
+ * instantiate via the bootloader, it becomes a pointer. If it is
+ * instantiated by the composite itself, it is not a pointer, it will be
+ * instantiated along with the composite
*
* @param part
* @return
*/
protected static String refOp(Property part) {
- return ((part.getAggregation() == AggregationKind.SHARED_LITERAL) || StereotypeUtil.isApplied(part, Ptr.class)) ?
- "->" : "."; //$NON-NLS-1$ //$NON-NLS-2$
+ return ((part.getAggregation() == AggregationKind.SHARED_LITERAL) || StereotypeUtil
+ .isApplied(part, Ptr.class)) ? "->" : "."; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public static void transform(Class bootloader2, LazyCopier targetCopy,
+ Model genModel, boolean OOmodel) throws TransformationException {
+ // 2c: add get_p/connect_q operations
+ // caveat: may modify imported classes
+ CompImplTrafos.bootloader = bootloader2;
+ CompImplTrafos.addPortOperations(targetCopy, genModel);
+
+ if (OOmodel) {
+ // 3: component -> OO transformations related to ports:
+ // complete port access operations
+ // (get<PortName>/connect<PortName> and
+ // remove the ports afterwards
+ CompTypeTrafos.completeAccessOps(genModel);
+ CompTypeTrafos.removePorts(genModel);
+ }
+
+ // 4: remove connectors from implementations, since their
+ // endpoint's roles
+ // have disappeared during step 4b (targeted ports have been
+ // deleted together with the types).
+ CompImplTrafos.deleteConnectors(genModel);
+
}
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java
index 3b46d557aa9..7583049239f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java
@@ -110,7 +110,7 @@ public class ConnectorReification {
/**
*
- * @param copy
+ * @param copier
* @param tmComponent
* @param smConnectorPart
* Part representing the connector
@@ -122,7 +122,7 @@ public class ConnectorReification {
* connector
* @throws TransformationException
*/
- public static Property reifyConnector(Copy copy, Class tmComponent,
+ public static Property reifyConnector(LazyCopier copier, Class tmComponent,
Property smConnectorPart, InstanceSpecification tmIS, Object[] args)
throws TransformationException {
// 1st step: create part for the connector without actually changing the type.
@@ -143,14 +143,14 @@ public class ConnectorReification {
Class connectorImplem;
if(binding != null) {
- TemplateUtils.adaptActualsToTargetModel(copy, binding);
- TemplateInstantiation ti = new TemplateInstantiation(copy, binding, args);
+ TemplateUtils.adaptActualsToTargetModel(copier, binding);
+ TemplateInstantiation ti = new TemplateInstantiation(copier, binding, args);
connectorImplem = (Class)ti.bindNamedElement(connectorImplemTemplate);
} else {
// no binding, class is not a template => copy as it is
- connectorImplem = copy.getCopy(connectorImplemTemplate);
+ connectorImplem = copier.getCopy(connectorImplemTemplate);
}
- Property tmConnectorPart = copy.getCopy(smConnectorPart);
+ Property tmConnectorPart = copier.getCopy(smConnectorPart);
tmConnectorPart.setType(connectorImplem);
// now re-target connectors towards this part
TemplateUtils.retargetConnectors(tmComponent, tmConnectorPart);
@@ -160,8 +160,8 @@ public class ConnectorReification {
/**
* Reify a connector
*
- * @param copy
- * The copy obect (from source to target mode)
+ * @param copier
+ * The coper from source to target mode
* @param tmComponent
* containing composite in target target
* @param name
@@ -173,11 +173,11 @@ public class ConnectorReification {
* (the part typed with the instantiated interaction component) should be created.
* The instance is only used to find a suitable implementation.
* @param args
- * addtion args for the Acceleo transformation
+ * additional arguments for the Acceleo transformation
* @return the created part within tmComponent
* @throws TransformationException
*/
- public static Property reifyConnector(Copy copy, Class tmComponent,
+ public static Property reifyConnector(LazyCopier copier, Class tmComponent,
String name, Connector smConnector, InstanceSpecification tmIS, Object[] args)
throws TransformationException {
@@ -197,17 +197,17 @@ public class ConnectorReification {
Class connectorImplem;
if(binding != null) {
- TemplateUtils.adaptActualsToTargetModel(copy, binding);
+ TemplateUtils.adaptActualsToTargetModel(copier, binding);
// make copy of bound package and restore it later. Required for nested template instantiations, in particular
// the bound package is set within container transformations and is (by default) restored to "null" afterwards.
// TODO: TemplateInstantiation should do this automatically
- copy.pushPackageTemplate();
- TemplateInstantiation ti = new TemplateInstantiation(copy, binding, args);
+ copier.pushPackageTemplate();
+ TemplateInstantiation ti = new TemplateInstantiation(copier, binding, args);
connectorImplem = (Class)ti.bindNamedElement(connectorImplemTemplate);
- copy.popPackageTemplate();
+ copier.popPackageTemplate();
} else {
// no binding, class is not a template => copy as it is
- connectorImplem = copy.getCopy(connectorImplemTemplate);
+ connectorImplem = copier.getCopy(connectorImplemTemplate);
}
if(connectorImplem == null) {
@@ -218,7 +218,7 @@ public class ConnectorReification {
Property tmConnectorPart = tmComponent.createOwnedAttribute(name,
connectorImplemTemplate);
// copy id, but prefix it with "p" (for part)
- Copy.copyID(smConnector, tmConnectorPart, "p"); //$NON-NLS-1$
+ LazyCopier.copyID(smConnector, tmConnectorPart, "p"); //$NON-NLS-1$
tmConnectorPart.setIsComposite(true);
Log.log(Status.INFO, Log.TRAFO_CONNECTOR,
@@ -230,7 +230,7 @@ public class ConnectorReification {
for(ConnectorEnd smEnd : smConnector.getEnds()) {
Connector tmConnector = tmComponent.createOwnedConnector("c " //$NON-NLS-1$
+ name + " " + String.valueOf(i)); //$NON-NLS-1$
- Copy.copyID(smConnector, tmConnector);
+ LazyCopier.copyID(smConnector, tmConnector);
i++;
// the new connector connects the existing end with an end of the
// reified connector (the newly created property.)
@@ -239,9 +239,9 @@ public class ConnectorReification {
// non-connector part)
ConnectorEnd tmEnd1 = tmConnector.createEnd();
Property smPartWithPort = smEnd.getPartWithPort();
- Property tmPartWithPort = copy.getCopy(smPartWithPort);
+ Property tmPartWithPort = copier.getCopy(smPartWithPort);
ConnectableElement smRole = smEnd.getRole();
- ConnectableElement tmRole = copy.getCopy(smRole);
+ ConnectableElement tmRole = copier.getCopy(smRole);
tmEnd1.setPartWithPort(tmPartWithPort);
tmEnd1.setRole(tmRole);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java
index 20927702bed..a7faefb946f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java
@@ -84,8 +84,8 @@ public class ContainerTrafo extends AbstractContainerTrafo {
* @param tmCDP
* deployment plan within target model
*/
- public ContainerTrafo(Copy copy, Package tmCDP, InstanceSpecification executorIS) {
- this.copy = copy;
+ public ContainerTrafo(LazyCopier copier, Package tmCDP, InstanceSpecification executorIS) {
+ this.copier = copier;
this.tmCDP = tmCDP;
this.executorIS = executorIS;
portInfo = new HashMap<Property, Port>();
@@ -121,11 +121,11 @@ public class ContainerTrafo extends AbstractContainerTrafo {
if (isSingleton) {
StereotypeUtil.apply(tmContainerImpl, Singleton.class);
}
- Copy.copyID(tmComponent, tmContainerImpl, containerPostfix);
+ LazyCopier.copyID(tmComponent, tmContainerImpl, containerPostfix);
// add part and slot corresponding to component;
executorPart = tmContainerImpl.createOwnedAttribute(executorPartName, tmComponent);
- Copy.copyID(tmComponent, executorPart, "e"); //$NON-NLS-1$
+ LazyCopier.copyID(tmComponent, executorPart, "e"); //$NON-NLS-1$
executorPart.setIsComposite(true);
@@ -142,7 +142,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
// create delegation for application port
Connector containerDelegation = tmContainerImpl.createOwnedConnector("delegation " + port.getName()); //$NON-NLS-1$
- Copy.copyID(tmContainerImpl, containerDelegation);
+ LazyCopier.copyID(tmContainerImpl, containerDelegation);
ConnectorEnd end1 = containerDelegation.createEnd();
end1.setRole(newPort);
ConnectorEnd end2 = containerDelegation.createEnd();
@@ -175,7 +175,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
public void createHwContainer(Class tmComponent) throws TransformationException {
Package tmPkgOwner = (Package)tmComponent.getOwner();
tmContainerImpl = tmPkgOwner.createOwnedClass(tmComponent.getName() + hwContainerPostfix, false);
- Copy.copyID(tmComponent, tmContainerImpl, hwContainerPostfix);
+ LazyCopier.copyID(tmComponent, tmContainerImpl, hwContainerPostfix);
// register created container
containers.put(tmComponent, this);
@@ -262,7 +262,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
slotCopy.setDefiningFeature(slot.getDefiningFeature());
// copy values (use CopyTo.copyTo(slot, containerIS) instead?)
for (ValueSpecification value : slot.getValues()) {
- Copy.copyValue(value, slotCopy);
+ LazyCopier.copyValue(value, slotCopy);
}
}
return containerIS;
@@ -333,9 +333,9 @@ public class ContainerTrafo extends AbstractContainerTrafo {
Property extensionPart =
expandAggregationExtension(part, extOrInterceptor, tmComponent);
// register relation to facilitate connector copy
- copy.setPackageTemplate(smContainerRule.getBase_Class(), tmContainerImpl);
- copy.putPair(part, extensionPart);
- copy.setPackageTemplate(null, null);
+ copier.setPackageTemplate(smContainerRule.getBase_Class(), tmContainerImpl);
+ copier.putPair(part, extensionPart);
+ copier.setPackageTemplate(null, null);
}
}
}
@@ -347,7 +347,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
// the types of the referenced parts).
// [main issue here: properties of container rule are not copies in the sense of identical
// copies]
- copy.setPackageTemplate(smContainerRule.getBase_Class(), tmContainerImpl);
+ copier.setPackageTemplate(smContainerRule.getBase_Class(), tmContainerImpl);
for(Connector connector : smContainerRule.getBase_Class().getOwnedConnectors()) {
Property ruleInterceptorPart = null;
@@ -364,25 +364,25 @@ public class ContainerTrafo extends AbstractContainerTrafo {
for(Property interceptorPart : interceptorPartsMap.get(ruleInterceptorPart)) {
// map an interceptor part within rule successively to to an interceptor part
// within the container
- copy.putPair(ruleInterceptorPart, interceptorPart);
- copy.removeForCopy(connector);
- copy.getCopy(connector);
+ copier.putPair(ruleInterceptorPart, interceptorPart);
+ copier.removeForCopy(connector);
+ copier.getCopy(connector);
}
}
else {
// check whether FCM connector
org.eclipse.papyrus.FCM.Connector fcmConn = StUtils.getConnector(connector);
if(fcmConn != null) {
- ConnectorReification.reifyConnector(copy, tmContainerImpl,
+ ConnectorReification.reifyConnector(copier, tmContainerImpl,
UMLTool.varName(connector), connector, executorIS, null);
}
else {
- copy.remove(connector);
- copy.getCopy(connector);
+ copier.remove(connector);
+ copier.getCopy(connector);
}
}
}
- copy.setPackageTemplate(null, null);
+ copier.setPackageTemplate(null, null);
TemplateUtils.retargetConnectors(tmContainerImpl);
}
@@ -401,7 +401,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
TemplateSignature signature = TemplateUtils.getSignature(smContainerExtImpl);
if(signature == null) {
// no template signature, just copy the container extension into the target model
- tmContainerExtImpl = copy.getCopy(smContainerExtImpl);
+ tmContainerExtImpl = copier.getCopy(smContainerExtImpl);
}
else {
// template signature found, instantiate container extension via template binding mechanism
@@ -417,9 +417,9 @@ public class ContainerTrafo extends AbstractContainerTrafo {
}
// template signature and instantiate container extension via the
// template binding mechanism, use executor component as actual
- TemplateBinding binding = TemplateUtils.fixedBinding(copy.target, smContainerExtImpl, actual);
+ TemplateBinding binding = TemplateUtils.fixedBinding(copier.target, smContainerExtImpl, actual);
Object[] args = new Object[]{};
- TemplateInstantiation ti = new TemplateInstantiation(copy, binding, args);
+ TemplateInstantiation ti = new TemplateInstantiation(copier, binding, args);
tmContainerExtImpl = (Class)ti.bindNamedElement(smContainerExtImpl);
}
@@ -441,7 +441,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
throw new TransformationException(Messages.ContainerTrafo_RecursiveLWnotSupported);
}
else {
- containerTrafo = new ContainerTrafo(copy, tmCDP, null);
+ containerTrafo = new ContainerTrafo(copier, tmCDP, null);
}
containerTrafo.createContainer(smContainerExtImpl, tmContainerExtImpl);
}
@@ -463,8 +463,8 @@ public class ContainerTrafo extends AbstractContainerTrafo {
// Copy.copyID(tmComponent, extensionPart, "a");
extensionPart.setAggregation(smExtensionPart.getAggregation());
- Copy.copyMultElemModifiers(smExtensionPart, extensionPart);
- Copy.copyFeatureModifiers(smExtensionPart, extensionPart);
+ LazyCopier.copyMultElemModifiers(smExtensionPart, extensionPart);
+ LazyCopier.copyFeatureModifiers(smExtensionPart, extensionPart);
return extensionPart;
}
@@ -547,7 +547,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
Object[] args = new Object[]{ executorIS, port };
TransformationContext.instance = executorIS;
TransformationContext.port = port;
- connectorPart = ConnectorReification.reifyConnector(copy, tmContainerImpl, UMLTool.varName(interceptionConnector), interceptionConnector, executorIS, args);
+ connectorPart = ConnectorReification.reifyConnector(copier, tmContainerImpl, UMLTool.varName(interceptionConnector), interceptionConnector, executorIS, args);
connectorParts.add(connectorPart);
TransformationContext.port = null;
portInfo.put(connectorPart, port);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
index a1e27391ee8..117c7e86d26 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
@@ -27,7 +27,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.papyrus.FCM.Configuration;
-import org.eclipse.papyrus.FCM.DeploymentPlan;
import org.eclipse.papyrus.FCM.util.MapUtil;
import org.eclipse.papyrus.acceleo.AcceleoDriver;
import org.eclipse.papyrus.qompass.designer.core.Log;
@@ -47,31 +46,25 @@ import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator
import org.eclipse.papyrus.qompass.designer.core.extensions.LanguageSupport;
import org.eclipse.papyrus.qompass.designer.core.generate.GenerateCode;
import org.eclipse.papyrus.qompass.designer.core.generate.GenerationOptions;
-import org.eclipse.papyrus.qompass.designer.core.templates.InstantiateCppIncludeWOB;
-import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterComments;
import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterRuleApplication;
import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterStateMachines;
import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterTemplate;
-import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.PackageableElement;
import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This class executes all transformations during the instantiation of a
- * deployment plan, i.e.
- * 1. The reification of connectors (including template instantiation). This transformation targets a new model
- * 2. Adding get_p/connect_q operations to a class (transformation within same model)
- * 3. Remove all component types
- * 4. distribute to nodes
+ * deployment plan, i.e. 1. The reification of connectors (including template
+ * instantiation). This transformation targets a new model 2. Adding
+ * get_p/connect_q operations to a class (transformation within same model) 3.
+ * Remove all component types 4. distribute to nodes
*
* @author ansgar
*
@@ -79,302 +72,414 @@ import org.eclipse.uml2.uml.util.UMLUtil;
public class InstantiateDepPlan {
/**
- * The location of the temporary model (relative to current project).
- * TODO: make configurable?
+ * The location of the temporary model (relative to current project). TODO:
+ * make configurable?
*/
public static final String TEMP_MODEL_FOLDER = "tmpModel"; //$NON-NLS-1$
-
+
/**
* Postfix of the temporary model (prefix = name of top-level package).
* TODO: make configurable?
*/
public static final String TEMP_MODEL_POSTFIX = "Tmp.uml"; //$NON-NLS-1$
-
-
+
/**
- * Instantiate a deployment plan, i.e. generate an intermediate model via a sequence of transformations
- *
- * @param cdpOrConfig a deployment plan (UML package) or a configuration (UML class)
- * @param monitor a progress monitor.
-
- * @param project the current project. This information is used to store the intermediate model in
- * a subfolder (tmpModel) of the current project
- * @param genOptions select whether to produce an intermediate model only, also code, ... @see GenerationOptions
+ * Progress monitor of Eclipse.
*/
- public static void instantiate(Element cdpOrConfig, IProgressMonitor monitor, IProject project, int genOptions) {
- boolean OOmodel = true;
- if(project == null) {
- String projectName = cdpOrConfig.eResource().getURI().toString();
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ protected IProgressMonitor monitor = null;
+
+ protected int generationOptions;
+
+ protected boolean generateCode;
+
+ protected boolean generateCACOnly;
+
+ protected Package srcModelComponentDeploymentPlan = null;
+
+ protected Configuration configuration = null;
+
+ protected IProject project;
+
+ protected boolean modelIsObjectOriented = true;
+
+ public void instantiate(Configuration configuration,
+ IProgressMonitor monitor, IProject project, int genOptions) {
+ this.configuration = configuration;
+ srcModelComponentDeploymentPlan = configuration
+ .getDeploymentPlan().getBase_Package();
+ //
+ if (srcModelComponentDeploymentPlan == null) {
+ String message = String
+ .format(Messages.InstantiateDepPlan_DepPlanStereotypeNotInitialized,
+ configuration.getBase_Class().getName());
+ displayError(Messages.InstantiateDepPlan_TransformationException,
+ message);
}
- Model tmpModel = null;
- ModelManagement tmpMM = null;
-
- boolean generateCode = (genOptions & GenerationOptions.MODEL_ONLY) == 0;
- boolean generateCACOnly = (genOptions & GenerationOptions.CAC_ONLY) != 0;
-
- AcceleoDriver.clearErrors();
- Package smCDP;
- Configuration configuration = null;
- if(cdpOrConfig instanceof Package) {
- smCDP = (Package)cdpOrConfig;
- RuleManagement.setConfiguration(null);
+
+ this.project = project;
+ if (project == null) {
+ String projectName = configuration.getBase_Class().eResource()
+ .getURI().toString();
+ this.project = ResourcesPlugin.getWorkspace().getRoot()
+ .getProject(projectName);
}
- else if(StereotypeUtil.isApplied(cdpOrConfig, Configuration.class)) {
- configuration = UMLUtil.getStereotypeApplication(cdpOrConfig, Configuration.class);
- DeploymentPlan fcmCDP = configuration.getDeploymentPlan();
- if(fcmCDP == null) {
- final NamedElement config = (NamedElement)cdpOrConfig;
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- Shell shell = new Shell();
- MessageDialog.openError(shell, Messages.InstantiateDepPlan_CannotGenModel,
- String.format(Messages.InstantiateDepPlan_DepPlanStereotypeNotInitialized, config.getName()));
- }
- });
- return;
- }
- smCDP = fcmCDP.getBase_Package();
- RuleManagement.setConfiguration(configuration);
- } else {
- return;
+ //
+ instantiate(monitor, genOptions);
+ }
+
+ public void instantiate(Package pkg, IProgressMonitor monitor,
+ IProject project, int genOptions) {
+ configuration = null;
+ srcModelComponentDeploymentPlan = pkg;
+ //
+ this.project = project;
+ if (project == null) {
+ String projectName = pkg.eResource().getURI().toString();
+ this.project = ResourcesPlugin.getWorkspace().getRoot()
+ .getProject(projectName);
}
+ //
+ instantiate(monitor, genOptions);
+ }
+
+ /**
+ * Instantiate a deployment plan, i.e. generate an intermediate model via a
+ * sequence of transformations
+ *
+ * @param umlElement
+ * a deployment plan (UML package) or a configuration (UML class)
+ * @param monitor
+ * a progress monitor.
+ *
+ * @param project
+ * the current project. This information is used to store the
+ * intermediate model in a subfolder (tmpModel) of the current
+ * project
+ * @param genOptions
+ * select whether to produce an intermediate model only, also
+ * code, ... @see GenerationOptions
+ */
+ private void instantiate(IProgressMonitor monitor, int genOptions) {
try {
- EnumService.init();
- InstanceSpecification rootIS = DepUtils.getMainInstance(smCDP);
- // Package copyCDP = dt.getCopyCDT (selectedCDP);
-
- EList<InstanceSpecification> nodes = AllocUtils.getAllNodes(rootIS);
-
- // -- calc # of steps for progress monitor
- // 1 (tmpModel creation) + 1 (reification) + 1 (tmpModel save)
- // 5x on each deployed node (see below)
- // problem? Connector reification is a single, relatively long step
- int steps = 3;
- steps += 5 * nodes.size();
- if(generateCode) {
- steps += nodes.size();
- }
- monitor.beginTask(Messages.InstantiateDepPlan_InfoGeneratingModel, steps);
- if(monitor.isCanceled()) {
- return;
- }
+ initialize(monitor, genOptions);
+ AcceleoDriver.clearErrors();
+ executeTransformation();
+ } catch (AcceleoException e) {
+ displayError(Messages.InstantiateDepPlan_AcceleoErrors,
+ Messages.InstantiateDepPlan_AcceleoErrorsCheckLog);
+ } catch (final TransformationException e) {
+ printAndDisplayErrorMessage(e,
+ Messages.InstantiateDepPlan_TransformationException, false);
+ } catch (final Exception e) {
+ printAndDisplayErrorMessage(e,
+ Messages.InstantiateDepPlan_ErrorsDuringTransformation,
+ true);
+ }
+ }
- // 1a: create a new model (and applies same profiles / imports)
- Model existingModel = smCDP.getModel();
- TransformationContext.sourceRoot = existingModel;
- tmpMM = createTargetModel(existingModel, monitor, existingModel.getName(), true);
- tmpModel = tmpMM.getModel();
- // Declare that the new model is a derivedElement (kind of hack, since the source
- // element (attribute of derive element) remains undefined). This is used to
- // de-activate automatic transformations that should not be applied to the generated
- // model.
- monitor.worked(1);
- if(monitor.isCanceled()) {
- return;
- }
+ private void initialize(IProgressMonitor monitor, int genOptions)
+ throws TransformationException {
+ this.monitor = monitor;
+ this.generationOptions = genOptions;
+ this.generateCode = (genOptions & GenerationOptions.MODEL_ONLY) == 0;
+ this.generateCACOnly = (genOptions & GenerationOptions.CAC_ONLY) != 0;
- // LateEval.clear();
+ RuleManagement.setConfiguration(configuration);
+ }
- EnumService.createEnumPackage(tmpModel);
+ protected void executeTransformation() throws Exception {
+ modelIsObjectOriented = true;
+ ModelManagement intermediateModelManagement = null;
+
+ InstanceSpecification mainInstance = DepUtils
+ .getMainInstance(srcModelComponentDeploymentPlan);
+ EList<InstanceSpecification> nodes = AllocUtils
+ .getAllNodes(mainInstance);
+
+ initiateProgressMonitor(generateCode, nodes);
+
+ // --------------------------------------------------------------------
+ checkProgressStatus();
+ // --------------------------------------------------------------------
+
+ // 1a: create a new model (and applies same profiles / imports)
+ Model existingModel = srcModelComponentDeploymentPlan.getModel();
+ TransformationContext.sourceRoot = existingModel;
+
+ intermediateModelManagement = createTargetModel(existingModel,
+ existingModel.getName(), true);
+
+ // Declare that the new model is a derivedElement (kind of hack,
+ // since the source element (attribute of derive element) remains
+ // undefined). This is used to deactivate automatic transformations
+ // that should not be applied to the generated model.
+
+ // --------------------------------------------------------------------
+ checkProgressStatus();
+ // --------------------------------------------------------------------
+
+ // get the temporary model
+ Model intermediateModel = intermediateModelManagement.getModel();
+
+ // create a package for global enumerations that are used by Acceleo code
+ EnumService.createEnumPackage(intermediateModel);
+
+ // create a lazy copier towards the intermediate model
+ LazyCopier intermediateModelCopier = new LazyCopier(existingModel, intermediateModel, false, true);
+ // add pre-copy and post-copy listeners to the copier
+ intermediateModelCopier.preCopyListeners.add(FilterTemplate.getInstance());
+
+ // 1b: reify the connectors "into" the new model
+ monitor.subTask(Messages.InstantiateDepPlan_InfoExpandingConnectors);
+
+ // obtain the component deployment plan in target model
+ Package intermediateModelComponentDeploymentPlan = (Package) intermediateModelCopier
+ .shallowCopy(srcModelComponentDeploymentPlan);
+ intermediateModelCopier.createShallowContainer(srcModelComponentDeploymentPlan);
+
+ ContainerTrafo.init();
+ InstanceConfigurator.onNodeModel = false;
+ MainModelTrafo mainModelTrafo = new MainModelTrafo(intermediateModelCopier,
+ intermediateModelComponentDeploymentPlan);
+ InstanceSpecification newMainInstance = mainModelTrafo
+ .transformInstance(mainInstance, null);
+
+ // --------------------------------------------------------------------
+ checkProgressStatus();
+ // --------------------------------------------------------------------
+
+ TransformationUtil.applyInstanceConfigurators(newMainInstance);
+
+ FlattenInteractionComponents.getInstance().flattenAssembly(
+ newMainInstance, null);
+
+ TransformationUtil.propagateAllocation(newMainInstance);
+
+ intermediateModelManagement.saveModel(project, TEMP_MODEL_FOLDER,
+ TEMP_MODEL_POSTFIX);
+
+ // --------------------------------------------------------------------
+ checkProgressStatus();
+ // --------------------------------------------------------------------
+
+ if (!generateCACOnly) {
+ deployOnNodes(mainInstance, existingModel, intermediateModel,
+ newMainInstance);
+ }
- Copy tmpCopy = new Copy(existingModel, tmpModel, false);
- tmpCopy.preCopyListeners.add(FilterTemplate.getInstance());
- tmpCopy.preCopyListeners.add(FilterComments.getInstance());
- tmpCopy.postCopyListeners.add(InstantiateCppIncludeWOB.getInstance());
+ intermediateModelManagement.dispose();
- Copy.copyID(existingModel, tmpModel);
+ if (AcceleoDriver.hasErrors()) {
+ throw new AcceleoException();
+ }
- // 1b: reify the connectors "into" the new model
- monitor.subTask(Messages.InstantiateDepPlan_InfoExpandingConnectors);
+ }
+
+ private void deployOnNodes(InstanceSpecification mainInstance,
+ Model existingModel, Model tmpModel, InstanceSpecification newRootIS)
+ throws TransformationException, InterruptedException {
- // obtain reference to CDP in target model
- //
- tmpCopy.createShallowContainer(rootIS);
- Package tmCDP = (Package)tmpCopy.get(smCDP);
+ // not deploy on each node
+ DepCreation.initAutoValues(newRootIS);
- ContainerTrafo.init();
- InstanceConfigurator.onNodeModel = false;
- MainModelTrafo mainModelTrafo = new MainModelTrafo(tmpCopy, tmCDP);
- InstanceSpecification newRootIS = mainModelTrafo.transformInstance(rootIS, null);
- monitor.worked(1);
+ EList<InstanceSpecification> nodes = AllocUtils.getAllNodes(newRootIS);
+ if (nodes.size() > 0) {
+ InstanceConfigurator.onNodeModel = true;
+ for (int nodeIndex = 0; nodeIndex < nodes.size(); nodeIndex++) {
+ InstanceSpecification node = nodes.get(nodeIndex);
- // 1c: late bindings
- // LateEval.bindLateOperations();
- // 3: distribute to nodes
+ deployNode(mainInstance, existingModel, tmpModel, newRootIS,
+ nodes, nodeIndex, node);
+ }
+ } else {
+ throw new TransformationException(
+ Messages.InstantiateDepPlan_InfoNoneAllocated);
+ }
+ }
- // UpdateDerivedInterfaces.updateIntfs(newRootIS);
-
- ApplyInstanceConfigurators.applyInstanceConfigurators(newRootIS);
+ private void deployNode(InstanceSpecification mainInstance,
+ Model existingModel, Model tmpModel,
+ InstanceSpecification newRootIS,
+ EList<InstanceSpecification> nodes, int nodeIndex,
+ InstanceSpecification node) throws TransformationException,
+ InterruptedException {
+ ModelManagement genModelManagement = createTargetModel(existingModel,
+ MapUtil.rootModelName, false);
+ Model generatedModel = genModelManagement.getModel();
+
+ // --------------------------------------------------------------------
+ checkProgressStatus();
+ // --------------------------------------------------------------------
+
+ // new model has name "root" and contains a package with the
+ // existing model
+ // Package originalRoot = genModel.createNestedPackage
+ // (existingModel.getName ());
+ LazyCopier targetCopy = new LazyCopier(tmpModel, generatedModel, true, true);
+ // TODO: distribution to nodes is currently not done. How
+ // can it be realized with a copy filter ?
+ targetCopy.preCopyListeners.add(FilterStateMachines.getInstance());
+ targetCopy.preCopyListeners.add(FilterRuleApplication.getInstance());
+
+ monitor.setTaskName(String.format(
+ Messages.InstantiateDepPlan_InfoDeployingForNode,
+ node.getName()));
+
+ ILangSupport langSupport = configureLanguageSupport(mainInstance,
+ existingModel, node);
+
+ Deploy deployment = new Deploy(targetCopy, langSupport, node,
+ nodeIndex, nodes.size());
+ InstanceSpecification nodeRootIS = deployment
+ .distributeToNode(newRootIS);
+ TransformationUtil.updateDerivedInterfaces(nodeRootIS);
+
+ // --------------------------------------------------------------------
+ checkProgressStatus();
+ // --------------------------------------------------------------------
+
+ removeDerivedInterfacesInRoot(generatedModel);
+
+ CompImplTrafos.transform(
+ deployment.getBootloader(), targetCopy, generatedModel,
+ modelIsObjectOriented);
+
+ // --------------------------------------------------------------------
+ checkProgressStatus();
+ // --------------------------------------------------------------------
+
+ destroyDeploymentPlanFolder(generatedModel);
+
+ if (generateCode) {
+ GenerateCode codeGenerator = new GenerateCode(
+ langSupport.getProject(), langSupport, genModelManagement,
+ monitor);
+ boolean option = (generationOptions & GenerationOptions.ONLY_CHANGED) != 0;
+ codeGenerator.generate(node, getTargetLanguage(mainInstance),
+ option);
+ }
- FlattenInteractionComponents.getInstance().flattenAssembly(newRootIS, null);
-
- PropagateAllocationToSharedInstances.propagateAllocation(newRootIS);
-
- String tmpPath = tmpMM.getPath(project, TEMP_MODEL_FOLDER, tmpModel.getName() + TEMP_MODEL_POSTFIX);
- tmpMM.saveModel(tmpPath);
+ genModelManagement.dispose();
+ }
- if(monitor.isCanceled()) {
- return;
+ private ILangSupport configureLanguageSupport(
+ InstanceSpecification mainInstance, Model existingModel,
+ InstanceSpecification node) throws TransformationException {
+ ILangSupport langSupport = LanguageSupport
+ .getLangSupport(getTargetLanguage(mainInstance));
+ langSupport.resetConfigurationData();
+
+ String modelName = getModelName(existingModel, node);
+ IProject genProject = ProjectManagement.getNamedProject(modelName);
+ if ((genProject == null) || !genProject.exists()) {
+ genProject = langSupport.createProject(modelName, node);
+ } else {
+ langSupport.setProject(genProject);
+ if ((generationOptions & GenerationOptions.REWRITE_SETTINGS) != 0) {
+ langSupport.setSettings(node);
}
- monitor.worked(1);
+ }
+ return langSupport;
+ }
- if(!generateCACOnly) {
- // not deploy on each node
- DepCreation.initAutoValues(newRootIS);
+ private void destroyDeploymentPlanFolder(Model generatedModel) {
+ PackageableElement deploymentPlanFolder = generatedModel
+ .getPackagedElement(DeployConstants.depPlanFolderHw);
+ if (deploymentPlanFolder != null) {
+ deploymentPlanFolder.destroy();
+ }
+ }
- nodes = AllocUtils.getAllNodes(newRootIS);
- if(nodes.size() == 0) {
- throw new TransformationException(Messages.InstantiateDepPlan_InfoNoneAllocated);
+ private void removeDerivedInterfacesInRoot(Model generatedModel) {
+ // 2b: remove derived interfaces in root: derived interfaces
+ // that can not be placed in the same package as the port type (e.g.
+ // since read-only type from system library), are put in a top-level
+ // package called "derivedInterfaces". Due to the copying of imports,
+ // the top-level package has changed which implies that new derived
+ // interfaces are put into a different package and the derivedInterfaces
+ // package in the original root becomes obsolete. Delete this obsolete
+ // package, if existing.
+ for (PackageableElement packagedElement : generatedModel
+ .getPackagedElements()) {
+ if (packagedElement instanceof Package) {
+ NamedElement derivedInterfaces = ((Package) packagedElement)
+ .getPackagedElement("derivedInterfaces"); //$NON-NLS-1$
+ if (derivedInterfaces instanceof Package) {
+ derivedInterfaces.destroy();
}
- int nodeIndex = 0;
- Classifier cl = DepUtils.getClassifier(rootIS);
- String targetLanguage = DepUtils.getLanguageFromPackage(cl.getNearestPackage());
- if (targetLanguage == null) {
- targetLanguage = "C++"; //$NON-NLS-1$
- }
-
- InstanceConfigurator.onNodeModel = true;
- for(InstanceSpecification node : nodes) {
- String modelName = existingModel.getName() + "_" + node.getName(); //$NON-NLS-1$
- if(configuration != null) {
- modelName += "_" + configuration.getBase_Class().getName(); //$NON-NLS-1$
- } else {
- modelName += "_" + smCDP.getName(); //$NON-NLS-1$
- }
- ModelManagement genMM = createTargetModel(existingModel, monitor, MapUtil.rootModelName, false);
- Model genModel = genMM.getModel();
-
- if(monitor.isCanceled()) {
- return;
- }
- monitor.worked(1);
- // new model has name "root" and contains a package with the
- // existing model
- // Package originalRoot = genModel.createNestedPackage
- // (existingModel.getName ());
- Copy targetCopy = new Copy(tmpModel, genModel, true);
- // TODO: distribution to nodes is currently not done. How can it be realized with a copy filter ?
- targetCopy.preCopyListeners.add(FilterStateMachines.getInstance());
- targetCopy.preCopyListeners.add(FilterRuleApplication.getInstance());
- targetCopy.postCopyListeners.add(InstantiateCppIncludeWOB.getInstance());
-
- monitor.setTaskName(String.format(Messages.InstantiateDepPlan_InfoDeployingForNode, node.getName()));
- ILangSupport langSupport = LanguageSupport.getLangSupport(targetLanguage);
- langSupport.resetConfigurationData();
-
- Deploy deploy = new Deploy(targetCopy, langSupport, node, nodeIndex, nodes.size());
- InstanceSpecification nodeRootIS = deploy.distributeToNode(newRootIS);
- UpdateDerivedInterfaces.updateIntfs(nodeRootIS);
-
- if(monitor.isCanceled()) {
- return;
- }
- monitor.worked(1);
- // 2b: remove derived interfaces in root: derived interfaces that can
- // not be placed in the same package as the port type (e.g. since read-only
- // type from system library), are put in a top-level package called "derivedInterfaces".
- // Due to the copying of imports, the top-level package has changed which implies that new
- // derived interfaces are put into a different package and the derivedInterfaces package in
- // the original root becomes obsolete. Delete this obsolete package, if existing.
- for (PackageableElement pe : genModel.getPackagedElements()) {
- if (pe instanceof Package) {
- NamedElement derivedInterfaces = ((Package) pe).getPackagedElement("derivedInterfaces"); //$NON-NLS-1$
- if(derivedInterfaces instanceof Package) {
- derivedInterfaces.destroy();
- }
- }
- }
- // 2c: add get_p/connect_q operations
- // caveat: may modify imported classes
- CompImplTrafos.bootloader = deploy.getBootloader();
- CompImplTrafos.addPortOperations(targetCopy, genModel);
-
- if(OOmodel) {
- // 3: component -> OO transformations related to ports:
- // complete port access operations
- // (get<PortName>/connect<PortName> and
- // remove the ports afterwards
- CompTypeTrafos.completeAccessOps(genModel);
- CompTypeTrafos.removePorts(genModel);
- }
-
- // 4: remove connectors from implementations, since their endpoint's roles
- // have disappeared during step 4b (targeted ports have been
- // deleted together with the types).
- CompImplTrafos.deleteConnectors(genModel);
- if(monitor.isCanceled()) {
- return;
- }
- monitor.worked(1);
+ }
+ }
+ }
- PackageableElement depPlanFolder = genModel.getPackagedElement(DeployConstants.depPlanFolderHw);
- if (depPlanFolder != null) {
- depPlanFolder.destroy();
- }
- IProject genProject = ProjectManagement.getNamedProject(modelName);
- if((genProject == null) || !genProject.exists()) {
- genProject = langSupport.createProject(modelName, node);
- }
- else {
- langSupport.setProject(genProject);
- if((genOptions & GenerationOptions.REWRITE_SETTINGS) != 0) {
- langSupport.setSettings(node);
- }
- }
+ private String getModelName(Model existingModel, InstanceSpecification node) {
+ String modelName = existingModel.getName() + "_" + node.getName(); //$NON-NLS-1$
+ if (configuration != null) {
+ modelName += "_" + configuration.getBase_Class().getName(); //$NON-NLS-1$
+ } else {
+ modelName += "_" + srcModelComponentDeploymentPlan.getName(); //$NON-NLS-1$
+ }
+ return modelName;
+ }
-
- if(generateCode) {
- GenerateCode codeGen = new GenerateCode(genProject, langSupport, genMM, monitor);
- codeGen.generate(node, targetLanguage, (genOptions & GenerationOptions.ONLY_CHANGED) != 0);
- }
+ private String getTargetLanguage(InstanceSpecification mainInstance) {
+ Classifier cl = DepUtils.getClassifier(mainInstance);
+ String targetLanguage = DepUtils.getLanguageFromPackage(cl
+ .getNearestPackage());
+ if (targetLanguage == null) {
+ targetLanguage = "C++"; //$NON-NLS-1$
+ }
+ return targetLanguage;
+ }
- nodeIndex++;
- genMM.dispose();
- }
- }
- } catch (TransformationException te) {
- // Get UI thread to show dialog
- final TransformationException teFinal = te;
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- Shell shell = new Shell();
- MessageDialog.openError(shell, Messages.InstantiateDepPlan_TransformationException, teFinal.getMessage());
- }
- });
- Log.log(Status.ERROR, Log.DEPLOYMENT, "", teFinal); //$NON-NLS-1$
- } catch (Exception e) {
- final Exception eFinal = e;
- e.printStackTrace();
- Display.getDefault().syncExec(new Runnable() {
-
- public void run() {
- Shell shell = new Shell();
- String msg = eFinal.toString() + "\n\n" + //$NON-NLS-1$
- Messages.InstantiateDepPlan_ConsultConsole;
- MessageDialog.openError(shell, Messages.InstantiateDepPlan_ErrorsDuringTransformation, msg);
- }
- });
- Log.log(Status.ERROR, Log.DEPLOYMENT, "", e); //$NON-NLS-1$
+ private void initiateProgressMonitor(boolean generateCode,
+ EList<InstanceSpecification> nodes) {
+ // -- calc # of steps for progress monitor
+ // 1 (tmpModel creation) + 1 (reification) + 1 (tmpModel save)
+ // 5x on each deployed node (see below)
+ // problem? Connector reification is a single, relatively long step
+ int steps = 3;
+ steps += 5 * nodes.size();
+ if (generateCode) {
+ steps += nodes.size();
}
- if(tmpMM != null) {
- tmpMM.dispose();
+ monitor.beginTask(Messages.InstantiateDepPlan_InfoGeneratingModel,
+ steps);
+ }
+
+ private void checkProgressStatus() throws InterruptedException {
+ if (monitor.isCanceled()) {
+ throw new InterruptedException();
}
- if (AcceleoDriver.hasErrors()) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- Shell shell = new Shell();
- MessageDialog.openInformation(shell, Messages.InstantiateDepPlan_AcceleoErrors,
- Messages.InstantiateDepPlan_AcceleoErrorsCheckLog);
- }
- });
+ monitor.worked(1);
+ }
+
+ private void printAndDisplayErrorMessage(Exception e, final String title,
+ final boolean consultConsole) {
+ String message = e.toString(); //$NON-NLS-1$
+ if (consultConsole) {
+ message = message + "\n\n"
+ + Messages.InstantiateDepPlan_ConsultConsole;
}
+ printAndDisplayErrorMessage(e, title, message, consultConsole);
}
+ private void printAndDisplayErrorMessage(Exception e, final String title,
+ final String message, final boolean consultConsole) {
+ e.printStackTrace();
+ displayError(title, message);
+ Log.log(Status.ERROR, Log.DEPLOYMENT, "", e); //$NON-NLS-1$
+ }
+
+ private void displayError(final String title, final String message) {
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ Shell shell = new Shell();
+ MessageDialog.openInformation(shell, title, message);
+ }
+ });
+ }
/**
* Create a new empty model from an existing model that applies the same
@@ -383,83 +488,110 @@ public class InstantiateDepPlan {
* @param existingModel
* @return
*/
- public static ModelManagement createTargetModel(Model existingModel, IProgressMonitor monitor, String name, boolean copyImports) throws TransformationException {
+ public ModelManagement createTargetModel(Model existingModel, String name,
+ boolean copyImports) throws TransformationException {
ModelManagement mm = new ModelManagement();
Model newModel = mm.getModel();
newModel.setName(name);
try {
// copy profile application
- for(Profile profile : existingModel.getAppliedProfiles()) {
+ for (Profile profile : existingModel.getAppliedProfiles()) {
// reload profile in resource of new model
- monitor.subTask(Messages.InstantiateDepPlan_InfoApplyProfile + profile.getQualifiedName());
+ monitor.subTask(Messages.InstantiateDepPlan_InfoApplyProfile
+ + profile.getQualifiedName());
- if(profile.eResource() == null) {
+ if (profile.eResource() == null) {
String profileName = profile.getQualifiedName();
- if(profileName == null) {
- if(profile instanceof MinimalEObjectImpl.Container) {
- URI uri = ((MinimalEObjectImpl.Container)profile).eProxyURI();
- if(uri != null) {
- throw new TransformationException(String.format(Messages.InstantiateDepPlan_CheckInputModelProfileNoRes, uri));
+ if (profileName == null) {
+ if (profile instanceof MinimalEObjectImpl.Container) {
+ URI uri = ((MinimalEObjectImpl.Container) profile)
+ .eProxyURI();
+ if (uri != null) {
+ throw new TransformationException(
+ String.format(
+ Messages.InstantiateDepPlan_CheckInputModelProfileNoRes,
+ uri));
}
}
- throw new TransformationException(Messages.InstantiateDepPlan_CheckInputModelProfileNoResNoName);
+ throw new TransformationException(
+ Messages.InstantiateDepPlan_CheckInputModelProfileNoResNoName);
}
- throw new TransformationException(String.format(Messages.InstantiateDepPlan_CheckInputModelProfile3, profileName));
+ throw new TransformationException(
+ String.format(
+ Messages.InstantiateDepPlan_CheckInputModelProfile3,
+ profileName));
}
Resource profileResource = null;
try {
- profileResource = ModelManagement.getResourceSet().getResource(profile.eResource().getURI(), true);
+ profileResource = ModelManagement.getResourceSet()
+ .getResource(profile.eResource().getURI(), true);
} catch (WrappedException e) {
- // read 2nd time (some diagnostic errors are raised only once)
- Log.log(Status.WARNING, Log.DEPLOYMENT, "Warning: exception in profile.eResource() " + e.getMessage()); //$NON-NLS-1$
- profileResource = ModelManagement.getResourceSet().getResource(profile.eResource().getURI(), true);
+ // read 2nd time (some diagnostic errors are raised only
+ // once)
+ Log.log(Status.WARNING,
+ Log.DEPLOYMENT,
+ "Warning: exception in profile.eResource() " + e.getMessage()); //$NON-NLS-1$
+ profileResource = ModelManagement.getResourceSet()
+ .getResource(profile.eResource().getURI(), true);
}
- Profile newProfileTop = (Profile)profileResource.getContents().get(0);
+ Profile newProfileTop = (Profile) profileResource.getContents()
+ .get(0);
Profile newProfile;
String qname = profile.getQualifiedName();
- if((qname != null) && qname.contains("::")) { //$NON-NLS-1$
+ if ((qname != null) && qname.contains("::")) { //$NON-NLS-1$
// profile is a sub-profile within same resource
// TODO: should Copy class copy profile applications?
// Should be handled in shallowContainer class.
- // if we put profile/newProfile pair into copy map, copy would find (and copy profile
+ // if we put profile/newProfile pair into copy map, copy
+ // would find (and copy profile
// applications in sub-folders
qname = qname.substring(qname.indexOf("::") + 2); //$NON-NLS-1$
- newProfile = (Profile)Utils.getQualifiedElement(newProfileTop, qname);
- }
- else {
+ newProfile = (Profile) Utils.getQualifiedElement(
+ newProfileTop, qname);
+ } else {
newProfile = newProfileTop;
}
newProfile.getMember("dummy"); // force profile loading //$NON-NLS-1$
newModel.applyProfile(newProfile);
}
} catch (IllegalArgumentException e) {
- throw new TransformationException(Messages.InstantiateDepPlan_IllegalArgumentDuringCopy + e.toString());
+ throw new TransformationException(
+ Messages.InstantiateDepPlan_IllegalArgumentDuringCopy
+ + e.toString());
}
- // copy imports (and load resources associated - TODO: might not be necessary)
- // While this is useful in general, it implies that code for imported models
- // has been generated and compiled (for the right target) into a library. This may be
+ // copy imports (and load resources associated - TODO: might not be
+ // necessary)
+ // While this is useful in general, it implies that code for imported
+ // models
+ // has been generated and compiled (for the right target) into a
+ // library. This may be
// quite tedious, unless automatically managed.
- // Therefore we do not activate this option in a first pass of the model transformations.
- if(copyImports) {
- for(Package importedPackage : existingModel.getImportedPackages()) {
- if(importedPackage == null) {
- throw new TransformationException(Messages.InstantiateDepPlan_CheckInputImportPkg);
+ // Therefore we do not activate this option in a first pass of the model
+ // transformations.
+ if (copyImports) {
+ for (Package importedPackage : existingModel.getImportedPackages()) {
+ if (importedPackage == null) {
+ throw new TransformationException(
+ Messages.InstantiateDepPlan_CheckInputImportPkg);
}
- if(importedPackage.eResource() == null) {
+ if (importedPackage.eResource() == null) {
String errorMsg = Messages.InstantiateDepPlan_CheckInputImportPkgNoRes;
- if(importedPackage instanceof MinimalEObjectImpl.Container) {
- URI uri = ((MinimalEObjectImpl.Container)importedPackage).eProxyURI();
- if(uri != null) {
+ if (importedPackage instanceof MinimalEObjectImpl.Container) {
+ URI uri = ((MinimalEObjectImpl.Container) importedPackage)
+ .eProxyURI();
+ if (uri != null) {
errorMsg += " - URI: " + uri.devicePath(); //$NON-NLS-1$
}
}
throw new TransformationException(errorMsg);
}
newModel.createPackageImport(importedPackage);
- monitor.subTask(String.format(Messages.InstantiateDepPlan_InfoImportPackage, importedPackage.getName()));
+ monitor.subTask(String.format(
+ Messages.InstantiateDepPlan_InfoImportPackage,
+ importedPackage.getName()));
try {
importedPackage.eResource().load(null);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java
index 75b169e87ab..46c96e53786 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java
@@ -74,8 +74,8 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
* @param tmCDP
* deployment plan within target model
*/
- public LWContainerTrafo(Copy copy, Package tmCDP) {
- this.copy = copy;
+ public LWContainerTrafo(LazyCopier copy, Package tmCDP) {
+ this.copier = copy;
this.tmCDP = tmCDP;
interceptionOpMap = new HashMap<Operation, Operation>();
}
@@ -224,9 +224,9 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
Property extensionPart =
expandAggregationExtension(part.getName(), extOrInterceptor, tmComponent);
// register relation to facilitate connector copy
- copy.setPackageTemplate(smContainerRule.getBase_Class(), tmClass);
- copy.put(part, extensionPart);
- copy.setPackageTemplate(null, null);
+ copier.setPackageTemplate(smContainerRule.getBase_Class(), tmClass);
+ copier.put(part, extensionPart);
+ copier.setPackageTemplate(null, null);
}
}
else {
@@ -271,13 +271,13 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
TemplateSignature signature = TemplateUtils.getSignature(smContainerExtImpl);
if(signature == null) {
// no template signature, just copy the container extension into the target model
- tmContainerExtImpl = copy.getCopy(smContainerExtImpl);
+ tmContainerExtImpl = copier.getCopy(smContainerExtImpl);
} else {
// template signature found, instantiate container extension via the
// template binding mechanism
- TemplateBinding binding = TemplateUtils.fixedBinding(copy.target, smContainerExtImpl, tmComponent);
+ TemplateBinding binding = TemplateUtils.fixedBinding(copier.target, smContainerExtImpl, tmComponent);
Object[] args = new Object[]{};
- TemplateInstantiation ti = new TemplateInstantiation(copy, binding, args);
+ TemplateInstantiation ti = new TemplateInstantiation(copier, binding, args);
tmContainerExtImpl = (Class)ti.bindNamedElement(smContainerExtImpl);
}
@@ -293,7 +293,7 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
throws TransformationException
{
for(Operation smOperation : operations) {
- Operation tmOperation = copy.getCopy(smOperation);
+ Operation tmOperation = copier.getCopy(smOperation);
String interceptionBody = ""; //$NON-NLS-1$
for(Behavior behavior : interceptionOperationInRule.getMethods()) {
if(behavior instanceof OpaqueBehavior) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/Copy.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java
index b930350bf66..f47eacbdbaa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/Copy.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LazyCopier.java
@@ -33,7 +33,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.papyrus.qompass.designer.core.Log;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PostCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
@@ -75,10 +76,8 @@ import org.eclipse.uml2.uml.util.UMLUtil;
* A shallow copy can be transformed into a "real" copy
* by explicitly copying it.
*
- * @author ansgar
- *
*/
-public class Copy extends Copier {
+public class LazyCopier extends Copier {
public enum CopyStatus {
/**
@@ -106,13 +105,20 @@ public class Copy extends Copier {
SHALLOW
}
- public Copy(Package source_, Package target_, boolean copyExtResources_) {
- source = source_;
- target = target_;
+ /**
+ *
+ * @param source source package (root)
+ * @param target target package (root)
+ * @param copyExtResources_ copy elements that are not within the same resource instead of referencing them.
+ * @param copyID copyID true, if XML IDs should be copied as well.
+ */
+ public LazyCopier(Package source, Package target, boolean copyExtResources_, boolean copyID) {
+ this.source = source;
+ this.target = target;
// useOriginalReferences = false;
copyExtReferences = copyExtResources_;
- preCopyListeners = new BasicEList<CopyListener>();
- postCopyListeners = new BasicEList<CopyListener>();
+ preCopyListeners = new BasicEList<PreCopyListener>();
+ postCopyListeners = new BasicEList<PostCopyListener>();
templateMapInfo = new HashMap<EObject, Map<EObject, EObject>>();
standardMap = new HashMap<EObject, EObject>();
statusMap = new HashMap<EObject, CopyStatus>();
@@ -127,6 +133,10 @@ public class Copy extends Copier {
put(source, target);
setStatus(target, CopyStatus.SHALLOW);
}
+ this.copyID = copyID;
+ if (copyID) {
+ copyID(source, target);
+ }
};
/**
@@ -154,28 +164,30 @@ public class Copy extends Copier {
/**
* Bound package template
*/
- private Namespace boundPackage;
+ protected Namespace boundPackage;
/**
* Map to identify target objects when given source objects
*/
- private Map<EObject, EObject> standardMap;
+ protected Map<EObject, EObject> standardMap;
/**
* Map to identify target objects when given source objects
*/
- private Map<EObject, EObject> templateMap;
+ protected Map<EObject, EObject> templateMap;
/**
* Set of maps for template instantiations
*/
- private Map<EObject, Map<EObject, EObject>> templateMapInfo;
+ protected Map<EObject, Map<EObject, EObject>> templateMapInfo;
/**
* Map using a target EObject as key
*/
- private Map<EObject, CopyStatus> statusMap;
+ protected Map<EObject, CopyStatus> statusMap;
+ protected boolean copyID;
+
/**
* Elements within package templates must be treated differently, we have to ensure that:
* (1) several instantiations with same binding of the same package template do not lead to double copies
@@ -439,8 +451,8 @@ public class Copy extends Copier {
return sourceEObj;
}
- for(CopyListener listener : preCopyListeners) {
- EObject result = listener.copyEObject(this, sourceEObj);
+ for(PreCopyListener listener : preCopyListeners) {
+ EObject result = listener.preCopyEObject(this, sourceEObj);
if(result != sourceEObj) {
return result;
}
@@ -470,7 +482,9 @@ public class Copy extends Copier {
targetEObj = createCopy(sourceEObj);
put(sourceEObj, targetEObj);
setStatus(targetEObj, CopyStatus.INPROGRESS);
-
+ if (copyID) {
+ copyID(sourceEObj, targetEObj);
+ }
// creates a shallow copy of the container. This container will update containment references (such as packagedElement)
// and thus update links
createShallowContainer(sourceEObj);
@@ -507,17 +521,25 @@ public class Copy extends Copier {
}
}
}
+ else if ((eStructuralFeature instanceof EReference)) {
+ if (eStructuralFeature.getName().equals("clientDependency")) { //$NON-NLS-1$
+ Object feature = sourceEObj.eGet(eStructuralFeature);
+
+ if(feature instanceof Element) {
+ copy((Element)feature);
+ } else if(feature instanceof EList) {
+ copyAll((EList<Object>)feature);
+ }
+ }
+ }
}
copyProxyURI(sourceEObj, targetEObj);
copyID(sourceEObj, targetEObj);
copyStereotypes(sourceEObj);
setStatus(targetEObj, CopyStatus.FULL);
- for(CopyListener listener : postCopyListeners) {
- EObject result = listener.copyEObject(this, targetEObj);
- if(result != targetEObj) {
- return result;
- }
+ for(PostCopyListener listener : postCopyListeners) {
+ listener.postCopyEObject(this, targetEObj);
}
return targetEObj;
@@ -715,6 +737,9 @@ public class Copy extends Copier {
targetEObj = createCopy(sourceEObj);
put(sourceEObj, targetEObj);
setStatus(targetEObj, CopyStatus.SHALLOW);
+ if (copyID) {
+ copyID(sourceEObj, targetEObj);
+ }
first = true;
}
else if(getStatus(targetEObj) == CopyStatus.FULL) {
@@ -754,9 +779,9 @@ public class Copy extends Copier {
return (T)copy(source);
}
- public EList<CopyListener> preCopyListeners;
+ public EList<PreCopyListener> preCopyListeners;
- public EList<CopyListener> postCopyListeners;
+ public EList<PostCopyListener> postCopyListeners;
/**
* Called to handle the copying of a cross reference;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
index 79dee8f8763..e5948f5117a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
@@ -78,7 +78,7 @@ public class MainModelTrafo {
* @param tmCDP
* deployment plan in target model
*/
- public MainModelTrafo(Copy copy, Package tmCDP) {
+ public MainModelTrafo(LazyCopier copy, Package tmCDP) {
nodeHandled = new HashMap<InstanceSpecification, Boolean>();
this.copy = copy;
this.tmCDP = tmCDP;
@@ -463,7 +463,7 @@ public class MainModelTrafo {
/**
* Copier from source to target model
*/
- protected Copy copy;
+ protected LazyCopier copy;
/**
* deployment plan within target model
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PropagateAllocationToSharedInstances.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PropagateAllocationToSharedInstances.java
deleted file mode 100644
index cc34e630d6e..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PropagateAllocationToSharedInstances.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ansgar Radermacher ansgar.radermacher@cea.fr
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.qompass.designer.core.transformations;
-
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.papyrus.qompass.designer.core.Log;
-import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils;
-import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Slot;
-
-
-/**
- * Propagate allocation to shared instances: if a class references another instance
- * via sharing, the shared instance must be allocated on the node of the referencing
- * class as well.
- *
- */
-public class PropagateAllocationToSharedInstances {
- public static void propagateAllocation(InstanceSpecification instance) {
- propagateAllocation(instance, new UniqueEList<InstanceSpecification>());
- }
-
- public static void propagateAllocation(InstanceSpecification instance, EList<InstanceSpecification> nodes) {
- // create copy of node (otherwise, more and more nodes get aggregated.
- UniqueEList<InstanceSpecification> nodesCopy = new UniqueEList<InstanceSpecification>();
- nodesCopy.addAll(nodes);
- nodesCopy.addAll(AllocUtils.getNodes(instance));
- for (Slot slot : instance.getSlots()) {
- InstanceSpecification subInstance = DepUtils.getInstance(slot);
- if (subInstance != null) {
- if (DepUtils.isShared(slot)) {
- for (InstanceSpecification node : nodesCopy) {
- Log.log(Status.INFO, Log.DEPLOYMENT, String.format("Propagate node allocation: %s to %s", subInstance.getName(), node.getName())); //$NON-NLS-1$
- AllocUtils.allocate(subInstance, node);
- }
- }
- else {
- propagateAllocation(subInstance, nodesCopy);
- }
- }
- }
- }
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
index 13592311d51..5d418127c0c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
@@ -41,8 +41,6 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
import org.eclipse.papyrus.qompass.designer.core.extensions.LanguageSupport;
import org.eclipse.papyrus.qompass.designer.core.generate.GenerateCode;
-import org.eclipse.papyrus.qompass.designer.core.templates.InstantiateCppIncludeWOB;
-import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterComments;
import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterTemplate;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
@@ -72,7 +70,7 @@ public class TrafoAndCodegenPackage {
* @param pkg
* @throws TransformationException
*/
- public static void applyTrafo(Copy copy, Package pkg) throws TransformationException {
+ public static void applyTrafo(LazyCopier copy, Package pkg) throws TransformationException {
EList<PackageableElement> peList = new BasicEList<PackageableElement>();
peList.addAll(pkg.getPackagedElements());
for(PackageableElement element : peList) {
@@ -168,14 +166,10 @@ public class TrafoAndCodegenPackage {
EnumService.createEnumPackage(tmpModel);
- Copy tmpCopy = new Copy(existingModel, tmpModel, false);
+ LazyCopier tmpCopy = new LazyCopier(existingModel, tmpModel, false, true);
tmpCopy.preCopyListeners.add(FilterTemplate.getInstance());
- tmpCopy.preCopyListeners.add(FilterComments.getInstance());
- tmpCopy.postCopyListeners.add(InstantiateCppIncludeWOB.getInstance());
- Copy.copyID(existingModel, tmpModel);
-
- // 1b: reify the connectors "into" the new model
+ // 1b: reify the connectors "into" the new model
monitor.subTask(Messages.InstantiateDepPlan_InfoExpandingConnectors);
// obtain reference to CDP in target model
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationUtil.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationUtil.java
new file mode 100644
index 00000000000..86b5e26e49a
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationUtil.java
@@ -0,0 +1,81 @@
+package org.eclipse.papyrus.qompass.designer.core.transformations;
+
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.UniqueEList;
+import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils;
+import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
+import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
+import org.eclipse.papyrus.qompass.designer.core.sync.CompImplSync;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Slot;
+
+public class TransformationUtil {
+ public static void applyInstanceConfigurators(InstanceSpecification instance) {
+ for (Slot slot : instance.getSlots()) {
+ InstanceSpecification subInstance = DepUtils.getInstance(slot);
+ if (!DepUtils.isShared(slot) && (subInstance != null)) {
+ if (slot.getDefiningFeature() instanceof Property) {
+ InstanceConfigurator.configureInstance(subInstance, (Property) slot.getDefiningFeature(), instance);
+ }
+ applyInstanceConfigurators(subInstance);
+ }
+ }
+ }
+
+ public static void propagateAllocation(InstanceSpecification instance) {
+ propagateAllocation(instance, new UniqueEList<InstanceSpecification>());
+ }
+
+ public static void propagateAllocation(InstanceSpecification instance, EList<InstanceSpecification> nodes) {
+ // create copy of node (otherwise, more and more nodes get aggregated.
+ UniqueEList<InstanceSpecification> nodesCopy = new UniqueEList<InstanceSpecification>();
+ nodesCopy.addAll(nodes);
+ nodesCopy.addAll(AllocUtils.getNodes(instance));
+ for (Slot slot : instance.getSlots()) {
+ InstanceSpecification subInstance = DepUtils.getInstance(slot);
+ if (subInstance != null) {
+ if (DepUtils.isShared(slot)) {
+ for (InstanceSpecification node : nodesCopy) {
+ Log.log(Status.INFO, Log.DEPLOYMENT, String.format("Propagate node allocation: %s to %s", subInstance.getName(), node.getName())); //$NON-NLS-1$
+ AllocUtils.allocate(subInstance, node);
+ }
+ }
+ else {
+ propagateAllocation(subInstance, nodesCopy);
+ }
+ }
+ }
+ }
+
+ /**
+ * Update derived interfaces of ports. This is required, since the Copier does not follow references
+ * that are referenced via a derived attribute. Derived attributes are used for provided and required
+ * interfaces in the stereotype attributes of an FCM port. Thus, required (derived) interfaces would be
+ * unavailable in the copy, if not explicitly updated.
+ * However, the provided interface is not concerned as it appears in an "implements" relation. If the
+ * port is connected, the used interface of one port is the provided interface of the port counter part.
+ * Thus, the explicit update done by this function is not needed in most cases.
+ *
+ * see also FixTemplateSync (remove the latter?)
+ */
+ public static void updateDerivedInterfaces(InstanceSpecification instance) {
+ Classifier cl = DepUtils.getClassifier(instance);
+ if (cl instanceof Class) {
+ Class implementation = (Class) cl;
+ CompImplSync.updatePorts(implementation);
+ CompImplSync.syncRealizations(implementation);
+ }
+ for (Slot slot : instance.getSlots()) {
+ InstanceSpecification subInstance = DepUtils.getInstance(slot);
+ if (!DepUtils.isShared(slot) && (subInstance != null)) {
+ updateDerivedInterfaces(subInstance);
+ }
+ }
+ }
+
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateDerivedInterfaces.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateDerivedInterfaces.java
deleted file mode 100644
index 1bec8c88131..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateDerivedInterfaces.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ansgar Radermacher ansgar.radermacher@cea.fr
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.qompass.designer.core.transformations;
-
-import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
-import org.eclipse.papyrus.qompass.designer.core.sync.CompImplSync;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Slot;
-
-
-/**
- * Update derived interfaces of ports. This is required, since the Copier does not follow references
- * that are referenced via a derived attribute. Derived attributes are used for provided and required
- * interfaces in the stereotype attributes of an FCM port. Thus, required (derived) interfaces would be
- * unavailable in the copy, if not explicitly updated.
- * However, the provided interface is not concerned as it appears in an "implements" relation. If the
- * port is connected, the used interface of one port is the provided interface of the port counter part.
- * Thus, the explicit update done by this function is not needed in most cases.
- *
- * see also FixTemplateSync (remove the latter?)
- */
-public class UpdateDerivedInterfaces {
- public static void updateIntfs(InstanceSpecification instance) {
- Classifier cl = DepUtils.getClassifier(instance);
- if (cl instanceof Class) {
- Class implementation = (Class) cl;
- CompImplSync.updatePorts(implementation);
- CompImplSync.syncRealizations(implementation);
- }
- for (Slot slot : instance.getSlots()) {
- InstanceSpecification subInstance = DepUtils.getInstance(slot);
- if (!DepUtils.isShared(slot) && (subInstance != null)) {
- updateIntfs(subInstance);
- }
- }
- }
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterRuleApplication.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterRuleApplication.java
index e84f6392cd4..784ba9fbec0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterRuleApplication.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterRuleApplication.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.qompass.designer.core.transformations.filters;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.FCM.RuleApplication;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
/**
* Filter the rule application stereotype. The rule application stereotype is not
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
* can contain interceptors which typically reference elements from package templates.
* These elements should not should be copied into the target model.
*/
-public class FilterRuleApplication implements CopyListener {
+public class FilterRuleApplication implements PreCopyListener {
public static FilterRuleApplication getInstance() {
if(instance == null) {
@@ -34,7 +34,7 @@ public class FilterRuleApplication implements CopyListener {
return instance;
}
- public EObject copyEObject(Copy copy, EObject sourceEObj) {
+ public EObject preCopyEObject(LazyCopier copy, EObject sourceEObj) {
if(sourceEObj instanceof RuleApplication) {
return null;
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterSignatures.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterSignatures.java
index 277d449f83c..18589ec2659 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterSignatures.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterSignatures.java
@@ -15,8 +15,8 @@
package org.eclipse.papyrus.qompass.designer.core.transformations.filters;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.uml2.uml.TemplateSignature;
@@ -27,7 +27,7 @@ import org.eclipse.uml2.uml.TemplateSignature;
* @author ansgar
*
*/
-public class FilterSignatures implements CopyListener {
+public class FilterSignatures implements PreCopyListener {
public static FilterSignatures getInstance() {
if(instance == null) {
@@ -36,7 +36,7 @@ public class FilterSignatures implements CopyListener {
return instance;
}
- public EObject copyEObject(Copy copy, EObject sourceEObj) {
+ public EObject preCopyEObject(LazyCopier copy, EObject sourceEObj) {
if(sourceEObj instanceof TemplateSignature) {
if(copy.withinTemplate(sourceEObj)) {
return null;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java
index 1dd7b5ce874..88c7b1257b6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java
@@ -17,8 +17,8 @@ package org.eclipse.papyrus.qompass.designer.core.transformations.filters;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.papyrus.qompass.designer.core.StUtils;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Element;
@@ -29,7 +29,7 @@ import org.eclipse.uml2.uml.StateMachine;
import org.eclipse.uml2.uml.Transition;
-public class FilterStateMachines implements CopyListener {
+public class FilterStateMachines implements PreCopyListener {
public static FilterStateMachines getInstance() {
if(instance == null) {
@@ -38,7 +38,7 @@ public class FilterStateMachines implements CopyListener {
return instance;
}
- public EObject copyEObject(Copy copy, EObject sourceEObj) {
+ public EObject preCopyEObject(LazyCopier copy, EObject sourceEObj) {
if(sourceEObj instanceof StateMachine) {
StateMachine sm = (StateMachine)sourceEObj;
Class tmClass = getTargetClass(copy, sm);
@@ -62,7 +62,7 @@ public class FilterStateMachines implements CopyListener {
return sourceEObj;
}
- public Class getTargetClass(Copy copy, StateMachine sm) {
+ public Class getTargetClass(LazyCopier copy, StateMachine sm) {
Element smOwner = sm.getOwner();
EObject tmOwner = copy.getMap(smOwner).get(smOwner);
if(tmOwner instanceof Class) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterTemplate.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterTemplate.java
index f1784d9e26b..1647d7103b4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterTemplate.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterTemplate.java
@@ -17,9 +17,9 @@ package org.eclipse.papyrus.qompass.designer.core.transformations.filters;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.FCM.Connector;
import org.eclipse.papyrus.FCM.InteractionComponent;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Element;
@@ -40,7 +40,7 @@ import org.eclipse.uml2.uml.Element;
* @author ansgar
*
*/
-public class FilterTemplate implements CopyListener {
+public class FilterTemplate implements PreCopyListener {
public FilterTemplate() {
active = true;
@@ -53,7 +53,7 @@ public class FilterTemplate implements CopyListener {
return instance;
}
- public EObject copyEObject(Copy copy, EObject sourceEObj) {
+ public EObject preCopyEObject(LazyCopier copy, EObject sourceEObj) {
if(active && (sourceEObj instanceof Element)) {
Element sourceElem = (Element)sourceEObj;
if((sourceEObj instanceof Connector) && StereotypeUtil.isApplied(sourceElem, Connector.class)) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java
index 02a492bb162..72deac65511 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java
@@ -16,9 +16,9 @@ package org.eclipse.papyrus.qompass.designer.core.transformations.filters;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.qompass.designer.core.Utils;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PostCopyListener;
import org.eclipse.papyrus.qompass.designer.core.sync.CompImplSync;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Class;
@@ -28,7 +28,7 @@ import org.eclipse.uml2.uml.Class;
* (e.g. derived push interface with formal parameter T would be at wrong location).
* TODO: need better explanation. Solution is quite a hack.
*/
-public class FixTemplateSync implements CopyListener {
+public class FixTemplateSync implements PostCopyListener {
public static FixTemplateSync getInstance() {
if(instance == null) {
@@ -37,7 +37,7 @@ public class FixTemplateSync implements CopyListener {
return instance;
}
- public EObject copyEObject(Copy copy, EObject targetEObj) {
+ public void postCopyEObject(LazyCopier copy, EObject targetEObj) {
// if (copy.get(sourceEObj) isWithinTemplate)
if (!(targetEObj instanceof Behavior)) {
if((targetEObj instanceof Class) && Utils.isCompImpl((Class)targetEObj)) {
@@ -49,7 +49,6 @@ public class FixTemplateSync implements CopyListener {
// CompImplSync.syncDerivedOperations(implementation);
}
}
- return targetEObj;
}
private static FixTemplateSync instance = null;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/C_CppLanguageSupport.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/C_CppLanguageSupport.java
index c7eece26568..544cc7819b3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/C_CppLanguageSupport.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/src/org/eclipse/papyrus/qompass/designer/cpp/C_CppLanguageSupport.java
@@ -98,6 +98,11 @@ public class C_CppLanguageSupport implements ILangSupport {
public void setProject(IProject project) {
m_project = project;
}
+
+ @Override
+ public IProject getProject() {
+ return m_project;
+ }
public void setSettings(InstanceSpecification node) throws TransformationException
{
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java
index 7d7f0c4b67e..08c96c1963b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/InstantiateDepPlanHandler.java
@@ -31,7 +31,9 @@ import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* handler for instantiating a deployment plan
@@ -60,7 +62,7 @@ public class InstantiateDepPlanHandler extends CmdHandler {
// only one model is selected
selectedCDP = null;
if((selectedEObject instanceof Package) || (selectedEObject instanceof Class)) {
- selectedCDP = (Element)selectedEObject;
+ selectedCDP = (NamedElement) selectedEObject;
} else {
return null;
}
@@ -76,8 +78,12 @@ public class InstantiateDepPlanHandler extends CmdHandler {
@Override
protected IStatus run(IProgressMonitor monitor) {
// execute the task ...
- InstantiateDepPlan.instantiate(selectedCDP, monitor, project, genOptions);
- monitor.done();
+ if (selectedCDP instanceof Package) {
+ new InstantiateDepPlan().instantiate((Package)selectedCDP, monitor, project, genOptions);
+ } else if (StereotypeUtil.isApplied(selectedCDP, Configuration.class)) {
+ Configuration configuration = UMLUtil.getStereotypeApplication(selectedCDP, Configuration.class);
+ new InstantiateDepPlan().instantiate(configuration, monitor, project, genOptions);
+ }
return Status.OK_STATUS;
}
};
@@ -88,7 +94,7 @@ public class InstantiateDepPlanHandler extends CmdHandler {
return null;
}
- private Element selectedCDP;
+ private NamedElement selectedCDP;
private IProject project;
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.cpp b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.cpp
new file mode 100644
index 00000000000..3438bbb0d30
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.cpp
@@ -0,0 +1,33 @@
+// --------------------------------------------------------
+// Code generated by Papyrus C++
+// --------------------------------------------------------
+
+#define HelloWorld_components_HelloWorld_BODY
+
+/************************************************************
+ HelloWorld class body
+ ************************************************************/
+
+// include associated header file
+#include <HelloWorld/components/HelloWorld.h>
+
+// Derived includes directives
+#include <sysinterfaces/IStart.h>
+
+namespace components {
+
+// static attributes (if any)
+
+/**
+ *
+ *
+ */
+void HelloWorld::run() {
+ cout << "Hello world: " << message << endl;
+}
+
+} // of namespace components
+
+/************************************************************
+ End of HelloWorld class body
+ ************************************************************/ \ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.h b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.h
new file mode 100644
index 00000000000..de7e6e07050
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/components/HelloWorld.h
@@ -0,0 +1,58 @@
+// --------------------------------------------------------
+// Code generated by Papyrus C++
+// --------------------------------------------------------
+
+#ifndef HELLOWORLD_COMPONENTS_HELLOWORLD_H
+#define HELLOWORLD_COMPONENTS_HELLOWORLD_H
+
+/************************************************************
+ HelloWorld class header
+ ************************************************************/
+
+/* Owner package header include */
+#include <HelloWorld/components/Pkg_components.h>
+
+/* Owner package header include */
+#include <PrimitiveTypes/Pkg_PrimitiveTypes.h>
+
+#include <sysinterfaces/IStart.h>
+
+#include <core/StdPorts/Cstart.h>
+
+namespace components {
+
+/************************************************************/
+/**
+ * Configuration attribute within the Hello World component. Its value is configured on the instance level.
+ */
+
+class HelloWorld: public ::StdPorts::Cstart, public IStart {
+
+public:
+
+ /**
+ *
+ */
+ String message;
+
+ /**
+ *
+ *
+ */
+ void run();
+
+};
+/************************************************************/
+/* External declarations (package visibility) */
+
+/************************************************************/
+
+/* Inline functions */
+
+} // of namespace components
+
+/************************************************************
+ End of HelloWorld class header
+ ************************************************************/
+
+#endif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.cpp b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.cpp
new file mode 100644
index 00000000000..487d89a2cde
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.cpp
@@ -0,0 +1,24 @@
+// --------------------------------------------------------
+// Code generated by Papyrus C++
+// --------------------------------------------------------
+
+#define HelloWorld_platform_MonoNode_BODY
+
+/************************************************************
+ MonoNode class body
+ ************************************************************/
+
+// include associated header file
+#include <HelloWorld/platform/MonoNode.h>
+
+// Derived includes directives
+
+namespace platform {
+
+// static attributes (if any)
+
+}// of namespace platform
+
+/************************************************************
+ End of MonoNode class body
+ ************************************************************/ \ No newline at end of file
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.h b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.h
new file mode 100644
index 00000000000..11ec7186c39
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/HelloWorld/platform/MonoNode.h
@@ -0,0 +1,38 @@
+// --------------------------------------------------------
+// Code generated by Papyrus C++
+// --------------------------------------------------------
+
+#ifndef HELLOWORLD_PLATFORM_MONONODE_H
+#define HELLOWORLD_PLATFORM_MONONODE_H
+
+/************************************************************
+ MonoNode class header
+ ************************************************************/
+
+/* Owner package header include */
+#include <HelloWorld/platform/Pkg_platform.h>
+
+namespace platform {
+
+/************************************************************/
+/**
+ *
+ */
+
+class MonoNode {
+
+};
+/************************************************************/
+/* External declarations (package visibility) */
+
+/************************************************************/
+
+/* Inline functions */
+
+} // of namespace platform
+
+/************************************************************
+ End of MonoNode class header
+ ************************************************************/
+
+#endif
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
index 3d00cb37202..f9f44be146c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.uml2.uml;bundle-version="4.0.0",
org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
- org.eclipse.core.resources
+ org.eclipse.core.resources,
+ org.eclipse.papyrus.cpp.profile;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di
index 477408e4c6d..0469e9bbff3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di
@@ -49,36 +49,6 @@
<windows xmi:id="_pKTSlNYFEd-CgJIavLpOxQ">
<children xsi:type="di:TabFolder" xmi:id="_pKTSldYFEd-CgJIavLpOxQ">
<children>
- <emfPageIdentifier href="core.notation#_glyeMK8qEeCXIcykFPsB8Q"/>
- </children>
- <children>
- <emfPageIdentifier href="core.notation#_DtdykK8rEeCXIcykFPsB8Q"/>
- </children>
- <children>
- <emfPageIdentifier href="core.notation#_PIvc4LabEeCj_-LEBuGpmA"/>
- </children>
- <children>
- <emfPageIdentifier href="core.notation#_0IaT8LnYEeCxXoyQxQ47PQ"/>
- </children>
- <children>
- <emfPageIdentifier href="core.notation#_SstwYPEnEeCIafpoJVk7CQ"/>
- </children>
- <children>
- <emfPageIdentifier href="core.notation#_g6Yg0CnOEeGxrprK9wB9iA"/>
- </children>
- <children>
- <emfPageIdentifier href="core.notation#_OhgzgD8AEeGJ6KSvhYhYuQ"/>
- </children>
- <children>
- <emfPageIdentifier href="core.notation#_cVCGYPNUEeCovO8AYZymZQ"/>
- </children>
- <children>
- <emfPageIdentifier href="core.notation#_hyLz8PNGEeCovO8AYZymZQ"/>
- </children>
- <children>
- <emfPageIdentifier href="core.notation#_DfG8kF7qEeGEmrrwB1vhPg"/>
- </children>
- <children>
<emfPageIdentifier href="core.notation#_FYAkIG4sEd-0rs2VEGIwsA"/>
</children>
<children>
@@ -88,6 +58,9 @@
<emfPageIdentifier href="core.notation#_A6ULINYGEd-CgJIavLpOxQ"/>
</children>
<children>
+ <emfPageIdentifier href="core.notation#_g6Yg0CnOEeGxrprK9wB9iA"/>
+ </children>
+ <children>
<emfPageIdentifier href="core.notation#_zCsUsHI3EeOCrdvV8oxOKA"/>
</children>
</children>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation
index 535d9d22a88..ccf01734912 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:SW_Concurrency="http://www.eclipse.org/papyrus/SW_Concurrency/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/SW_Concurrency/1 http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Concurrency">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:SW_Concurrency="http://www.eclipse.org/papyrus/SW_Concurrency/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/SW_Concurrency/1 http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Concurrency">
<notation:Diagram xmi:id="_FYAkIG4sEd-0rs2VEGIwsA" type="CompositeStructure" name="Composite Async &amp; sync call hierarchy" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_FYAkIW4sEd-0rs2VEGIwsA" type="2073" fontName="Sans Serif" fontHeight="10" lineColor="0">
<children xmi:type="notation:DecorationNode" xmi:id="_FYAkIm4sEd-0rs2VEGIwsA" type="5156"/>
@@ -3742,8 +3742,8 @@
<styles xmi:type="notation:FontStyle" xmi:id="_SZ63sSo0EeGxrprK9wB9iA" fontName="" fontHeight="10"/>
<element xmi:type="uml:Dependency" href="core.uml#_SXkHQCo0EeGxrprK9wB9iA"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SZ63sio0EeGxrprK9wB9iA" points="[19, -6, -74, 0]$[85, -6, -8, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sd71ACo0EeGxrprK9wB9iA" id="(0.963531669865643,0.32298136645962733)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sd71ASo0EeGxrprK9wB9iA" id="(0.16666666666666666,0.5084745762711864)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sd71ACo0EeGxrprK9wB9iA" id="(1.0,0.2670807453416149)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sd71ASo0EeGxrprK9wB9iA" id="(0.0,0.4909090909090909)"/>
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_OhgzgD8AEeGJ6KSvhYhYuQ" type="CompositeStructure" name="CallActivation" measurementUnit="Pixel">
@@ -4383,10 +4383,7 @@
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_zCsUsHI3EeOCrdvV8oxOKA" type="PapyrusUMLClassDiagram" name="Binding helpers" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_z30l4HI3EeOCrdvV8oxOKA" type="2008" fontName="" gradient="16777215, -1, 0" lineColor="0">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z33CIHI3EeOCrdvV8oxOKA" source="ShadowFigure">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z33CIXI3EeOCrdvV8oxOKA" key="ShadowFigure_Value" value="true"/>
- </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_z30l4HI3EeOCrdvV8oxOKA" type="2008" fontName="" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z33CInI3EeOCrdvV8oxOKA" source="displayNameLabelIcon">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z33CI3I3EeOCrdvV8oxOKA" key="displayNameLabelIcon_value" value="false"/>
</eAnnotations>
@@ -4403,6 +4400,9 @@
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Bp0jUHkhEeOCpqruXGWNPw" source="PapyrusCSSForceValue">
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Bp0jUXkhEeOCpqruXGWNPw" key="gradient" value="true"/>
</eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_F6iPQLnHEeO_6d9PgxHkpw" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_F6i2ULnHEeO_6d9PgxHkpw" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_z33pMXI3EeOCrdvV8oxOKA" type="5029"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_z33pMnI3EeOCrdvV8oxOKA" visible="false" type="7017">
<styles xmi:type="notation:TitleStyle" xmi:id="_z33pM3I3EeOCrdvV8oxOKA"/>
@@ -4427,7 +4427,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_z4FronI3EeOCrdvV8oxOKA"/>
</children>
<element xmi:type="uml:Class" href="core.uml#_z2tyoHI3EeOCrdvV8oxOKA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z30l4XI3EeOCrdvV8oxOKA" x="64" y="17" width="135"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z30l4XI3EeOCrdvV8oxOKA" x="60" y="20" width="181" height="61"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_4ICEAHkgEeOCpqruXGWNPw" type="2008">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7qs5gHkgEeOCpqruXGWNPw" source="Stereotype_Annotation">
@@ -4466,7 +4466,37 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ID5PnkgEeOCpqruXGWNPw"/>
</children>
<element xmi:type="uml:Class" href="core.uml#_4H-ZoHkgEeOCpqruXGWNPw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ICrEHkgEeOCpqruXGWNPw" x="248" y="19" width="162" height="95"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ICrEHkgEeOCpqruXGWNPw" x="60" y="100" width="181" height="61"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_g9VpkLsMEeO0n5elMxN1LQ" type="2008">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pJ_h8LsMEeO0n5elMxN1LQ" source="Stereotype_Annotation">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pKAJALsMEeO0n5elMxN1LQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pKAJAbsMEeO0n5elMxN1LQ" key="StereotypeList" value="FCM::BindingHelper"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pKAJArsMEeO0n5elMxN1LQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pKAwELsMEeO0n5elMxN1LQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pKAwEbsMEeO0n5elMxN1LQ" key="StereotypePropertyLocation" value="Compartment"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_g9WQoLsMEeO0n5elMxN1LQ" type="5029"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_g9WQobsMEeO0n5elMxN1LQ" visible="false" type="7017">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_g9WQorsMEeO0n5elMxN1LQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_g9WQo7sMEeO0n5elMxN1LQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_g9WQpLsMEeO0n5elMxN1LQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g9WQpbsMEeO0n5elMxN1LQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_g9W3sLsMEeO0n5elMxN1LQ" visible="false" type="7018">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_g9W3sbsMEeO0n5elMxN1LQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_g9W3srsMEeO0n5elMxN1LQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_g9W3s7sMEeO0n5elMxN1LQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g9W3tLsMEeO0n5elMxN1LQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_g9W3tbsMEeO0n5elMxN1LQ" visible="false" type="7019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_g9W3trsMEeO0n5elMxN1LQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_g9W3t7sMEeO0n5elMxN1LQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_g9W3uLsMEeO0n5elMxN1LQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g9W3ubsMEeO0n5elMxN1LQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="core.uml#_g8oe8LsMEeO0n5elMxN1LQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g9VpkbsMEeO0n5elMxN1LQ" x="60" y="180" width="181" height="61"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_zCs7wHI3EeOCrdvV8oxOKA"/>
<element xmi:type="uml:Package" href="core.uml#_tkiC4HI3EeOCrdvV8oxOKA"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml
index 5931e6cc4c9..49391c6e196 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:SW_Concurrency="http://www.eclipse.org/papyrus/SW_Concurrency/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/SW_Concurrency/1 http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Concurrency">
<uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="core" viewpoint="">
- <packageImport xmi:id="_O6TiITLUEd26WNosUASSSw">
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_O6TiITLUEd26WNosUASSSw">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
- <packageImport xmi:id="_clzbsC3xEd6OqY3qskOtLQ">
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_clzbsC3xEd6OqY3qskOtLQ">
<importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/sysinterfaces.uml#_RodVAAweEd6it_RkGhz_AA"/>
</packageImport>
- <packageImport xmi:id="_hWGaIF9CEd6vU6EJjexEKQ">
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_hWGaIF9CEd6vU6EJjexEKQ">
<importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/>
</packageImport>
- <packageImport xmi:id="_K9IBUP-FEd6628OhKk_dpg">
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_K9IBUP-FEd6628OhKk_dpg">
<importedPackage xmi:type="uml:Model" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_DV8nkBv8EduZN5aJJITI5w"/>
</packageImport>
- <packageImport xmi:id="_mXnzUPQdEeCIC-7tA9lfzA">
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_mXnzUPQdEeCIC-7tA9lfzA">
<importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/osal.uml#_ROTQYC-OEdySSa8YESkO2w"/>
</packageImport>
<packagedElement xmi:type="uml:Package" xmi:id="_TFq8cOy6Ed2UrumbR9YAVg" name="composites">
<packagedElement xmi:type="uml:Class" xmi:id="_WK3LwOy6Ed2UrumbR9YAVg" name="Composite">
- <ownedComment xmi:id="_IiLnAMFjEd-Mveea1W_olA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_IiLnAMFjEd-Mveea1W_olA">
<body>currently unused, not sure whether really needed</body>
</ownedComment>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_2JtG8Oy6Ed2UrumbR9YAVg" name="b:createConnections" visibility="package" specification="_wlXUoOy6Ed2UrumbR9YAVg">
@@ -51,14 +51,14 @@ m_[part.name/] = [part.name/]
[/for]
[/template]</body>
</ownedBehavior>
- <ownedOperation xmi:id="_wlXUoOy6Ed2UrumbR9YAVg" name="createConnections" method="_2JtG8Oy6Ed2UrumbR9YAVg"/>
- <ownedOperation xmi:id="_BTEWIOy9Ed2UrumbR9YAVg" name="setup" method="_D83p8Oy9Ed2UrumbR9YAVg"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_wlXUoOy6Ed2UrumbR9YAVg" name="createConnections" method="_2JtG8Oy6Ed2UrumbR9YAVg"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_BTEWIOy9Ed2UrumbR9YAVg" name="setup" method="_D83p8Oy9Ed2UrumbR9YAVg"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_1RehUAGpEd6eR-dxi5su4Q" name="BootLoader">
- <ownedComment xmi:id="_JMwYwMGJEd-Mveea1W_olA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_JMwYwMGJEd-Mveea1W_olA">
<body>A template for the bootloader generation.</body>
</ownedComment>
- <ownedComment xmi:id="_JM4UkMGJEd-Mveea1W_olA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_JM4UkMGJEd-Mveea1W_olA">
<body>This C++ implementation of the template contains principally the definition of the
&quot;main&quot; function and the declaration of the bootloader instance</body>
</ownedComment>
@@ -67,50 +67,50 @@ m_[part.name/] = [part.name/]
<body>&lt;%createInstances%></body>
</ownedBehavior>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_IbrFUAGqEd6eR-dxi5su4Q" name="b:main" specification="_6pkAUAGpEd6eR-dxi5su4Q"/>
- <ownedOperation xmi:id="_3kwykAGpEd6eR-dxi5su4Q" name="createInstances" method="_AFnZUAGqEd6eR-dxi5su4Q"/>
- <ownedOperation xmi:id="_6pkAUAGpEd6eR-dxi5su4Q" name="main" isStatic="true" method="_IbrFUAGqEd6eR-dxi5su4Q"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_3kwykAGpEd6eR-dxi5su4Q" name="createInstances" method="_AFnZUAGqEd6eR-dxi5su4Q"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_6pkAUAGpEd6eR-dxi5su4Q" name="main" isStatic="true" method="_IbrFUAGqEd6eR-dxi5su4Q"/>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_mMCK8PiPEd2UhpY2Y3WUyg" name="methodCall">
- <ownedComment xmi:id="_WiuBUK8rEeCXIcykFPsB8Q" annotatedElement="_mMCK8PiPEd2UhpY2Y3WUyg">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_WiuBUK8rEeCXIcykFPsB8Q" annotatedElement="_mMCK8PiPEd2UhpY2Y3WUyg">
<body>Main package template for all call based connectors. The formal parameter is the interface I (which is bound to the actual interface used in a call).
This package is virtually extended by other model libraries who import it.</body>
</ownedComment>
- <ownedComment xmi:id="__oxUADrVEeGMCcwsbpLuFA" annotatedElement="_j29X4NttEd2eM5kqcby5ZA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="__oxUADrVEeGMCcwsbpLuFA" annotatedElement="_j29X4NttEd2eM5kqcby5ZA">
<body>Inheritance hierarchy for (A)SyncCall component types. Separate types for required (rconn) and provided (fconn) ports enable re-use via inheritance ain multiple places (e.g. for AMI ports that use an unmodified provided port and different variants of a required port).
Note that ports on connector side are conjugated</body>
</ownedComment>
- <ownedTemplateSignature xmi:id="_V0b2APfBEd2TbIfwytOyPA" parameter="_WzWVUPfBEd2TbIfwytOyPA">
+ <ownedTemplateSignature xmi:type="uml:TemplateSignature" xmi:id="_V0b2APfBEd2TbIfwytOyPA" parameter="_WzWVUPfBEd2TbIfwytOyPA">
<ownedParameter xmi:type="uml:ClassifierTemplateParameter" xmi:id="_WzWVUPfBEd2TbIfwytOyPA" parameteredElement="_ZzlzMPfBEd2TbIfwytOyPA">
<ownedParameteredElement xmi:type="uml:Interface" xmi:id="_ZzlzMPfBEd2TbIfwytOyPA" name="I" templateParameter="_WzWVUPfBEd2TbIfwytOyPA"/>
</ownedParameter>
</ownedTemplateSignature>
<packagedElement xmi:type="uml:Package" xmi:id="_ZISNcIQzEd2_fLv04swWfw" name="AsyncCall">
<packagedElement xmi:type="uml:Class" xmi:id="_KxQBELuXEd2TTr3gJIvazw" name="AsyncCall" isAbstract="true">
- <generalization xmi:id="_0KzSsDBEEd6V16eboHV1gw" general="_j29X4NttEd2eM5kqcby5ZA"/>
- <generalization xmi:id="_1H2JwDBEEd6V16eboHV1gw" general="_mIpj8Ns8Ed2eM5kqcby5ZA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_0KzSsDBEEd6V16eboHV1gw" general="_j29X4NttEd2eM5kqcby5ZA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_1H2JwDBEEd6V16eboHV1gw" general="_mIpj8Ns8Ed2eM5kqcby5ZA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_Whe8EClYEd-eoo60eNyGlg" name="AsyncCall_impl">
- <ownedComment xmi:id="_sp9YYG5fEd-5CZIeuHpHAg">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_sp9YYG5fEd-5CZIeuHpHAg">
<body>Description: A simple implementation of asynchronous calls. It will execution requests by means of a single dispatcher thread</body>
</ownedComment>
- <ownedComment xmi:id="_HMz-ADJKEeCAhMtIsY9HwA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_HMz-ADJKEeCAhMtIsY9HwA">
<body>Simple asynchronous call implementation: returns immediately and executes request in new thread</body>
</ownedComment>
- <ownedComment xmi:id="_bustsDJKEeCAhMtIsY9HwA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_bustsDJKEeCAhMtIsY9HwA">
<body>Uses buffer and ASN marshalling.
TODO: configurable buffer size, use data structure (CppParameterStorage)</body>
</ownedComment>
- <generalization xmi:id="_lYOSkClzEd-eoo60eNyGlg" general="_KxQBELuXEd2TTr3gJIvazw"/>
- <ownedAttribute xmi:id="_1XeLIED5Ed-_DOja_sRgWA" name="buffer" isUnique="false" aggregation="composite">
+ <generalization xmi:type="uml:Generalization" xmi:id="_lYOSkClzEd-eoo60eNyGlg" general="_KxQBELuXEd2TTr3gJIvazw"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_1XeLIED5Ed-_DOja_sRgWA" name="buffer" isUnique="false" aggregation="composite">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8wC7MED5Ed-_DOja_sRgWA" value="500"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8wLeEED5Ed-_DOja_sRgWA" value="500"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_2fcqYED6Ed-_DOja_sRgWA" name="pBuffer" isUnique="false" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_2fcqYED6Ed-_DOja_sRgWA" name="pBuffer" isUnique="false" aggregation="composite">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
</ownedAttribute>
- <interfaceRealization xmi:id="_nBpugClzEd-eoo60eNyGlg" name="derived realization of I" client="_Whe8EClYEd-eoo60eNyGlg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_nBpugClzEd-eoo60eNyGlg" name="derived realization of I" client="_Whe8EClYEd-eoo60eNyGlg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_WhfjIilYEd-eoo60eNyGlg" name="[name/]" specification="_2bwsEClzEd-eoo60eNyGlg">
<language>C/C++</language>
<body>[import org::eclipse::papyrus::qompass::designer::core::acceleo::UMLTool/]
@@ -171,8 +171,8 @@ switch (operationID)
}
[/template]</body>
</ownedBehavior>
- <ownedOperation xmi:id="_WhfjJSlYEd-eoo60eNyGlg" name="staticDispatch" isStatic="true" method="_WhfjIylYEd-eoo60eNyGlg">
- <ownedParameter xmi:id="_WhfjJilYEd-eoo60eNyGlg" name="arg">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_WhfjJSlYEd-eoo60eNyGlg" name="staticDispatch" isStatic="true" method="_WhfjIylYEd-eoo60eNyGlg">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_WhfjJilYEd-eoo60eNyGlg" name="arg">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WhfjKClYEd-eoo60eNyGlg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WhfjJylYEd-eoo60eNyGlg" value="1"/>
@@ -180,28 +180,28 @@ switch (operationID)
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
- <ownedParameter xmi:id="_WhfjKilYEd-eoo60eNyGlg" name="ret" direction="return">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_WhfjKilYEd-eoo60eNyGlg" name="ret" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:id="_2bwsEClzEd-eoo60eNyGlg" name="[name/]" method="_WhfjIilYEd-eoo60eNyGlg"/>
- <ownedOperation xmi:id="_G6LzAD3QEd-Bk-AHd6yyoA" name="dispatch" method="_nV2DcED5Ed-_DOja_sRgWA"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_2bwsEClzEd-eoo60eNyGlg" name="[name/]" method="_WhfjIilYEd-eoo60eNyGlg"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_G6LzAD3QEd-Bk-AHd6yyoA" name="dispatch" method="_nV2DcED5Ed-_DOja_sRgWA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_pXzKcEJ1Ed-Ps4Bfh0j9LQ" name="AsyncCallPool_impl">
- <ownedComment xmi:id="_spsPMDJKEeCAhMtIsY9HwA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_spsPMDJKEeCAhMtIsY9HwA">
<body>(untested) implementation of an asynchronous invocation that uses a thread pool for
spawning new requests</body>
</ownedComment>
- <generalization xmi:id="_pXzKcUJ1Ed-Ps4Bfh0j9LQ" general="_KxQBELuXEd2TTr3gJIvazw"/>
- <ownedAttribute xmi:id="_pXzxgEJ1Ed-Ps4Bfh0j9LQ" name="buffer" isUnique="false" aggregation="composite">
+ <generalization xmi:type="uml:Generalization" xmi:id="_pXzKcUJ1Ed-Ps4Bfh0j9LQ" general="_KxQBELuXEd2TTr3gJIvazw"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_pXzxgEJ1Ed-Ps4Bfh0j9LQ" name="buffer" isUnique="false" aggregation="composite">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pXzxgkJ1Ed-Ps4Bfh0j9LQ" value="500"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pXzxgUJ1Ed-Ps4Bfh0j9LQ" value="500"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_pXzxg0J1Ed-Ps4Bfh0j9LQ" name="pBuffer" isUnique="false" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_pXzxg0J1Ed-Ps4Bfh0j9LQ" name="pBuffer" isUnique="false" aggregation="composite">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
</ownedAttribute>
- <interfaceRealization xmi:id="_pXzxh0J1Ed-Ps4Bfh0j9LQ" name="derived realization of I" client="_pXzKcEJ1Ed-Ps4Bfh0j9LQ" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_pXzxh0J1Ed-Ps4Bfh0j9LQ" name="derived realization of I" client="_pXzKcEJ1Ed-Ps4Bfh0j9LQ" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_pXzxhEJ1Ed-Ps4Bfh0j9LQ" name="[name/]" specification="_pXzxjkJ1Ed-Ps4Bfh0j9LQ">
<language>C/C++</language>
<body>[template marshall(operation: Operation)]
@@ -270,8 +270,8 @@ switch (operationID)
[/template]
</body>
</ownedBehavior>
- <ownedOperation xmi:id="_pXzxiEJ1Ed-Ps4Bfh0j9LQ" name="staticDispatch" isStatic="true" method="_pXzxhUJ1Ed-Ps4Bfh0j9LQ">
- <ownedParameter xmi:id="_pXzxiUJ1Ed-Ps4Bfh0j9LQ" name="arg">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_pXzxiEJ1Ed-Ps4Bfh0j9LQ" name="staticDispatch" isStatic="true" method="_pXzxhUJ1Ed-Ps4Bfh0j9LQ">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_pXzxiUJ1Ed-Ps4Bfh0j9LQ" name="arg">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pXzxi0J1Ed-Ps4Bfh0j9LQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pXzxikJ1Ed-Ps4Bfh0j9LQ" value="1"/>
@@ -279,34 +279,34 @@ switch (operationID)
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
- <ownedParameter xmi:id="_pXzxjUJ1Ed-Ps4Bfh0j9LQ" name="ret" direction="return">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_pXzxjUJ1Ed-Ps4Bfh0j9LQ" name="ret" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:id="_pXzxjkJ1Ed-Ps4Bfh0j9LQ" name="[name/]" method="_pXzxhEJ1Ed-Ps4Bfh0j9LQ"/>
- <ownedOperation xmi:id="_pXzxj0J1Ed-Ps4Bfh0j9LQ" name="dispatch" method="_pXzxhkJ1Ed-Ps4Bfh0j9LQ"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_pXzxjkJ1Ed-Ps4Bfh0j9LQ" name="[name/]" method="_pXzxhEJ1Ed-Ps4Bfh0j9LQ"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_pXzxj0J1Ed-Ps4Bfh0j9LQ" name="dispatch" method="_pXzxhkJ1Ed-Ps4Bfh0j9LQ"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_3itBkNdwEd-ZnqCk2P2ZKg" name="AMIPollCall_impl">
- <ownedComment xmi:id="_3itBkddwEd-ZnqCk2P2ZKg">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_3itBkddwEd-ZnqCk2P2ZKg">
<body>Description: A simple implementation of asynchronous calls. It will execution requests by means of a single dispatcher thread</body>
</ownedComment>
- <ownedComment xmi:id="_lEC3ADJLEeCAhMtIsY9HwA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_lEC3ADJLEeCAhMtIsY9HwA">
<body>Polling variant of corbas asynchronous messaging (AMI), enables asynchronous calls while reading
return values (also called deferred synchronous):
Instead of specified return values, functions return a poller object which may be queried for
the result.
TODO: complete, move into model of Qompass AMI plugin</body>
</ownedComment>
- <generalization xmi:id="_3itBktdwEd-ZnqCk2P2ZKg" general="_KxQBELuXEd2TTr3gJIvazw"/>
- <ownedAttribute xmi:id="_3itBk9dwEd-ZnqCk2P2ZKg" name="buffer" isUnique="false" aggregation="composite">
+ <generalization xmi:type="uml:Generalization" xmi:id="_3itBktdwEd-ZnqCk2P2ZKg" general="_KxQBELuXEd2TTr3gJIvazw"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_3itBk9dwEd-ZnqCk2P2ZKg" name="buffer" isUnique="false" aggregation="composite">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3itBlddwEd-ZnqCk2P2ZKg" value="500"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3itBlNdwEd-ZnqCk2P2ZKg" value="500"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_3itBltdwEd-ZnqCk2P2ZKg" name="pBuffer" isUnique="false" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_3itBltdwEd-ZnqCk2P2ZKg" name="pBuffer" isUnique="false" aggregation="composite">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
</ownedAttribute>
- <interfaceRealization xmi:id="_3itBmtdwEd-ZnqCk2P2ZKg" name="derived realization of I" client="_3itBkNdwEd-ZnqCk2P2ZKg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_3itBmtdwEd-ZnqCk2P2ZKg" name="derived realization of I" client="_3itBkNdwEd-ZnqCk2P2ZKg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_3itBl9dwEd-ZnqCk2P2ZKg" name="[name/]" specification="_3itBoddwEd-ZnqCk2P2ZKg">
<language>C/C++</language>
<body>[import org::eclipse::papyrus::qompass::designer::core::acceleo::UMLTool/]
@@ -396,8 +396,8 @@ switch (operationID)
[/template]
</body>
</ownedBehavior>
- <ownedOperation xmi:id="_3itBm9dwEd-ZnqCk2P2ZKg" name="staticDispatch" isStatic="true" method="_3itBmNdwEd-ZnqCk2P2ZKg">
- <ownedParameter xmi:id="_3itBnNdwEd-ZnqCk2P2ZKg" name="arg">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_3itBm9dwEd-ZnqCk2P2ZKg" name="staticDispatch" isStatic="true" method="_3itBmNdwEd-ZnqCk2P2ZKg">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_3itBnNdwEd-ZnqCk2P2ZKg" name="arg">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3itBntdwEd-ZnqCk2P2ZKg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3itBnddwEd-ZnqCk2P2ZKg" value="1"/>
@@ -405,16 +405,16 @@ switch (operationID)
<value xsi:nil="true"/>
</defaultValue>
</ownedParameter>
- <ownedParameter xmi:id="_3itBoNdwEd-ZnqCk2P2ZKg" name="ret" direction="return">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_3itBoNdwEd-ZnqCk2P2ZKg" name="ret" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:id="_3itBoddwEd-ZnqCk2P2ZKg" name="[name/]" method="_3itBl9dwEd-ZnqCk2P2ZKg"/>
- <ownedOperation xmi:id="_3itBotdwEd-ZnqCk2P2ZKg" name="dispatch" method="_3itBmddwEd-ZnqCk2P2ZKg"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_3itBoddwEd-ZnqCk2P2ZKg" name="[name/]" method="_3itBl9dwEd-ZnqCk2P2ZKg"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_3itBotdwEd-ZnqCk2P2ZKg" name="dispatch" method="_3itBmddwEd-ZnqCk2P2ZKg"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_Mo2kwF7pEeGEmrrwB1vhPg" name="CallMultiplier_impl">
- <generalization xmi:id="_eJqowF7sEeGEmrrwB1vhPg" general="_TLShkF7qEeGEmrrwB1vhPg"/>
- <interfaceRealization xmi:id="_8e_ocF7sEeGEmrrwB1vhPg" name="derived realization of I" client="_Mo2kwF7pEeGEmrrwB1vhPg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_eJqowF7sEeGEmrrwB1vhPg" general="_TLShkF7qEeGEmrrwB1vhPg"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_8e_ocF7sEeGEmrrwB1vhPg" name="derived realization of I" client="_Mo2kwF7pEeGEmrrwB1vhPg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_DmUQcF7tEeGEmrrwB1vhPg" name="operation1" specification="_ChD4kF7tEeGEmrrwB1vhPg">
<language>C/C++</language>
<body>[import org::eclipse::papyrus::qompass::designer::core::acceleo::UMLTool/]
@@ -428,15 +428,15 @@ for (int i=0; i&lt;9; i++) {
}
[/template]</body>
</ownedBehavior>
- <ownedOperation xmi:id="_ChD4kF7tEeGEmrrwB1vhPg" name="[name/]" method="_DmUQcF7tEeGEmrrwB1vhPg"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_ChD4kF7tEeGEmrrwB1vhPg" name="[name/]" method="_DmUQcF7tEeGEmrrwB1vhPg"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_TLShkF7qEeGEmrrwB1vhPg" name="AsyncCallM" isAbstract="true">
- <generalization xmi:id="_WhUpQF7qEeGEmrrwB1vhPg" general="_0KYOQF7pEeGEmrrwB1vhPg"/>
- <generalization xmi:id="_XgUoIF7qEeGEmrrwB1vhPg" general="_j29X4NttEd2eM5kqcby5ZA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_WhUpQF7qEeGEmrrwB1vhPg" general="_0KYOQF7pEeGEmrrwB1vhPg"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_XgUoIF7qEeGEmrrwB1vhPg" general="_j29X4NttEd2eM5kqcby5ZA"/>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_2oxDIPiPEd2UhpY2Y3WUyg" name="OperationIDs">
- <ownedLiteral xmi:id="_KOvHsPiREd2UhpY2Y3WUyg" name="ID_[name/]"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_KOvHsPiREd2UhpY2Y3WUyg" name="ID_[name/]"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_j29X4NttEd2eM5kqcby5ZA" name="OPC_useI" isAbstract="true">
<ownedAttribute xmi:type="uml:Port" xmi:id="_P4xVsNtuEd2eM5kqcby5ZA" name="fconn" type="_ZzlzMPfBEd2TbIfwytOyPA" aggregation="composite" isConjugated="true"/>
@@ -451,13 +451,13 @@ for (int i=0; i&lt;9; i++) {
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_gKMTIAytEd6it_RkGhz_AA" name="marshalling">
- <ownedComment xmi:id="_9gpvcENxEeGoAtSeIK7WLg">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_9gpvcENxEeGoAtSeIK7WLg">
<body>Needs completion:
good(?) write buffer event?
Call operations of buffer component?
[could have done in an identical way for EventPool]</body>
</ownedComment>
- <ownedComment xmi:id="_pk4cMEN_EeGfhclnRyNzoA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_pk4cMEN_EeGfhclnRyNzoA">
<body>Marshalling is done at two levels:
(1) In case of a shared address space, only a callEvent is created. It can be passed between threads within a process.
(2) For remote communication, marshalling into a buffer is done.</body>
@@ -494,7 +494,7 @@ Call operations of buffer component?
</ownedBehavior>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="__uJRYPNGEeCovO8AYZymZQ" name="StructBased">
- <generalization xmi:id="_EWShMPNHEeCovO8AYZymZQ" general="_b_yh4AzyEd6it_RkGhz_AA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_EWShMPNHEeCovO8AYZymZQ" general="_b_yh4AzyEd6it_RkGhz_AA"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_qRJc8PNJEeCovO8AYZymZQ" name="[name/]" specification="_aGt1sPNJEeCovO8AYZymZQ">
<language>C/C++</language>
<body>[template marshallStruct(operation : Operation)]
@@ -512,10 +512,10 @@ ParamData * data = &amp;event.params;
[/for]
out->dispatch(event);</body>
</ownedBehavior>
- <ownedOperation xmi:id="_aGt1sPNJEeCovO8AYZymZQ" name="[name/]" method="_qRJc8PNJEeCovO8AYZymZQ"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_aGt1sPNJEeCovO8AYZymZQ" name="[name/]" method="_qRJc8PNJEeCovO8AYZymZQ"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_u7MmIENqEeGoAtSeIK7WLg" name="ToCallEvent">
- <generalization xmi:id="_K088oF_rEd6RvK-1A151zQ" general="_j29X4NttEd2eM5kqcby5ZA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_K088oF_rEd6RvK-1A151zQ" general="_j29X4NttEd2eM5kqcby5ZA"/>
<ownedAttribute xmi:type="uml:Port" xmi:id="_-nk_cENqEeGoAtSeIK7WLg" name="out" visibility="public" type="_WkkjoPNUEeCovO8AYZymZQ" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AdVAIENrEeGoAtSeIK7WLg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AdW1UENrEeGoAtSeIK7WLg" value="1"/>
@@ -525,14 +525,14 @@ out->dispatch(event);</body>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_1xGG8ENqEeGoAtSeIK7WLg" name="FromCallEventWP">
- <generalization xmi:id="_M09FgF_rEd6RvK-1A151zQ" general="_mIpj8Ns8Ed2eM5kqcby5ZA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_M09FgF_rEd6RvK-1A151zQ" general="_mIpj8Ns8Ed2eM5kqcby5ZA"/>
<ownedAttribute xmi:type="uml:Port" xmi:id="_9gIc8ENvEeGoAtSeIK7WLg" name="in" visibility="public" type="_WkkjoPNUEeCovO8AYZymZQ" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9uDkMENvEeGoAtSeIK7WLg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9uEyUENvEeGoAtSeIK7WLg" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_H7IOcENrEeGoAtSeIK7WLg" name="ToCallEventWP">
- <generalization xmi:id="_KHmGAENrEeGoAtSeIK7WLg" general="_j29X4NttEd2eM5kqcby5ZA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_KHmGAENrEeGoAtSeIK7WLg" general="_j29X4NttEd2eM5kqcby5ZA"/>
<ownedAttribute xmi:type="uml:Port" xmi:id="_i5SOQEN8EeGfhclnRyNzoA" name="out" visibility="public" type="_WkkjoPNUEeCovO8AYZymZQ" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jRB_4EN8EeGfhclnRyNzoA" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jRtVUEN8EeGfhclnRyNzoA" value="1"/>
@@ -541,21 +541,21 @@ out->dispatch(event);</body>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_RjvvcA1jEd6tvthBDl600Q" name="SyncCall">
<packagedElement xmi:type="uml:Class" xmi:id="_Zx2ZUA1jEd6tvthBDl600Q" name="SyncCall" isAbstract="true">
- <generalization xmi:id="_STdvYDBFEd6V16eboHV1gw" general="_j29X4NttEd2eM5kqcby5ZA"/>
- <generalization xmi:id="_T1zr4DBFEd6V16eboHV1gw" general="_mIpj8Ns8Ed2eM5kqcby5ZA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_STdvYDBFEd6V16eboHV1gw" general="_j29X4NttEd2eM5kqcby5ZA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_T1zr4DBFEd6V16eboHV1gw" general="_mIpj8Ns8Ed2eM5kqcby5ZA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_jOU60A1jEd6tvthBDl600Q" name="DirectCall_impl">
- <ownedComment xmi:id="_MgKU8G5gEd-5CZIeuHpHAg">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_MgKU8G5gEd-5CZIeuHpHAg">
<body>Description: This connector is a kind of dummy connector, since it only passes incoming requests to its caller port</body>
</ownedComment>
- <ownedComment xmi:id="_0fC3UDJJEeCAhMtIsY9HwA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_0fC3UDJJEeCAhMtIsY9HwA">
<body>Minimal connector implementation that does nothing (but passing requests)</body>
</ownedComment>
- <ownedComment xmi:id="_0fOdgDJJEeCAhMtIsY9HwA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_0fOdgDJJEeCAhMtIsY9HwA">
<body></body>
</ownedComment>
- <generalization xmi:id="_lm4GkA1jEd6tvthBDl600Q" general="_Zx2ZUA1jEd6tvthBDl600Q"/>
- <interfaceRealization xmi:id="_1tfFAJyCEd6WR4pSVO_UYw" name="derived realization of I" client="_jOU60A1jEd6tvthBDl600Q" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_lm4GkA1jEd6tvthBDl600Q" general="_Zx2ZUA1jEd6tvthBDl600Q"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_1tfFAJyCEd6WR4pSVO_UYw" name="derived realization of I" client="_jOU60A1jEd6tvthBDl600Q" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_GSdesJ09Ed6l5bTPBsl00Q" name="[name/]" specification="__y0hwJ08Ed6l5bTPBsl00Q">
<language>C/C++</language>
<body>[import org::eclipse::papyrus::qompass::designer::core::acceleo::utils_cpp/]
@@ -567,48 +567,48 @@ out->dispatch(event);</body>
// put post-interceptors here
[/template]</body>
</ownedBehavior>
- <ownedOperation xmi:id="__y0hwJ08Ed6l5bTPBsl00Q" name="[name/]" method="_GSdesJ09Ed6l5bTPBsl00Q"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="__y0hwJ08Ed6l5bTPBsl00Q" name="[name/]" method="_GSdesJ09Ed6l5bTPBsl00Q"/>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_UAIU0K-iEd6DndT7kDY1-A" name="AdaptiveContainerServices">
<packagedElement xmi:type="uml:Class" xmi:id="_cxVEsK-iEd6DndT7kDY1-A" name="SampleInterceptor">
- <generalization xmi:id="_lrS8oAQxEd--t-uhRn9OBA" general="_Zx2ZUA1jEd6tvthBDl600Q"/>
- <interfaceRealization xmi:id="_v-oAAK-iEd6DndT7kDY1-A" name="derived realization of I" client="_cxVEsK-iEd6DndT7kDY1-A" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_lrS8oAQxEd--t-uhRn9OBA" general="_Zx2ZUA1jEd6tvthBDl600Q"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_v-oAAK-iEd6DndT7kDY1-A" name="derived realization of I" client="_cxVEsK-iEd6DndT7kDY1-A" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_GTvA0K-jEd6DndT7kDY1-A" name="[name/]" specification="_16jy8K-iEd6DndT7kDY1-A">
<language>C/C++</language>
<body>cout &lt;&lt; &quot;this is a sample pre-call interception&quot; &lt;&lt; endl;
rconn->&lt;%cppCall%>;
cout &lt;&lt; &quot;this is a sample post-call interception&quot; &lt;&lt; endl;</body>
</ownedBehavior>
- <ownedOperation xmi:id="_16jy8K-iEd6DndT7kDY1-A" name="[name/]" method="_GTvA0K-jEd6DndT7kDY1-A"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_16jy8K-iEd6DndT7kDY1-A" name="[name/]" method="_GTvA0K-jEd6DndT7kDY1-A"/>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_aQ7goChYEd-eoo60eNyGlg" name="CallActivation">
- <ownedComment xmi:id="_aAH58D8CEeGJ6KSvhYhYuQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_aAH58D8CEeGJ6KSvhYhYuQ">
<body>A set of Leader followers is instantiated. Each has its own thread and a semaphore. The LF instance waits on its semaphore. When selectLeader is called, a follower is signaled (semaphore is posted) and will become leader. The leader waits for a resource (e.g. a socket) and becomes executor.
</body>
</ownedComment>
<packagedElement xmi:type="uml:Class" xmi:id="_e6Y_EChYEd-eoo60eNyGlg" name="Activator">
- <generalization xmi:id="_oJX3IChYEd-eoo60eNyGlg" general="_KxQBELuXEd2TTr3gJIvazw"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_oJX3IChYEd-eoo60eNyGlg" general="_KxQBELuXEd2TTr3gJIvazw"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_qgzokChYEd-eoo60eNyGlg" name="LeaderFollower">
- <generalization xmi:id="_sW6OkChYEd-eoo60eNyGlg" general="_e6Y_EChYEd-eoo60eNyGlg"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_sW6OkChYEd-eoo60eNyGlg" general="_e6Y_EChYEd-eoo60eNyGlg"/>
<ownedAttribute xmi:type="uml:Port" xmi:id="_N0tB4Cu4Ed-uZPFNCty7PQ" name="listener" type="_fxfe8Cu1Ed-uZPFNCty7PQ" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UxKdsCu4Ed-uZPFNCty7PQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UxM58Cu4Ed-uZPFNCty7PQ" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="__fLb4Cu5Ed-uZPFNCty7PQ" name="state" type="_F3CIECu1Ed-uZPFNCty7PQ" isUnique="false" aggregation="composite"/>
- <ownedAttribute xmi:id="_M4VG8Cu9Ed-uZPFNCty7PQ" name="m_sema" type="_fxfe8Cu1Ed-uZPFNCty7PQ" isUnique="false" aggregation="composite"/>
- <ownedAttribute xmi:id="_rmwGoCu-Ed-uZPFNCty7PQ" name="m_sr" isStatic="true" type="_qgzokChYEd-eoo60eNyGlg" isUnique="false" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="__fLb4Cu5Ed-uZPFNCty7PQ" name="state" type="_F3CIECu1Ed-uZPFNCty7PQ" isUnique="false" aggregation="composite"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_M4VG8Cu9Ed-uZPFNCty7PQ" name="m_sema" type="_fxfe8Cu1Ed-uZPFNCty7PQ" isUnique="false" aggregation="composite"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_rmwGoCu-Ed-uZPFNCty7PQ" name="m_sr" isStatic="true" type="_qgzokChYEd-eoo60eNyGlg" isUnique="false" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zYwqYCu-Ed-uZPFNCty7PQ" value="20"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zY4mMCu-Ed-uZPFNCty7PQ" value="20"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_xukAICvDEd-uZPFNCty7PQ" name="m_tID" type="_5KatsCvDEd-uZPFNCty7PQ" isUnique="false" aggregation="composite"/>
- <ownedAttribute xmi:id="_Xq00oCvHEd-uZPFNCty7PQ" name="POOL_SIZE" isStatic="true" isUnique="false" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_xukAICvDEd-uZPFNCty7PQ" name="m_tID" type="_5KatsCvDEd-uZPFNCty7PQ" isUnique="false" aggregation="composite"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Xq00oCvHEd-uZPFNCty7PQ" name="POOL_SIZE" isStatic="true" isUnique="false" aggregation="composite">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
<defaultValue xmi:type="uml:LiteralInteger" xmi:id="_ZmFncCvHEd-uZPFNCty7PQ" value="20"/>
</ownedAttribute>
- <interfaceRealization xmi:id="_cWjrYCsAEd-uZPFNCty7PQ" name="derived realization of I" client="_qgzokChYEd-eoo60eNyGlg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_cWjrYCsAEd-uZPFNCty7PQ" name="derived realization of I" client="_qgzokChYEd-eoo60eNyGlg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_D8z3ECu1Ed-uZPFNCty7PQ" name="run" specification="_2FN1ICu0Ed-uZPFNCty7PQ">
<language>C/C++</language>
<body>for (;;) {
@@ -653,45 +653,45 @@ m_state = FOLLOWER;</body>
<language>C/C++</language>
<body>((LeaderFollower *) arg)->run();</body>
</ownedBehavior>
- <ownedOperation xmi:id="_2FN1ICu0Ed-uZPFNCty7PQ" name="run" method="_D8z3ECu1Ed-uZPFNCty7PQ"/>
- <ownedOperation xmi:id="_eHX3wCu7Ed-uZPFNCty7PQ" name="selectLeader" method="_wXEiYCu7Ed-uZPFNCty7PQ"/>
- <ownedOperation xmi:id="_JM4I4Cu9Ed-uZPFNCty7PQ" name="LeaderFollower" method="_4M1S0Cu9Ed-uZPFNCty7PQ"/>
- <ownedOperation xmi:id="_6cImgCu-Ed-uZPFNCty7PQ" name="init" isStatic="true" method="_OyEk4Cu_Ed-uZPFNCty7PQ"/>
- <ownedOperation xmi:id="_z-laoCvGEd-uZPFNCty7PQ" name="runStatic" method="_AGUogCvHEd-uZPFNCty7PQ">
- <ownedParameter xmi:id="_Dn-xYCvHEd-uZPFNCty7PQ" name="arg">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_2FN1ICu0Ed-uZPFNCty7PQ" name="run" method="_D8z3ECu1Ed-uZPFNCty7PQ"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_eHX3wCu7Ed-uZPFNCty7PQ" name="selectLeader" method="_wXEiYCu7Ed-uZPFNCty7PQ"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_JM4I4Cu9Ed-uZPFNCty7PQ" name="LeaderFollower" method="_4M1S0Cu9Ed-uZPFNCty7PQ"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_6cImgCu-Ed-uZPFNCty7PQ" name="init" isStatic="true" method="_OyEk4Cu_Ed-uZPFNCty7PQ"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_z-laoCvGEd-uZPFNCty7PQ" name="runStatic" method="_AGUogCvHEd-uZPFNCty7PQ">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_Dn-xYCvHEd-uZPFNCty7PQ" name="arg">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
</ownedParameter>
- <ownedParameter xmi:id="_IdnDkCvHEd-uZPFNCty7PQ" name="ret" direction="return">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_IdnDkCvHEd-uZPFNCty7PQ" name="ret" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
</ownedParameter>
</ownedOperation>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_2wMyEChiEd-eoo60eNyGlg" name="SimpleActivation">
- <generalization xmi:id="_5AKpkChiEd-eoo60eNyGlg" general="_e6Y_EChYEd-eoo60eNyGlg"/>
- <interfaceRealization xmi:id="_BhfKYChjEd-eoo60eNyGlg" name="derived realization of I" client="_2wMyEChiEd-eoo60eNyGlg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_5AKpkChiEd-eoo60eNyGlg" general="_e6Y_EChYEd-eoo60eNyGlg"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_BhfKYChjEd-eoo60eNyGlg" name="derived realization of I" client="_2wMyEChiEd-eoo60eNyGlg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_6rmQoChiEd-eoo60eNyGlg" name="Thread Pool">
- <generalization xmi:id="_892AEChiEd-eoo60eNyGlg" general="_e6Y_EChYEd-eoo60eNyGlg"/>
- <interfaceRealization xmi:id="_cWkScCsAEd-uZPFNCty7PQ" name="derived realization of I" client="_6rmQoChiEd-eoo60eNyGlg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_892AEChiEd-eoo60eNyGlg" general="_e6Y_EChYEd-eoo60eNyGlg"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_cWkScCsAEd-uZPFNCty7PQ" name="derived realization of I" client="_6rmQoChiEd-eoo60eNyGlg" supplier="_ZzlzMPfBEd2TbIfwytOyPA" contract="_ZzlzMPfBEd2TbIfwytOyPA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_BY-fwCnxEd-eoo60eNyGlg" name="sem_t">
- <ownedAttribute xmi:id="_CQ_F0CnxEd-eoo60eNyGlg" name="lf" type="_qgzokChYEd-eoo60eNyGlg" isUnique="false" aggregation="composite"/>
- <ownedAttribute xmi:id="_PpWOECnxEd-eoo60eNyGlg" name="listener" isUnique="false" aggregation="composite"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_CQ_F0CnxEd-eoo60eNyGlg" name="lf" type="_qgzokChYEd-eoo60eNyGlg" isUnique="false" aggregation="composite"/>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_PpWOECnxEd-eoo60eNyGlg" name="listener" isUnique="false" aggregation="composite"/>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_F3CIECu1Ed-uZPFNCty7PQ" name="LFState">
- <ownedLiteral xmi:id="_QSQJwCu1Ed-uZPFNCty7PQ" name="EXECUTOR"/>
- <ownedLiteral xmi:id="_R5B6UCu1Ed-uZPFNCty7PQ" name="FOLLOWER"/>
- <ownedLiteral xmi:id="_SxRJ4Cu1Ed-uZPFNCty7PQ" name="LEADER"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QSQJwCu1Ed-uZPFNCty7PQ" name="EXECUTOR"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_R5B6UCu1Ed-uZPFNCty7PQ" name="FOLLOWER"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SxRJ4Cu1Ed-uZPFNCty7PQ" name="LEADER"/>
</packagedElement>
<packagedElement xmi:type="uml:Interface" xmi:id="_fxfe8Cu1Ed-uZPFNCty7PQ" name="IListener">
- <ownedOperation xmi:id="_eN6hcCu3Ed-uZPFNCty7PQ" name="exec" isAbstract="true"/>
- <ownedOperation xmi:id="_hY4ooCu3Ed-uZPFNCty7PQ" name="select" isAbstract="true"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_eN6hcCu3Ed-uZPFNCty7PQ" name="exec" isAbstract="true"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_hY4ooCu3Ed-uZPFNCty7PQ" name="select" isAbstract="true"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_5KatsCvDEd-uZPFNCty7PQ" name="pthread_t"/>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_hcwDkD8CEeGJ6KSvhYhYuQ" name="LeaderFollowerState">
- <ownedLiteral xmi:id="_mzqd4D8CEeGJ6KSvhYhYuQ" name="LEADER"/>
- <ownedLiteral xmi:id="_qdIe8D8CEeGJ6KSvhYhYuQ" name="FOLLOWER"/>
- <ownedLiteral xmi:id="_rOMvgD8CEeGJ6KSvhYhYuQ" name="EXECUTOR"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_mzqd4D8CEeGJ6KSvhYhYuQ" name="LEADER"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_qdIe8D8CEeGJ6KSvhYhYuQ" name="FOLLOWER"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_rOMvgD8CEeGJ6KSvhYhYuQ" name="EXECUTOR"/>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_xOqL0No9Ed-wvpj-p-V_QQ" name="CppParameterStorage"/>
@@ -706,141 +706,141 @@ m_state = FOLLOWER;</body>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_QwvnQFDlEd6cwecVIgl9nw" name="PortKinds">
- <ownedComment xmi:id="_FryEELnZEeCxXoyQxQ47PQ" annotatedElement="_Wtq4sFDlEd6cwecVIgl9nw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_FryEELnZEeCxXoyQxQ47PQ" annotatedElement="_Wtq4sFDlEd6cwecVIgl9nw">
<body>Simple provision of typing interface as provided interface</body>
</ownedComment>
- <ownedComment xmi:id="_K17NsLnZEeCxXoyQxQ47PQ" annotatedElement="_Wtrfw1DlEd6cwecVIgl9nw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_K17NsLnZEeCxXoyQxQ47PQ" annotatedElement="_Wtrfw1DlEd6cwecVIgl9nw">
<body>Simple provision of typing interface as required interface</body>
</ownedComment>
- <ownedComment xmi:id="_PxzR0LnZEeCxXoyQxQ47PQ" annotatedElement="__nMrwLqNEd-SedGzMDDkww">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_PxzR0LnZEeCxXoyQxQ47PQ" annotatedElement="__nMrwLqNEd-SedGzMDDkww">
<body>corba asynchronous messaging (AMI): Provision of poller variant of typing interface. Allows client to continue without waiting for the result</body>
</ownedComment>
- <ownedComment xmi:id="_l49WMLnZEeCxXoyQxQ47PQ" annotatedElement="__nMrwLqNEd-SedGzMDDkww _AQZZwLqOEd-SedGzMDDkww">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_l49WMLnZEeCxXoyQxQ47PQ" annotatedElement="__nMrwLqNEd-SedGzMDDkww _AQZZwLqOEd-SedGzMDDkww">
<body>corba asynchronous messaging (AMI): Provision of callback variant of typing interface. Allows client Allows client to continue without waiting for the result</body>
</ownedComment>
- <ownedComment xmi:id="_2dvXILnZEeCxXoyQxQ47PQ" annotatedElement="_Wtq4slDlEd6cwecVIgl9nw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_2dvXILnZEeCxXoyQxQ47PQ" annotatedElement="_Wtq4slDlEd6cwecVIgl9nw">
<body>Data Flow oriented communication: consume passively: provided push operation is called </body>
</ownedComment>
- <ownedComment xmi:id="_Ch2pQLnaEeCxXoyQxQ47PQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_Ch2pQLnaEeCxXoyQxQ47PQ">
<body>Data Flow oriented communication: produce data via pushing these (calling the required operation) </body>
</ownedComment>
- <ownedComment xmi:id="_DsnzQLnaEeCxXoyQxQ47PQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_DsnzQLnaEeCxXoyQxQ47PQ">
<body>Data Flow oriented communication: produce data via pushing these (calling the required operation) </body>
</ownedComment>
- <ownedComment xmi:id="_FMuUELnaEeCxXoyQxQ47PQ" annotatedElement="_WtrfwlDlEd6cwecVIgl9nw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_FMuUELnaEeCxXoyQxQ47PQ" annotatedElement="_WtrfwlDlEd6cwecVIgl9nw">
<body>Data Flow oriented communication: produce data via pushing these (calling the required operation) </body>
</ownedComment>
- <ownedComment xmi:id="_GgtrgLnaEeCxXoyQxQ47PQ" annotatedElement="_Wtq4sVDlEd6cwecVIgl9nw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_GgtrgLnaEeCxXoyQxQ47PQ" annotatedElement="_Wtq4sVDlEd6cwecVIgl9nw">
<body>Data Flow oriented communication: consumer data actively by calling the required poll operation </body>
</ownedComment>
- <ownedComment xmi:id="_-UGDoDiyEeGiupyIkgMHVw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_-UGDoDiyEeGiupyIkgMHVw">
<body>In order to support icons, all port kinds are stereotypes, but for Qompass they are classes stereotyped as &quot;PortKind&quot;</body>
</ownedComment>
- <ownedComment xmi:id="_COvdAEMMEeKGIL695HkFYQ" annotatedElement="_GjnlcC8qEeKx7OxAiA06uw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_COvdAEMMEeKGIL695HkFYQ" annotatedElement="_GjnlcC8qEeKx7OxAiA06uw">
<body> A bidirectional flow port combining a push-producer and a pull consumer</body>
</ownedComment>
- <ownedComment xmi:id="_7cXTsH-QEeOtkrzuMiGEow" annotatedElement="_1FxlEH-QEeOtkrzuMiGEow">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_7cXTsH-QEeOtkrzuMiGEow" annotatedElement="_1FxlEH-QEeOtkrzuMiGEow">
<body>Dummy interface returned by ports who need to update derived interfaces (but can only do so in the context of a transaction).</body>
</ownedComment>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_Wtq4sFDlEd6cwecVIgl9nw" name="ProvideInterface">
- <icon xmi:id="__3j28DixEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%119%0%0%0%92%8%3%0%0%0%99%-116%-38%77%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%120%120%120%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-71%82%-104%50%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%4%-59%73%68%65%84%104%-127%-59%-102%109%91%-30%58%16%-122%11%-118%40%-88%108%-83%2%-53%-117%93%123%4%-75%-20%110%53%-83%69%-91%-108%30%20%-1%-1%79%58%-107%-77%72%38%77%-109%73%-126%-41%62%95%-55%-52%77%94%-102%-52%76%98%-111%29%104%-2%-74%26%-115%-22%-29%81%-27%-83%31%35%77%44%51%98%-68%58%60%-19%120%22%-91%-27%-76%57%-70%-8%90%-18%-62%127%6%-56%-83%58%-65%-34%-61%47%-30%94%28%-76%-7%-52%63%122%109%-4%-5%5%-36%-59%73%73%79%105%-75%43%59%-26%14%78%-28%-48%-75%-70%-29%-78%-31%-42%-32%94%96%-87%107%-14%96%71%-36%-80%-18%42%96%115%5%-50%46%-72%-117%-82%26%53%-41%-16%-38%-100%-69%127%-91%-116%-51%-43%-116%-52%-72%-15%-67%14%53%87%123%102%-62%117%94%52%-79%-106%-27%-78%-53%75%-127%-101%-88%79%45%5%102%-66%101%60%119%-66%44%117%58%124%-71%15%38%-66%-1%59%-104%-106%-73%-15%-58%122%-36%-92%-60%101%-89%89%-95%63%-108%120%-32%79%75%-42%94%85%-121%-21%100%60%87%-39%36%-31%-76%-75%111%-98%-72%61%-2%-95%-50%-115%121%115%43%-40%127%23%15%-100%-3%-37%-19%41%115%91%69%47%-35%-107%-48%34%-31%-20%-90%-53%-19%-116%-32%-72%-11%-30%127%-81%75%14%88%66%86%-33%11%86%45%53%-18%-96%48%104%47%-123%-115%-128%-93%-8%119%1%92%87%-31%-38%25%107%-34%-112%118%-10%127%-115%-39%51%-60%-21%43%112%27%-84%113%13%71%-51%-43%103%-65%-66%78%-120%-26%-10%-104%81%-10%-86%114%-101%79%37%-20%88%-43%-48%-36%103%3%44%33%51%-90%-57%-18%5%-110%59%102%-2%-16%88%106%1%-107%48%115%28%32%-71%41%52%-13%21%-79%-124%92%-62%121%-14%18%20%-73%2%-79%-33%-112%43%-103%-42%29%116%-47%68%113%97%-108%-4%-54%13%-106%36%10%-65%1%31%87%14%-126%-5%6%-1%-21%72%3%-101%-81%45%120%66%77%16%-36%0%88%60%106%97%-39%-111%-50%-28%-36%8%44%70%-113%119%-22%97%20%-62%-59%121%41%-27%94%-125%-10%-57%-102%88%-10%99%12%-92%92%120%-2%45%-76%-71%33%-40%61%-36%80%-62%13%-63%48%-73%-124%109%-59%58%0%29%-24%75%-72%125%-48%-102%23%-9%99%-27%-128%-51%-29%78%-62%5%-21%-48%45%70%-3%10%2%51%54%-107%112%31%-103%-43%96%-96%17%-19%-22%42%18%115%95%-23%-58%122%123%-58%70%51%-72%66%-123%92%27%-76%-59%-124%54%2%-127%-120%-76%-14%-121%27%-49%120%-86%-46%77%51%51%44%-36%-7%110%63%-72%-47%-92%-115%-88%86%-24%-18%-111%27%-127%47%-23%-34%66%-89%-46%13%67%46%56%80%-97%44%18%103%40%-84%-75%111%-56%-99%-45%-50%-50%45%-46%-60%97%13%-105%51%-77%-96%83%-117%12%-111%92%113%90%34%87%8%-71%9%18%107%-67%25%114%9%-19%-52%-77%46%-1%10%-41%-75%-20%50%14%43%65%-47%15%-91%-104%118%-106%-49%47%-74%106%-79%-21%117%85%45%3%49%58%48%-28%-10%104%103%-7%-9%75%30%112%-36%95%-122%-36%127%104%103%-45%-100%27%-6%-120%93%50%-1%-117%-122%92%-97%118%-42%92%-97%11%73%-19%-8%-119%39%80%39%27%26%114%65%-35%-95%38%60%7%35%-48%-31%-98%-88%-87%92%96%127%122%23%-97%-5%32%-20%-59%103%-37%60%-127%101%-107%-17%86%-62%-58%-57%116%91%-109%112%-110%-112%91%56%103%98%-18%30%-35%-40%-45%-55%-55%62%5%-14%-69%19%9%23%-100%93%70%3%-67%0%-98%-10%100%-7%2%8%-13%59%6%92%88%-101%-103%-53%-72%48%29%-44%-33%-94%29%-112%-119%102%-46%-4%8%-90%-65%-25%-38%92%-80%105%124%36%-64%-78%-4%55%3%6%-17%-102%88%7%6%23%115%57%-9%16%24%100%-102%-87%10%-100%-82%103%34%-25%-62%21%-67%46%17%-88%-117%-119%45%-10%17%92%-72%-83%90%94%-55%-11%-105%80%76%125%115%25%97%-72%-16%-61%-77%-78%51%117%46%83%-119%94%111%3%-14%-70%-39%41%-76%106%41%23%-80%-104%-14%-43%-48%-58%113%7%-48%76%57%29%29%49%-10%119%4%-57%37%108%-11%-6%72%9%91%101%-126%-118%52%-62%114%-49%-40%-56%30%91%-11%-26%97%55%-31%63%-90%-18%-67%-49%-104%90%15%-24%-49%-72%112%49%-15%64%-16%92%-90%-66%-104%-85%-115%43%-96%21%-17%49%95%55%79%29%80%-9%26%78%-31%-82%-52%-67%65%-104%-11%82%-42%108%-101%100%-31%-18%113%126%20%35%-50%-87%-84%-53%118%-77%104%-12%-13%-13%87%-28%-67%-107%95%112%97%121%13%-47%-13%-112%-88%-58%-71%79%-100%110%23%36%-10%126%48%40%122%-79%-68%-96%-84%112%-24%-44%121%-73%-104%93%123%-37%2%-53%13%-7%-113%24%-38%7%-59%42%-113%125%125%-54%77%4%50%58%62%67%-33%-61%-58%-36%59%-50%92%105%112%115%-71%-15%24%-9%-85%71%101%-49%88%-106%96%65%-32%-17%-99%-29%105%-119%-61%-11%-112%-89%-23%75%-102%-118%94%88%64%-84%-54%61%123%-120%76%-32%-72%-22%50%-117%80%-23%61%-61%-111%54%-10%-23%-116%113%-91%-10%126%-93%112%-49%-120%84%113%71%87%124%55%50%19%63%126%-30%107%-56%-119%127%85%-33%-55%68%13%84%-78%76%-21%-111%87%80%85%127%-113%52%127%-106%-93%40%45%-7%85%122%-99%-9%87%123%-27%-81%52%88%93%29%-39%124%31%90%-17%-66%-94%-101%-30%-43%61%-105%-38%40%77%33%53%-33%-71%-123%99%-7%104%103%126%73%95%13%-72%-71%-110%-119%-88%-45%110%32%-82%-17%25%-67%-97%-20%-33%-74%-72%31%-12%-7%-31%74%22%9%25%-66%-37%36%97%127%-4%-13%-76%-67%-119%-4%-68%116%-38%-84%-83%4%-61%-69%51%-18%-89%102%-77%25%-10%-115%-22%-121%-2%3%52%51%-49%67%-105%-19%90%17%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%5%-46%-52%-24%92%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_17F1IDrSEeGKkdk54CX6PQ" source="image_papyrus">
- <details xmi:id="_17HDQDrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
- <details xmi:id="_Sn5bADrXEeGMCcwsbpLuFA" key="image_name_key" value="IconProvideInterface"/>
+ <icon xmi:type="uml:Image" xmi:id="__3j28DixEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%119%0%0%0%92%8%3%0%0%0%99%-116%-38%77%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%120%120%120%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-71%82%-104%50%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%4%-59%73%68%65%84%104%-127%-59%-102%109%91%-30%58%16%-122%11%-118%40%-88%108%-83%2%-53%-117%93%123%4%-75%-20%110%53%-83%69%-91%-108%30%20%-1%-1%79%58%-107%-77%72%38%77%-109%73%-126%-41%62%95%-55%-52%77%94%-102%-52%76%98%-111%29%104%-2%-74%26%-115%-22%-29%81%-27%-83%31%35%77%44%51%98%-68%58%60%-19%120%22%-91%-27%-76%57%-70%-8%90%-18%-62%127%6%-56%-83%58%-65%-34%-61%47%-30%94%28%-76%-7%-52%63%122%109%-4%-5%5%-36%-59%73%73%79%105%-75%43%59%-26%14%78%-28%-48%-75%-70%-29%-78%-31%-42%-32%94%96%-87%107%-14%96%71%-36%-80%-18%42%96%115%5%-50%46%-72%-117%-82%26%53%-41%-16%-38%-100%-69%127%-91%-116%-51%-43%-116%-52%-72%-15%-67%14%53%87%123%102%-62%117%94%52%-79%-106%-27%-78%-53%75%-127%-101%-88%79%45%5%102%-66%101%60%119%-66%44%117%58%124%-71%15%38%-66%-1%59%-104%-106%-73%-15%-58%122%-36%-92%-60%101%-89%89%-95%63%-108%120%-32%79%75%-42%94%85%-121%-21%100%60%87%-39%36%-31%-76%-75%111%-98%-72%61%-2%-95%-50%-115%121%115%43%-40%127%23%15%-100%-3%-37%-19%41%115%91%69%47%-35%-107%-48%34%-31%-20%-90%-53%-19%-116%-32%-72%-11%-30%127%-81%75%14%88%66%86%-33%11%86%45%53%-18%-96%48%104%47%-123%-115%-128%-93%-8%119%1%92%87%-31%-38%25%107%-34%-112%118%-10%127%-115%-39%51%-60%-21%43%112%27%-84%113%13%71%-51%-43%103%-65%-66%78%-120%-26%-10%-104%81%-10%-86%114%-101%79%37%-20%88%-43%-48%-36%103%3%44%33%51%-90%-57%-18%5%-110%59%102%-2%-16%88%106%1%-107%48%115%28%32%-71%41%52%-13%21%-79%-124%92%-62%121%-14%18%20%-73%2%-79%-33%-112%43%-103%-42%29%116%-47%68%113%97%-108%-4%-54%13%-106%36%10%-65%1%31%87%14%-126%-5%6%-1%-21%72%3%-101%-81%45%120%66%77%16%-36%0%88%60%106%97%-39%-111%-50%-28%-36%8%44%70%-113%119%-22%97%20%-62%-59%121%41%-27%94%-125%-10%-57%-102%88%-10%99%12%-92%92%120%-2%45%-76%-71%33%-40%61%-36%80%-62%13%-63%48%-73%-124%109%-59%58%0%29%-24%75%-72%125%-48%-102%23%-9%99%-27%-128%-51%-29%78%-62%5%-21%-48%45%70%-3%10%2%51%54%-107%112%31%-103%-43%96%-96%17%-19%-22%42%18%115%95%-23%-58%122%123%-58%70%51%-72%66%-123%92%27%-76%-59%-124%54%2%-127%-120%-76%-14%-121%27%-49%120%-86%-46%77%51%51%44%-36%-7%110%63%-72%-47%-92%-115%-88%86%-24%-18%-111%27%-127%47%-23%-34%66%-89%-46%13%67%46%56%80%-97%44%18%103%40%-84%-75%111%-56%-99%-45%-50%-50%45%-46%-60%97%13%-105%51%-77%-96%83%-117%12%-111%92%113%90%34%87%8%-71%9%18%107%-67%25%114%9%-19%-52%-77%46%-1%10%-41%-75%-20%50%14%43%65%-47%15%-91%-104%118%-106%-49%47%-74%106%-79%-21%117%85%45%3%49%58%48%-28%-10%104%103%-7%-9%75%30%112%-36%95%-122%-36%127%104%103%-45%-100%27%-6%-120%93%50%-1%-117%-122%92%-97%118%-42%92%-97%11%73%-19%-8%-119%39%80%39%27%26%114%65%-35%-95%38%60%7%35%-48%-31%-98%-88%-87%92%96%127%122%23%-97%-5%32%-20%-59%103%-37%60%-127%101%-107%-17%86%-62%-58%-57%116%91%-109%112%-110%-112%91%56%103%98%-18%30%-35%-40%-45%-55%-55%62%5%-14%-69%19%9%23%-100%93%70%3%-67%0%-98%-10%100%-7%2%8%-13%59%6%92%88%-101%-103%-53%-72%48%29%-44%-33%-94%29%-112%-119%102%-46%-4%8%-90%-65%-25%-38%92%-80%105%124%36%-64%-78%-4%55%3%6%-17%-102%88%7%6%23%115%57%-9%16%24%100%-102%-87%10%-100%-82%103%34%-25%-62%21%-67%46%17%-88%-117%-119%45%-10%17%92%-72%-83%90%94%-55%-11%-105%80%76%125%115%25%97%-72%-16%-61%-77%-78%51%117%46%83%-119%94%111%3%-14%-70%-39%41%-76%106%41%23%-80%-104%-14%-43%-48%-58%113%7%-48%76%57%29%29%49%-10%119%4%-57%37%108%-11%-6%72%9%91%101%-126%-118%52%-62%114%-49%-40%-56%30%91%-11%-26%97%55%-31%63%-90%-18%-67%-49%-104%90%15%-24%-49%-72%112%49%-15%64%-16%92%-90%-66%-104%-85%-115%43%-96%21%-17%49%95%55%79%29%80%-9%26%78%-31%-82%-52%-67%65%-104%-11%82%-42%108%-101%100%-31%-18%113%126%20%35%-50%-87%-84%-53%118%-77%104%-12%-13%-13%87%-28%-67%-107%95%112%97%121%13%-47%-13%-112%-88%-58%-71%79%-100%110%23%36%-10%126%48%40%122%-79%-68%-96%-84%112%-24%-44%121%-73%-104%93%123%-37%2%-53%13%-7%-113%24%-38%7%-59%42%-113%125%125%-54%77%4%50%58%62%67%-33%-61%-58%-36%59%-50%92%105%112%115%-71%-15%24%-9%-85%71%101%-49%88%-106%96%65%-32%-17%-99%-29%105%-119%-61%-11%-112%-89%-23%75%-102%-118%94%88%64%-84%-54%61%123%-120%76%-32%-72%-22%50%-117%80%-23%61%-61%-111%54%-10%-23%-116%113%-91%-10%126%-93%112%-49%-120%84%113%71%87%124%55%50%19%63%126%-30%107%-56%-119%127%85%-33%-55%68%13%84%-78%76%-21%-111%87%80%85%127%-113%52%127%-106%-93%40%45%-7%85%122%-99%-9%87%123%-27%-81%52%88%93%29%-39%124%31%90%-17%-66%-94%-101%-30%-43%61%-105%-38%40%77%33%53%-33%-71%-123%99%-7%104%103%126%73%95%13%-72%-71%-110%-119%-88%-45%110%32%-82%-17%25%-67%-97%-20%-33%-74%-72%31%-12%-7%-31%74%22%9%25%-66%-37%36%97%127%-4%-13%-76%-67%-119%-4%-68%116%-38%-84%-83%4%-61%-69%51%-18%-89%102%-77%25%-10%-115%-22%-121%-2%3%52%51%-49%67%-105%-19%90%17%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%5%-46%-52%-24%92%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_17F1IDrSEeGKkdk54CX6PQ" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_17HDQDrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Sn5bADrXEeGMCcwsbpLuFA" key="image_name_key" value="IconProvideInterface"/>
</eAnnotations>
</icon>
- <icon xmi:id="_ToC6oDl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%84%0%0%0%101%8%3%0%0%0%-28%-109%52%-5%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-52%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%82%82%82%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%24%24%24%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-33%61%-9%-93%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%41%73%68%65%84%104%-127%-83%-39%125%91%-38%48%16%0%-16%-29%101%12%-76%32%32%69%17%-95%88%-107%23%-69%45%-43%90%-83%5%117%-32%-9%-1%78%-125%103%-37%67%47%109%115%-105%54%-9%119%-8%61%41%73%-109%-69%43%-120%-14%17%92%86%-105%86%56%-116%15%49%12%-83%-42%26%74%-126%-35%-54%106%8%82%84%74%-95%-125%-58%-117%12%30%98%84%28%125%-84%-74%-99%44%18%-96%87%20%125%-84%127%100%-117%0%83%81%12%85%-112%0%-61%98%-24%-83%-126%4%120%42%-126%-66%61%-87%72%-128%7%125%-44%-97%79%-43%38%-52%-75%-47%-2%25%65%2%-72%-70%-24%104%67%-102%-80%-43%68%107%57%59%19%69%-92%-121%46%25%36%-128%-81%-123%54%115%-99%-15%-85%-41%-88%110%15%81%-83%-51%-123%6%-22%63%100%-125%-45%-50%-3%-91%52%-108%-113%-98%100%-110%-81%-75%94%122%40%27%-99%103%-111%-42%58%115%44%23%-67%-31%-109%108%116%-108%-34%75%-101%93%-18%104%30%-38%77%-17%-7%102%-112%63%-100%-121%-2%72%-19%-95%47%-43%112%22%122%39%-101%118%-92%28%-49%65%-93%-119%100%-122%-118%71%-25%-94%-14%-61%119%8%-109%-125%110%37%-13%-52%-89%126%65%-93%-66%116%-81%15%-87%121%114%-48%26%54%63%-6%-28%47%104%-44%-57%91%-44%-71%-94%77%26%-67%-59%19%-99%51%76%26%-75%-15%102%34%23%-119%-125%86%-16%-61%-65%113%76%18%-75%16%-38%98%-103%20%-38%67%-89%-45%-17%-82%17%20%47%-45%61%-49%-92%-48%48%105%-114%-103%19%37%-48%1%-102%104%-109%105%18%-88%-117%-48%-127%25%-44%67%123%-108%107%18%104%-100%68%-17%-52%-96%17%122%-6%-116%11%-66%8%58%75%-102%54%-37%84%-93%40%-127%96%-66%77%36%-118%-18%-111%-118%33%-12%60%-119%50%14%103%22%58%78%-104%19%-66%-87%68%-125%-126%-21%116%64%-3%-111%91%91%36%-93%-27%-3%-115%95%73%-12%84%11%29%93%0%39%60%29%-12%-115%42%-117%-2%-59%82%7%125%-26%-103%-80%-48%65%57%69%-116%54%-54%13%45%-108%-7%-105%-62%119%29%-12%39%19%-43%90%-3%-63%-104%6%15%-47%-42%65%69%-60%91%127%-51%55%74%116%-81%-73%-57%-72%-114%-114%-15%-103%64%29%77%52%55%-48%5%-51%-53%120%104%20%85%-93%51%67%-24%-73%36%-70%50%-124%-94%-108%111%104%8%-19%-93%-11%103%-25%18%-60%-67%-113%106%-120%-70%33%116%-107%68%-49%13%-95%51%-12%-4%-20%77%-91%70%-5%-24%96%100%-33%-4%68%126%-118%58%112%83%51%-7%-87%-108%75%114%-49%84%2%13%-48%113%-53%77%-91%-87%-22%-28%20%77%-107%-7%86%81%-24%14%-95%78%94%43%70%15%-107%42%-66%23%35%21%-97%-76%85%121%-41%63%93%69%-93%20%29%-100%107%19%-88%92%70%27%-87%-9%83%-99%-119%11%19%-99%9%113%-123%81%70%121%-50%-23%-10%120%-110%-6%108%-96%-37%35%6%-87%-66%20%81%-3%-80%58%104%-82%-124%-62%69%-7%14%90%-6%15%-128%-119%-14%110%-27%-95%65%44%-85%112%82%-70%43%41%46%-45%-55%-31%38%-65%-80%-30%118%122%-85%41%116%-97%-77%-107%-20%-12%74%-119%-59%-1%-80%-34%-53%-95%57%93%126%-69%94%-90%123%46%-35%-41%-57%112%-98%23%35%-23%29%51%-13%69%98%106%91%75%-41%-35%109%-65%92%-9%74%19%21%-115%92%-11%24%15%-70%40%-25%43%-113%-89%-115%-118%119%-14%123%-44%-87%62%42%122%29%2%13%11%-96%-5%13%-85%-82%-68%-118%-95%34%82%78%-42%46%-122%10%113%-93%-8%103%-29%-94%-88%-22%11%111%113%84%-59%-106%64%-9%-73%108%-59%-54%-36%-75%-91%-48%125%-12%-22%97%-38%13%74%-94%-5%8%118%45%27%-61%81%121%-12%16%-2%-70%-46%-16%-38%97%24%-57%113%24%-74%-9%71%-31%31%12%-33%-99%51%8%-119%86%-81%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%45%-25%121%64%-90%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_2ypIMDrSEeGKkdk54CX6PQ" source="image_papyrus">
- <details xmi:id="_2ypvQDrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
- <details xmi:id="_UMxHEDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjProvideInterface"/>
+ <icon xmi:type="uml:Image" xmi:id="_ToC6oDl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%84%0%0%0%101%8%3%0%0%0%-28%-109%52%-5%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-52%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%82%82%82%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%24%24%24%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-33%61%-9%-93%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%41%73%68%65%84%104%-127%-83%-39%125%91%-38%48%16%0%-16%-29%101%12%-76%32%32%69%17%-95%88%-107%23%-69%45%-43%90%-83%5%117%-32%-9%-1%78%-125%103%-37%67%47%109%115%-105%54%-9%119%-8%61%41%73%-109%-69%43%-120%-14%17%92%86%-105%86%56%-116%15%49%12%-83%-42%26%74%-126%-35%-54%106%8%82%84%74%-95%-125%-58%-117%12%30%98%84%28%125%-84%-74%-99%44%18%-96%87%20%125%-84%127%100%-117%0%83%81%12%85%-112%0%-61%98%-24%-83%-126%4%120%42%-126%-66%61%-87%72%-128%7%125%-44%-97%79%-43%38%-52%-75%-47%-2%25%65%2%-72%-70%-24%104%67%-102%-80%-43%68%107%57%59%19%69%-92%-121%46%25%36%-128%-81%-123%54%115%-99%-15%-85%-41%-88%110%15%81%-83%-51%-123%6%-22%63%100%-125%-45%-50%-3%-91%52%-108%-113%-98%100%-110%-81%-75%94%122%40%27%-99%103%-111%-42%58%115%44%23%-67%-31%-109%108%116%-108%-34%75%-101%93%-18%104%30%-38%77%-17%-7%102%-112%63%-100%-121%-2%72%-19%-95%47%-43%112%22%122%39%-101%118%-92%28%-49%65%-93%-119%100%-122%-118%71%-25%-94%-14%-61%119%8%-109%-125%110%37%-13%-52%-89%126%65%-93%-66%116%-81%15%-87%121%114%-48%26%54%63%-6%-28%47%104%-44%-57%91%-44%-71%-94%77%26%-67%-59%19%-99%51%76%26%-75%-15%102%34%23%-119%-125%86%-16%-61%-65%113%76%18%-75%16%-38%98%-103%20%-38%67%-89%-45%-17%-82%17%20%47%-45%61%-49%-92%-48%48%105%-114%-103%19%37%-48%1%-102%104%-109%105%18%-88%-117%-48%-127%25%-44%67%123%-108%107%18%104%-100%68%-17%-52%-96%17%122%-6%-116%11%-66%8%58%75%-102%54%-37%84%-93%40%-127%96%-66%77%36%-118%-18%-111%-118%33%-12%60%-119%50%14%103%22%58%78%-104%19%-66%-87%68%-125%-126%-21%116%64%-3%-111%91%91%36%-93%-27%-3%-115%95%73%-12%84%11%29%93%0%39%60%29%-12%-115%42%-117%-2%-59%82%7%125%-26%-103%-80%-48%65%57%69%-116%54%-54%13%45%-108%-7%-105%-62%119%29%-12%39%19%-43%90%-3%-63%-104%6%15%-47%-42%65%69%-60%91%127%-51%55%74%116%-81%-73%-57%-72%-114%-114%-15%-103%64%29%77%52%55%-48%5%-51%-53%120%104%20%85%-93%51%67%-24%-73%36%-70%50%-124%-94%-108%111%104%8%-19%-93%-11%103%-25%18%-60%-67%-113%106%-120%-70%33%116%-107%68%-49%13%-95%51%-12%-4%-20%77%-91%70%-5%-24%96%100%-33%-4%68%126%-118%58%112%83%51%-7%-87%-108%75%114%-49%84%2%13%-48%113%-53%77%-91%-87%-22%-28%20%77%-107%-7%86%81%-24%14%-95%78%94%43%70%15%-107%42%-66%23%35%21%-97%-76%85%121%-41%63%93%69%-93%20%29%-100%107%19%-88%92%70%27%-87%-9%83%-99%-119%11%19%-99%9%113%-123%81%70%121%-50%-23%-10%120%-110%-6%108%-96%-37%35%6%-87%-66%20%81%-3%-80%58%104%-82%-124%-62%69%-7%14%90%-6%15%-128%-119%-14%110%-27%-95%65%44%-85%112%82%-70%43%41%46%-45%-55%-31%38%-65%-80%-30%118%122%-85%41%116%-97%-77%-107%-20%-12%74%-119%-59%-1%-80%-34%-53%-95%57%93%126%-69%94%-90%123%46%-35%-41%-57%112%-98%23%35%-23%29%51%-13%69%98%106%91%75%-41%-35%109%-65%92%-9%74%19%21%-115%92%-11%24%15%-70%40%-25%43%-113%-89%-115%-118%119%-14%123%-44%-87%62%42%122%29%2%13%11%-96%-5%13%-85%-82%-68%-118%-95%34%82%78%-42%46%-122%10%113%-93%-8%103%-29%-94%-88%-22%11%111%113%84%-59%-106%64%-9%-73%108%-59%-54%-36%-75%-91%-48%125%-12%-22%97%-38%13%74%-94%-5%8%118%45%27%-61%81%121%-12%16%-2%-70%-46%-16%-38%97%24%-57%113%24%-74%-9%71%-31%31%12%-33%-99%51%8%-119%86%-81%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%45%-25%121%64%-90%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2ypIMDrSEeGKkdk54CX6PQ" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2ypvQDrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UMxHEDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjProvideInterface"/>
</eAnnotations>
</icon>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_Wtq4sVDlEd6cwecVIgl9nw" name="PullConsumer">
- <icon xmi:id="_CVWIADiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%97%0%0%0%98%8%0%0%0%0%101%-7%-30%-47%0%0%2%120%73%68%65%84%104%-127%-75%-38%-51%75%21%81%24%6%-16%-125%-106%105%25%-106%38%-107%84%-76%50%-119%-54%32%90%37%-75%-120%72%-94%69%-117%104%85%86%-46%-90%112%97%73%33%-47%-86%-123%16%33%70%17%-47%-54%-94%47%-24%3%-63%34%-56%-115%20%-35%77%4%-110%65%-123%27%11%51%37%-107%-16%-93%-85%-34%105%-26%-23%74%31%115%-18%120%103%-18%97%-50%-5%60%127%-64%-4%86%103%-26%61%-49%59%10%-99%23%-102%121%105%31%-127%122%-80%72%17%-77%-96%98%68%85%51%-127%116%-82%-87%26%-78%112%76%-35%34%11%117%106%-74%-98%45%32%121%-124%45%96%124%55%91%-64%-40%46%-74%-128%-127%-51%108%1%-3%-107%108%1%61%107%-40%2%-34%-106%-78%5%116%-111%8%95%-64%-45%34%-74%-32%-35%-90%16%-102%0%-17%106%62%89%-128%-45%66%32%50%4%56%-115%108%1%-45%39%-39%2%-110%7%-39%2%38%14%-80%5%-116%-18%96%11%24%-38%-50%22%-48%-73%-127%45%-32%-29%58%-74%-128%-41%43%-39%2%94%-107%-80%5%116%-120%17%97%2%-18%20%-78%5%-9%-70%16%17%42%-64%-67%40%-13%-94%13%23%-112%58%47%66%68%8%72%29%103%11%-104%58%-52%22%48%-79%-113%45%96%108%15%91%-64%-32%54%-74%-128%47%-101%-40%2%-34%-83%103%11%-24%89%-59%22%-16%-94%-116%45%-32%-39%82%-74%-128%-69%-59%108%1%55%11%-40%-126%123%41%54%97%40%-64%109%-54%35%11%-104%-39%-49%22%-34%-105%-109%-123%-127%-86%-104%-128%-87%-16%99%103%92%-64%80%-104%58%20%27%48%19%82%-89%-29%3%70%-126%-41%106%51%18%-104%8%-9%-84%38%39%3%-95%107%-103%13%96%32%-12%-38%125%30%114%11%-33%108%-81%43%-71%-124%113%-21%-6%44%-121%-112%-76%56%8%70%-126%115%-58%26%-120%22%-68%54%-127%-39%56%82%120%36%81%7%69%9%-35%-53%5%-128%40%-95%-73%66%2%-120%16%6%55%-118%0%-31%-62%100%-4%47%-126%-103%48%45%113%57%-119%18%-100%38%41%32%68%-16%-82%-56%21%126%-39%-123%-57%-126%-67%104%86%33%97%53%108%27%8%31%68%91%-10%44%-62%87%-39%101%-60%124%65%122%103%51%79%-104%-107%-34%59%5%-123%95%103%-123%-127%-96%64%40%-41%3%-62%-109%-59%-46%64%64%72%-84%16%7%50%5%-47%22%52%-101%48%-76%-107%0%-24%-62%-28%94%6%-96%9%-87%58%10%-32%11%-18%57%14%-32%11%55%72%-64%127%-95%-109%-10%63%-62%95%-31%13%107%103%-7%79%-24%91%75%3%-2%8%-33%41%7%65%19%126%-42%18%-127%57%-63%57%-63%4%-46%-126%-37%76%5%-46%66%7%23%80%71%85%-36%86%-57%52%-83%-86%-127%-6%-4%-68%-110%97%-11%-87%44%-93%-3%-54%-41%-78%-80%64%75%-111%-106%37%-59%126%86%111%-47%82%-85%-91%-2%84%58%109%-61%80%24%109%-65%-84%-27%-2%67%63%-49%95%-6%73%124%-42%50%19%28%-127%-94%-14%27%-2%-94%-44%59%115%-35%74%-17%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_4KKUwDrSEeGKkdk54CX6PQ" source="image_papyrus">
- <details xmi:id="_4KLi4DrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
- <details xmi:id="_MdOBcDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconPushConsumer"/>
+ <icon xmi:type="uml:Image" xmi:id="_CVWIADiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%97%0%0%0%98%8%0%0%0%0%101%-7%-30%-47%0%0%2%120%73%68%65%84%104%-127%-75%-38%-51%75%21%81%24%6%-16%-125%-106%105%25%-106%38%-107%84%-76%50%-119%-54%32%90%37%-75%-120%72%-94%69%-117%104%85%86%-46%-90%112%97%73%33%-47%-86%-123%16%33%70%17%-47%-54%-94%47%-24%3%-63%34%-56%-115%20%-35%77%4%-110%65%-123%27%11%51%37%-107%-16%-93%-85%-34%105%-26%-23%74%31%115%-18%120%103%-18%97%-50%-5%60%127%-64%-4%86%103%-26%61%-49%59%10%-99%23%-102%121%105%31%-127%122%-80%72%17%-77%-96%98%68%85%51%-127%116%-82%-87%26%-78%112%76%-35%34%11%117%106%-74%-98%45%32%121%-124%45%96%124%55%91%-64%-40%46%-74%-128%-127%-51%108%1%-3%-107%108%1%61%107%-40%2%-34%-106%-78%5%116%-111%8%95%-64%-45%34%-74%-32%-35%-90%16%-102%0%-17%106%62%89%-128%-45%66%32%50%4%56%-115%108%1%-45%39%-39%2%-110%7%-39%2%38%14%-80%5%-116%-18%96%11%24%-38%-50%22%-48%-73%-127%45%-32%-29%58%-74%-128%-41%43%-39%2%94%-107%-80%5%116%-120%17%97%2%-18%20%-78%5%-9%-70%16%17%42%-64%-67%40%-13%-94%13%23%-112%58%47%66%68%8%72%29%103%11%-104%58%-52%22%48%-79%-113%45%96%108%15%91%-64%-32%54%-74%-128%47%-101%-40%2%-34%-83%103%11%-24%89%-59%22%-16%-94%-116%45%-32%-39%82%-74%-128%-69%-59%108%1%55%11%-40%-126%123%41%54%97%40%-64%109%-54%35%11%-104%-39%-49%22%-34%-105%-109%-123%-127%-86%-104%-128%-87%-16%99%103%92%-64%80%-104%58%20%27%48%19%82%-89%-29%3%70%-126%-41%106%51%18%-104%8%-9%-84%38%39%3%-95%107%-103%13%96%32%-12%-38%125%30%114%11%-33%108%-81%43%-71%-124%113%-21%-6%44%-121%-112%-76%56%8%70%-126%115%-58%26%-120%22%-68%54%-127%-39%56%82%120%36%81%7%69%9%-35%-53%5%-128%40%-95%-73%66%2%-120%16%6%55%-118%0%-31%-62%100%-4%47%-126%-103%48%45%113%57%-119%18%-100%38%41%32%68%-16%-82%-56%21%126%-39%-123%-57%-126%-67%104%86%33%97%53%108%27%8%31%68%91%-10%44%-62%87%-39%101%-60%124%65%122%103%51%79%-104%-107%-34%59%5%-123%95%103%-123%-127%-96%64%40%-41%3%-62%-109%-59%-46%64%64%72%-84%16%7%50%5%-47%22%52%-101%48%-76%-107%0%-24%-62%-28%94%6%-96%9%-87%58%10%-32%11%-18%57%14%-32%11%55%72%-64%127%-95%-109%-10%63%-62%95%-31%13%107%103%-7%79%-24%91%75%3%-2%8%-33%41%7%65%19%126%-42%18%-127%57%-63%57%-63%4%-46%-126%-37%76%5%-46%66%7%23%80%71%85%-36%86%-57%52%-83%-86%-127%-6%-4%-68%-110%97%-11%-87%44%-93%-3%-54%-41%-78%-80%64%75%-111%-106%37%-59%126%86%111%-47%82%-85%-91%-2%84%58%109%-61%80%24%109%-65%-84%-27%-2%67%63%-49%95%-6%73%124%-42%50%19%28%-127%-94%-14%27%-2%-94%-44%59%115%-35%74%-17%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4KKUwDrSEeGKkdk54CX6PQ" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4KLi4DrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MdOBcDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconPushConsumer"/>
</eAnnotations>
</icon>
- <icon xmi:id="_kZGdADl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%108%0%0%0%97%8%0%0%0%0%22%-109%27%-49%0%0%2%-101%73%68%65%84%104%-127%-67%-38%-51%75%84%81%24%6%-16%-25%-36%59%87%68%43%107%76%40%63%42%-84%4%-125%1%49%-86%77%-82%70%24%-120%54%-39%-57%44%18%35%-110%62%104%-91%-83%10%-108%32%-94%64%40%92%-10%-79%-120%-118%8%23%82%-101%26%-124%22%65%41%4%69%-117%-118%-124%114%17%52%65%-108%9%105%-47%-28%116%26%107%76%-13%-34%-21%-67%112%-49%-5%60%-1%-64%111%49%103%120%-97%123%-34%3%61%118%-78%37%84%118%-89%61%115%-30%-123%14%29%76%39%16%41%106%-29%72%120%44%19%-51%42%100%-61%-77%-48%-40%-11%-56%24%-102%71%-119%-104%-38%-10%-114%-121%-63%74%101%121%24%84%-37%4%15%-125%-35%17%70%51%-124%-63%62%62%21%2%-21%55%-125%-63%-23%-2%30%-116%-99%54%-124%-95%-12%124%-114%-121%-95%-20%66%-98%-121%97%-7%-75%0%-51%36%-122%-8%32%17%67%-19%61%34%-122%-75%-113%-120%24%26%-122%-119%24%-102%94%19%49%-75%-27%45%15%-125%74%-67%-25%97%-80%118%-114%-13%48%-60%14%-8%-116%0%9%12%-79%-61%-34%35%64%4%-125%-45%-27%-87%-55%96%112%-50%120%-115%0%-12%-120%96%40%-21%-101%-10%-64%14%-55%96%88%-26%49%2%-48%33%-124%33%126%-117%-120%-95%-58%53%2%4%49%-84%121%72%-60%-48%48%66%-60%-48%-8%-110%-120%-87%-83%-93%60%12%42%-103%-27%97%-80%118%124%-28%97%-80%-38%39%120%24%-20%-125%83%60%-84%-16%21%-16%-115%-121%-63%-23%-51%-15%-80%-62%8%-56%-15%48%-108%95%-3%-59%-61%-80%-30%-58%31%108%23%5%67%85%102%6%-37%-50%-63%80%-5%-128%-120%97%-3%19%34%-122%-42%28%17%-85%120%78%-60%-86%-77%60%-52%-18%-28%-3%102%-86%117%-100%-121%37%-34%-16%-114%126%-35%48%-17%79%29%-65%-85%105%88%-23%-59%60%13%-117%117%-3%-48%44%-52%-38%59%-87%105%88%-53%7%77%-61%-26%106%-79%60%-74%122%104%-82%-54%109%18%-74%42%110%-50%43%-87%-11%-78%86%-55%-39%60%13%-77%-113%-52%-65%57%-106%-59%84%-37%23%77%-61%54%-1%-65%55%17%-59%-22%-97%106%26%86%117%95%-45%-80%37%-105%53%13%115%122%126%-46%48%-69%-3%-21%66%75%12%83%-55%-49%46%75%12%-101%-87%28%44%-84%-18%-79%-121%37%-124%85%-34%-15%-78%100%-80%98%-27%-96%96%-77%-107%-61%-115%85%27%-73%-84%125%-18%67%95%-60%-52%-25%95%-27%32%96%-115%-81%-4%44%-13%-40%-86%33%95%-53%56%-74%-44%125%51%44%-122%-107%-100%91%108%-19%105%-42%-78%-113%46%-70%-84%54%106%45%-88%28%-78%88%115%-64%83%13%-109%-42%-70%-96%39%47%6%-83%-107%-103%0%-53%32%86%-18%-86%28%114%-104%-45%-21%-86%28%98%-104%-75%127%50%-48%50%-123%-87%-92%-33%82%85%0%75%-116%-123%-80%12%97%53%-31%94%-107%25%-79%-2%-34%114%-124%-64%84%116%-85%-92%63%-24%-119%-53%44%-42%20%-39%-78%-70%125%42%-121%27%-69%93%25%-77%109%43%-118%-107%14%113%-24%-117%-104%-2%52%56%48%112%-91%-49%55%-89%-114%-7%38%-99%42%100%-49%-91%-48%-106%-2%13%-127%31%98%-1%-55%30%-37%-42%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_44RX8DrSEeGKkdk54CX6PQ" source="image_papyrus">
- <details xmi:id="_44R_ADrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
- <details xmi:id="_PhMv0DrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjPullConsumer"/>
+ <icon xmi:type="uml:Image" xmi:id="_kZGdADl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%108%0%0%0%97%8%0%0%0%0%22%-109%27%-49%0%0%2%-101%73%68%65%84%104%-127%-67%-38%-51%75%84%81%24%6%-16%-25%-36%59%87%68%43%107%76%40%63%42%-84%4%-125%1%49%-86%77%-82%70%24%-120%54%-39%-57%44%18%35%-110%62%104%-91%-83%10%-108%32%-94%64%40%92%-10%-79%-120%-118%8%23%82%-101%26%-124%22%65%41%4%69%-117%-118%-124%114%17%52%65%-108%9%105%-47%-28%116%26%107%76%-13%-34%-21%-67%112%-49%-5%60%-1%-64%111%49%103%120%-97%123%-34%3%61%118%-78%37%84%118%-89%61%115%-30%-123%14%29%76%39%16%41%106%-29%72%120%44%19%-51%42%100%-61%-77%-48%-40%-11%-56%24%-102%71%-119%-104%-38%-10%-114%-121%-63%74%101%121%24%84%-37%4%15%-125%-35%17%70%51%-124%-63%62%62%21%2%-21%55%-125%-63%-23%-2%30%-116%-99%54%-124%-95%-12%124%-114%-121%-95%-20%66%-98%-121%97%-7%-75%0%-51%36%-122%-8%32%17%67%-19%61%34%-122%-75%-113%-120%24%26%-122%-119%24%-102%94%19%49%-75%-27%45%15%-125%74%-67%-25%97%-80%118%-114%-13%48%-60%14%-8%-116%0%9%12%-79%-61%-34%35%64%4%-125%-45%-27%-87%-55%96%112%-50%120%-115%0%-12%-120%96%40%-21%-101%-10%-64%14%-55%96%88%-26%49%2%-48%33%-124%33%126%-117%-120%-95%-58%53%2%4%49%-84%121%72%-60%-48%48%66%-60%-48%-8%-110%-120%-87%-83%-93%60%12%42%-103%-27%97%-80%118%124%-28%97%-80%-38%39%120%24%-20%-125%83%60%-84%-16%21%-16%-115%-121%-63%-23%-51%-15%-80%-62%8%-56%-15%48%-108%95%-3%-59%-61%-80%-30%-58%31%108%23%5%67%85%102%6%-37%-50%-63%80%-5%-128%-120%97%-3%19%34%-122%-42%28%17%-85%120%78%-60%-86%-77%60%-52%-18%-28%-3%102%-86%117%-100%-121%37%-34%-16%-114%126%-35%48%-17%79%29%-65%-85%105%88%-23%-59%60%13%-117%117%-3%-48%44%-52%-38%59%-87%105%88%-53%7%77%-61%-26%106%-79%60%-74%122%104%-82%-54%109%18%-74%42%110%-50%43%-87%-11%-78%86%-55%-39%60%13%-77%-113%-52%-65%57%-106%-59%84%-37%23%77%-61%54%-1%-65%55%17%-59%-22%-97%106%26%86%117%95%-45%-80%37%-105%53%13%115%122%126%-46%48%-69%-3%-21%66%75%12%83%-55%-49%46%75%12%-101%-87%28%44%-84%-18%-79%-121%37%-124%85%-34%-15%-78%100%-80%98%-27%-96%96%-77%-107%-61%-115%85%27%-73%-84%125%-18%67%95%-60%-52%-25%95%-27%32%96%-115%-81%-4%44%-13%-40%-86%33%95%-53%56%-74%-44%125%51%44%-122%-107%-100%91%108%-19%105%-42%-78%-113%46%-70%-84%54%106%45%-88%28%-78%88%115%-64%83%13%-109%-42%-70%-96%39%47%6%-83%-107%-103%0%-53%32%86%-18%-86%28%114%-104%-45%-21%-86%28%98%-104%-75%127%50%-48%50%-123%-87%-92%-33%82%85%0%75%-116%-123%-80%12%97%53%-31%94%-107%25%-79%-2%-34%114%-124%-64%84%116%-85%-92%63%-24%-119%-53%44%-42%20%-39%-78%-70%125%42%-121%27%-69%93%25%-77%109%43%-118%-107%14%113%-24%-117%-104%-2%52%56%48%112%-91%-49%55%-89%-114%-7%38%-99%42%100%-49%-91%-48%-106%-2%13%-127%31%98%-1%-55%30%-37%-42%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_44RX8DrSEeGKkdk54CX6PQ" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_44R_ADrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PhMv0DrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjPullConsumer"/>
</eAnnotations>
</icon>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_Wtq4slDlEd6cwecVIgl9nw" name="PushConsumer">
- <icon xmi:id="_Dh_hUDiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%97%0%0%0%98%8%0%0%0%0%101%-7%-30%-47%0%0%2%120%73%68%65%84%104%-127%-75%-38%-51%75%21%81%24%6%-16%-125%-106%105%25%-106%38%-107%84%-76%50%-119%-54%32%90%37%-75%-120%72%-94%69%-117%104%85%86%-46%-90%112%97%73%33%-47%-86%-123%16%33%70%17%-47%-54%-94%47%-24%3%-63%34%-56%-115%20%-35%77%4%-110%65%-123%27%11%51%37%-107%-16%-93%-85%-34%105%-26%-23%74%31%115%-18%120%103%-18%97%-50%-5%60%127%-64%-4%86%103%-26%61%-49%59%10%-99%23%-102%121%105%31%-127%122%-80%72%17%-77%-96%98%68%85%51%-127%116%-82%-87%26%-78%112%76%-35%34%11%117%106%-74%-98%45%32%121%-124%45%96%124%55%91%-64%-40%46%-74%-128%-127%-51%108%1%-3%-107%108%1%61%107%-40%2%-34%-106%-78%5%116%-111%8%95%-64%-45%34%-74%-32%-35%-90%16%-102%0%-17%106%62%89%-128%-45%66%32%50%4%56%-115%108%1%-45%39%-39%2%-110%7%-39%2%38%14%-80%5%-116%-18%96%11%24%-38%-50%22%-48%-73%-127%45%-32%-29%58%-74%-128%-41%43%-39%2%94%-107%-80%5%116%-120%17%97%2%-18%20%-78%5%-9%-70%16%17%42%-64%-67%40%-13%-94%13%23%-112%58%47%66%68%8%72%29%103%11%-104%58%-52%22%48%-79%-113%45%96%108%15%91%-64%-32%54%-74%-128%47%-101%-40%2%-34%-83%103%11%-24%89%-59%22%-16%-94%-116%45%-32%-39%82%-74%-128%-69%-59%108%1%55%11%-40%-126%123%41%54%97%40%-64%109%-54%35%11%-104%-39%-49%22%-34%-105%-109%-123%-127%-86%-104%-128%-87%-16%99%103%92%-64%80%-104%58%20%27%48%19%82%-89%-29%3%70%-126%-41%106%51%18%-104%8%-9%-84%38%39%3%-95%107%-103%13%96%32%-12%-38%125%30%114%11%-33%108%-81%43%-71%-124%113%-21%-6%44%-121%-112%-76%56%8%70%-126%115%-58%26%-120%22%-68%54%-127%-39%56%82%120%36%81%7%69%9%-35%-53%5%-128%40%-95%-73%66%2%-120%16%6%55%-118%0%-31%-62%100%-4%47%-126%-103%48%45%113%57%-119%18%-100%38%41%32%68%-16%-82%-56%21%126%-39%-123%-57%-126%-67%104%86%33%97%53%108%27%8%31%68%91%-10%44%-62%87%-39%101%-60%124%65%122%103%51%79%-104%-107%-34%59%5%-123%95%103%-123%-127%-96%64%40%-41%3%-62%-109%-59%-46%64%64%72%-84%16%7%50%5%-47%22%52%-101%48%-76%-107%0%-24%-62%-28%94%6%-96%9%-87%58%10%-32%11%-18%57%14%-32%11%55%72%-64%127%-95%-109%-10%63%-62%95%-31%13%107%103%-7%79%-24%91%75%3%-2%8%-33%41%7%65%19%126%-42%18%-127%57%-63%57%-63%4%-46%-126%-37%76%5%-46%66%7%23%80%71%85%-36%86%-57%52%-83%-86%-127%-6%-4%-68%-110%97%-11%-87%44%-93%-3%-54%-41%-78%-80%64%75%-111%-106%37%-59%126%86%111%-47%82%-85%-91%-2%84%58%109%-61%80%24%109%-65%-84%-27%-2%67%63%-49%95%-6%73%124%-42%50%19%28%-127%-94%-14%27%-2%-94%-44%59%115%-35%74%-17%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_7bjNADrSEeGKkdk54CX6PQ" source="image_papyrus">
- <details xmi:id="_7bj0EDrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
- <details xmi:id="_JNOQUDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconPushConsumer"/>
+ <icon xmi:type="uml:Image" xmi:id="_Dh_hUDiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%97%0%0%0%98%8%0%0%0%0%101%-7%-30%-47%0%0%2%120%73%68%65%84%104%-127%-75%-38%-51%75%21%81%24%6%-16%-125%-106%105%25%-106%38%-107%84%-76%50%-119%-54%32%90%37%-75%-120%72%-94%69%-117%104%85%86%-46%-90%112%97%73%33%-47%-86%-123%16%33%70%17%-47%-54%-94%47%-24%3%-63%34%-56%-115%20%-35%77%4%-110%65%-123%27%11%51%37%-107%-16%-93%-85%-34%105%-26%-23%74%31%115%-18%120%103%-18%97%-50%-5%60%127%-64%-4%86%103%-26%61%-49%59%10%-99%23%-102%121%105%31%-127%122%-80%72%17%-77%-96%98%68%85%51%-127%116%-82%-87%26%-78%112%76%-35%34%11%117%106%-74%-98%45%32%121%-124%45%96%124%55%91%-64%-40%46%-74%-128%-127%-51%108%1%-3%-107%108%1%61%107%-40%2%-34%-106%-78%5%116%-111%8%95%-64%-45%34%-74%-32%-35%-90%16%-102%0%-17%106%62%89%-128%-45%66%32%50%4%56%-115%108%1%-45%39%-39%2%-110%7%-39%2%38%14%-80%5%-116%-18%96%11%24%-38%-50%22%-48%-73%-127%45%-32%-29%58%-74%-128%-41%43%-39%2%94%-107%-80%5%116%-120%17%97%2%-18%20%-78%5%-9%-70%16%17%42%-64%-67%40%-13%-94%13%23%-112%58%47%66%68%8%72%29%103%11%-104%58%-52%22%48%-79%-113%45%96%108%15%91%-64%-32%54%-74%-128%47%-101%-40%2%-34%-83%103%11%-24%89%-59%22%-16%-94%-116%45%-32%-39%82%-74%-128%-69%-59%108%1%55%11%-40%-126%123%41%54%97%40%-64%109%-54%35%11%-104%-39%-49%22%-34%-105%-109%-123%-127%-86%-104%-128%-87%-16%99%103%92%-64%80%-104%58%20%27%48%19%82%-89%-29%3%70%-126%-41%106%51%18%-104%8%-9%-84%38%39%3%-95%107%-103%13%96%32%-12%-38%125%30%114%11%-33%108%-81%43%-71%-124%113%-21%-6%44%-121%-112%-76%56%8%70%-126%115%-58%26%-120%22%-68%54%-127%-39%56%82%120%36%81%7%69%9%-35%-53%5%-128%40%-95%-73%66%2%-120%16%6%55%-118%0%-31%-62%100%-4%47%-126%-103%48%45%113%57%-119%18%-100%38%41%32%68%-16%-82%-56%21%126%-39%-123%-57%-126%-67%104%86%33%97%53%108%27%8%31%68%91%-10%44%-62%87%-39%101%-60%124%65%122%103%51%79%-104%-107%-34%59%5%-123%95%103%-123%-127%-96%64%40%-41%3%-62%-109%-59%-46%64%64%72%-84%16%7%50%5%-47%22%52%-101%48%-76%-107%0%-24%-62%-28%94%6%-96%9%-87%58%10%-32%11%-18%57%14%-32%11%55%72%-64%127%-95%-109%-10%63%-62%95%-31%13%107%103%-7%79%-24%91%75%3%-2%8%-33%41%7%65%19%126%-42%18%-127%57%-63%57%-63%4%-46%-126%-37%76%5%-46%66%7%23%80%71%85%-36%86%-57%52%-83%-86%-127%-6%-4%-68%-110%97%-11%-87%44%-93%-3%-54%-41%-78%-80%64%75%-111%-106%37%-59%126%86%111%-47%82%-85%-91%-2%84%58%109%-61%80%24%109%-65%-84%-27%-2%67%63%-49%95%-6%73%124%-42%50%19%28%-127%-94%-14%27%-2%-94%-44%59%115%-35%74%-17%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7bjNADrSEeGKkdk54CX6PQ" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7bj0EDrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JNOQUDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconPushConsumer"/>
</eAnnotations>
</icon>
- <icon xmi:id="_hwLS8Dl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%108%0%0%0%97%8%0%0%0%0%22%-109%27%-49%0%0%2%-101%73%68%65%84%104%-127%-67%-38%-51%75%84%81%24%6%-16%-25%-36%59%87%68%43%107%76%40%63%42%-84%4%-125%1%49%-86%77%-82%70%24%-120%54%-39%-57%44%18%35%-110%62%104%-91%-83%10%-108%32%-94%64%40%92%-10%-79%-120%-118%8%23%82%-101%26%-124%22%65%41%4%69%-117%-118%-124%114%17%52%65%-108%9%105%-47%-28%116%26%107%76%-13%-34%-21%-67%112%-49%-5%60%-1%-64%111%49%103%120%-97%123%-34%3%61%118%-78%37%84%118%-89%61%115%-30%-123%14%29%76%39%16%41%106%-29%72%120%44%19%-51%42%100%-61%-77%-48%-40%-11%-56%24%-102%71%-119%-104%-38%-10%-114%-121%-63%74%101%121%24%84%-37%4%15%-125%-35%17%70%51%-124%-63%62%62%21%2%-21%55%-125%-63%-23%-2%30%-116%-99%54%-124%-95%-12%124%-114%-121%-95%-20%66%-98%-121%97%-7%-75%0%-51%36%-122%-8%32%17%67%-19%61%34%-122%-75%-113%-120%24%26%-122%-119%24%-102%94%19%49%-75%-27%45%15%-125%74%-67%-25%97%-80%118%-114%-13%48%-60%14%-8%-116%0%9%12%-79%-61%-34%35%64%4%-125%-45%-27%-87%-55%96%112%-50%120%-115%0%-12%-120%96%40%-21%-101%-10%-64%14%-55%96%88%-26%49%2%-48%33%-124%33%126%-117%-120%-95%-58%53%2%4%49%-84%121%72%-60%-48%48%66%-60%-48%-8%-110%-120%-87%-83%-93%60%12%42%-103%-27%97%-80%118%124%-28%97%-80%-38%39%120%24%-20%-125%83%60%-84%-16%21%-16%-115%-121%-63%-23%-51%-15%-80%-62%8%-56%-15%48%-108%95%-3%-59%-61%-80%-30%-58%31%108%23%5%67%85%102%6%-37%-50%-63%80%-5%-128%-120%97%-3%19%34%-122%-42%28%17%-85%120%78%-60%-86%-77%60%-52%-18%-28%-3%102%-86%117%-100%-121%37%-34%-16%-114%126%-35%48%-17%79%29%-65%-85%105%88%-23%-59%60%13%-117%117%-3%-48%44%-52%-38%59%-87%105%88%-53%7%77%-61%-26%106%-79%60%-74%122%104%-82%-54%109%18%-74%42%110%-50%43%-87%-11%-78%86%-55%-39%60%13%-77%-113%-52%-65%57%-106%-59%84%-37%23%77%-61%54%-1%-65%55%17%-59%-22%-97%106%26%86%117%95%-45%-80%37%-105%53%13%115%122%126%-46%48%-69%-3%-21%66%75%12%83%-55%-49%46%75%12%-101%-87%28%44%-84%-18%-79%-121%37%-124%85%-34%-15%-78%100%-80%98%-27%-96%96%-77%-107%-61%-115%85%27%-73%-84%125%-18%67%95%-60%-52%-25%95%-27%32%96%-115%-81%-4%44%-13%-40%-86%33%95%-53%56%-74%-44%125%51%44%-122%-107%-100%91%108%-19%105%-42%-78%-113%46%-70%-84%54%106%45%-88%28%-78%88%115%-64%83%13%-109%-42%-70%-96%39%47%6%-83%-107%-103%0%-53%32%86%-18%-86%28%114%-104%-45%-21%-86%28%98%-104%-75%127%50%-48%50%-123%-87%-92%-33%82%85%0%75%-116%-123%-80%12%97%53%-31%94%-107%25%-79%-2%-34%114%-124%-64%84%116%-85%-92%63%-24%-119%-53%44%-42%20%-39%-78%-70%125%42%-121%27%-69%93%25%-77%109%43%-118%-107%14%113%-24%-117%-104%-2%52%56%48%112%-91%-49%55%-89%-114%-7%38%-99%42%100%-49%-91%-48%-106%-2%13%-127%31%98%-1%-55%30%-37%-42%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_8L9WQDrSEeGKkdk54CX6PQ" source="image_papyrus">
- <details xmi:id="_8L99UDrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
- <details xmi:id="_Lb68gDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjPushConsumer"/>
+ <icon xmi:type="uml:Image" xmi:id="_hwLS8Dl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%108%0%0%0%97%8%0%0%0%0%22%-109%27%-49%0%0%2%-101%73%68%65%84%104%-127%-67%-38%-51%75%84%81%24%6%-16%-25%-36%59%87%68%43%107%76%40%63%42%-84%4%-125%1%49%-86%77%-82%70%24%-120%54%-39%-57%44%18%35%-110%62%104%-91%-83%10%-108%32%-94%64%40%92%-10%-79%-120%-118%8%23%82%-101%26%-124%22%65%41%4%69%-117%-118%-124%114%17%52%65%-108%9%105%-47%-28%116%26%107%76%-13%-34%-21%-67%112%-49%-5%60%-1%-64%111%49%103%120%-97%123%-34%3%61%118%-78%37%84%118%-89%61%115%-30%-123%14%29%76%39%16%41%106%-29%72%120%44%19%-51%42%100%-61%-77%-48%-40%-11%-56%24%-102%71%-119%-104%-38%-10%-114%-121%-63%74%101%121%24%84%-37%4%15%-125%-35%17%70%51%-124%-63%62%62%21%2%-21%55%-125%-63%-23%-2%30%-116%-99%54%-124%-95%-12%124%-114%-121%-95%-20%66%-98%-121%97%-7%-75%0%-51%36%-122%-8%32%17%67%-19%61%34%-122%-75%-113%-120%24%26%-122%-119%24%-102%94%19%49%-75%-27%45%15%-125%74%-67%-25%97%-80%118%-114%-13%48%-60%14%-8%-116%0%9%12%-79%-61%-34%35%64%4%-125%-45%-27%-87%-55%96%112%-50%120%-115%0%-12%-120%96%40%-21%-101%-10%-64%14%-55%96%88%-26%49%2%-48%33%-124%33%126%-117%-120%-95%-58%53%2%4%49%-84%121%72%-60%-48%48%66%-60%-48%-8%-110%-120%-87%-83%-93%60%12%42%-103%-27%97%-80%118%124%-28%97%-80%-38%39%120%24%-20%-125%83%60%-84%-16%21%-16%-115%-121%-63%-23%-51%-15%-80%-62%8%-56%-15%48%-108%95%-3%-59%-61%-80%-30%-58%31%108%23%5%67%85%102%6%-37%-50%-63%80%-5%-128%-120%97%-3%19%34%-122%-42%28%17%-85%120%78%-60%-86%-77%60%-52%-18%-28%-3%102%-86%117%-100%-121%37%-34%-16%-114%126%-35%48%-17%79%29%-65%-85%105%88%-23%-59%60%13%-117%117%-3%-48%44%-52%-38%59%-87%105%88%-53%7%77%-61%-26%106%-79%60%-74%122%104%-82%-54%109%18%-74%42%110%-50%43%-87%-11%-78%86%-55%-39%60%13%-77%-113%-52%-65%57%-106%-59%84%-37%23%77%-61%54%-1%-65%55%17%-59%-22%-97%106%26%86%117%95%-45%-80%37%-105%53%13%115%122%126%-46%48%-69%-3%-21%66%75%12%83%-55%-49%46%75%12%-101%-87%28%44%-84%-18%-79%-121%37%-124%85%-34%-15%-78%100%-80%98%-27%-96%96%-77%-107%-61%-115%85%27%-73%-84%125%-18%67%95%-60%-52%-25%95%-27%32%96%-115%-81%-4%44%-13%-40%-86%33%95%-53%56%-74%-44%125%51%44%-122%-107%-100%91%108%-19%105%-42%-78%-113%46%-70%-84%54%106%45%-88%28%-78%88%115%-64%83%13%-109%-42%-70%-96%39%47%6%-83%-107%-103%0%-53%32%86%-18%-86%28%114%-104%-45%-21%-86%28%98%-104%-75%127%50%-48%50%-123%-87%-92%-33%82%85%0%75%-116%-123%-80%12%97%53%-31%94%-107%25%-79%-2%-34%114%-124%-64%84%116%-85%-92%63%-24%-119%-53%44%-42%20%-39%-78%-70%125%42%-121%27%-69%93%25%-77%109%43%-118%-107%14%113%-24%-117%-104%-2%52%56%48%112%-91%-49%55%-89%-114%-7%38%-99%42%100%-49%-91%-48%-106%-2%13%-127%31%98%-1%-55%30%-37%-42%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8L9WQDrSEeGKkdk54CX6PQ" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8L99UDrSEeGKkdk54CX6PQ" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Lb68gDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjPushConsumer"/>
</eAnnotations>
</icon>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_WtrfwlDlEd6cwecVIgl9nw" name="PushProducer">
- <icon xmi:id="_Eu1u8DiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%108%0%0%0%97%8%0%0%0%0%22%-109%27%-49%0%0%2%-101%73%68%65%84%104%-127%-67%-38%-51%75%84%81%24%6%-16%-25%-36%59%87%68%43%107%76%40%63%42%-84%4%-125%1%49%-86%77%-82%70%24%-120%54%-39%-57%44%18%35%-110%62%104%-91%-83%10%-108%32%-94%64%40%92%-10%-79%-120%-118%8%23%82%-101%26%-124%22%65%41%4%69%-117%-118%-124%114%17%52%65%-108%9%105%-47%-28%116%26%107%76%-13%-34%-21%-67%112%-49%-5%60%-1%-64%111%49%103%120%-97%123%-34%3%61%118%-78%37%84%118%-89%61%115%-30%-123%14%29%76%39%16%41%106%-29%72%120%44%19%-51%42%100%-61%-77%-48%-40%-11%-56%24%-102%71%-119%-104%-38%-10%-114%-121%-63%74%101%121%24%84%-37%4%15%-125%-35%17%70%51%-124%-63%62%62%21%2%-21%55%-125%-63%-23%-2%30%-116%-99%54%-124%-95%-12%124%-114%-121%-95%-20%66%-98%-121%97%-7%-75%0%-51%36%-122%-8%32%17%67%-19%61%34%-122%-75%-113%-120%24%26%-122%-119%24%-102%94%19%49%-75%-27%45%15%-125%74%-67%-25%97%-80%118%-114%-13%48%-60%14%-8%-116%0%9%12%-79%-61%-34%35%64%4%-125%-45%-27%-87%-55%96%112%-50%120%-115%0%-12%-120%96%40%-21%-101%-10%-64%14%-55%96%88%-26%49%2%-48%33%-124%33%126%-117%-120%-95%-58%53%2%4%49%-84%121%72%-60%-48%48%66%-60%-48%-8%-110%-120%-87%-83%-93%60%12%42%-103%-27%97%-80%118%124%-28%97%-80%-38%39%120%24%-20%-125%83%60%-84%-16%21%-16%-115%-121%-63%-23%-51%-15%-80%-62%8%-56%-15%48%-108%95%-3%-59%-61%-80%-30%-58%31%108%23%5%67%85%102%6%-37%-50%-63%80%-5%-128%-120%97%-3%19%34%-122%-42%28%17%-85%120%78%-60%-86%-77%60%-52%-18%-28%-3%102%-86%117%-100%-121%37%-34%-16%-114%126%-35%48%-17%79%29%-65%-85%105%88%-23%-59%60%13%-117%117%-3%-48%44%-52%-38%59%-87%105%88%-53%7%77%-61%-26%106%-79%60%-74%122%104%-82%-54%109%18%-74%42%110%-50%43%-87%-11%-78%86%-55%-39%60%13%-77%-113%-52%-65%57%-106%-59%84%-37%23%77%-61%54%-1%-65%55%17%-59%-22%-97%106%26%86%117%95%-45%-80%37%-105%53%13%115%122%126%-46%48%-69%-3%-21%66%75%12%83%-55%-49%46%75%12%-101%-87%28%44%-84%-18%-79%-121%37%-124%85%-34%-15%-78%100%-80%98%-27%-96%96%-77%-107%-61%-115%85%27%-73%-84%125%-18%67%95%-60%-52%-25%95%-27%32%96%-115%-81%-4%44%-13%-40%-86%33%95%-53%56%-74%-44%125%51%44%-122%-107%-100%91%108%-19%105%-42%-78%-113%46%-70%-84%54%106%45%-88%28%-78%88%115%-64%83%13%-109%-42%-70%-96%39%47%6%-83%-107%-103%0%-53%32%86%-18%-86%28%114%-104%-45%-21%-86%28%98%-104%-75%127%50%-48%50%-123%-87%-92%-33%82%85%0%75%-116%-123%-80%12%97%53%-31%94%-107%25%-79%-2%-34%114%-124%-64%84%116%-85%-92%63%-24%-119%-53%44%-42%20%-39%-78%-70%125%42%-121%27%-69%93%25%-77%109%43%-118%-107%14%113%-24%-117%-104%-2%52%56%48%112%-91%-49%55%-89%-114%-7%38%-99%42%100%-49%-91%-48%-106%-2%13%-127%31%98%-1%-55%30%-37%-42%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_EVcCADrXEeGMCcwsbpLuFA" source="image_papyrus">
- <details xmi:id="_EVdQIDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconPushProducer"/>
- <details xmi:id="_Eg1ZsDrXEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
+ <icon xmi:type="uml:Image" xmi:id="_Eu1u8DiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%108%0%0%0%97%8%0%0%0%0%22%-109%27%-49%0%0%2%-101%73%68%65%84%104%-127%-67%-38%-51%75%84%81%24%6%-16%-25%-36%59%87%68%43%107%76%40%63%42%-84%4%-125%1%49%-86%77%-82%70%24%-120%54%-39%-57%44%18%35%-110%62%104%-91%-83%10%-108%32%-94%64%40%92%-10%-79%-120%-118%8%23%82%-101%26%-124%22%65%41%4%69%-117%-118%-124%114%17%52%65%-108%9%105%-47%-28%116%26%107%76%-13%-34%-21%-67%112%-49%-5%60%-1%-64%111%49%103%120%-97%123%-34%3%61%118%-78%37%84%118%-89%61%115%-30%-123%14%29%76%39%16%41%106%-29%72%120%44%19%-51%42%100%-61%-77%-48%-40%-11%-56%24%-102%71%-119%-104%-38%-10%-114%-121%-63%74%101%121%24%84%-37%4%15%-125%-35%17%70%51%-124%-63%62%62%21%2%-21%55%-125%-63%-23%-2%30%-116%-99%54%-124%-95%-12%124%-114%-121%-95%-20%66%-98%-121%97%-7%-75%0%-51%36%-122%-8%32%17%67%-19%61%34%-122%-75%-113%-120%24%26%-122%-119%24%-102%94%19%49%-75%-27%45%15%-125%74%-67%-25%97%-80%118%-114%-13%48%-60%14%-8%-116%0%9%12%-79%-61%-34%35%64%4%-125%-45%-27%-87%-55%96%112%-50%120%-115%0%-12%-120%96%40%-21%-101%-10%-64%14%-55%96%88%-26%49%2%-48%33%-124%33%126%-117%-120%-95%-58%53%2%4%49%-84%121%72%-60%-48%48%66%-60%-48%-8%-110%-120%-87%-83%-93%60%12%42%-103%-27%97%-80%118%124%-28%97%-80%-38%39%120%24%-20%-125%83%60%-84%-16%21%-16%-115%-121%-63%-23%-51%-15%-80%-62%8%-56%-15%48%-108%95%-3%-59%-61%-80%-30%-58%31%108%23%5%67%85%102%6%-37%-50%-63%80%-5%-128%-120%97%-3%19%34%-122%-42%28%17%-85%120%78%-60%-86%-77%60%-52%-18%-28%-3%102%-86%117%-100%-121%37%-34%-16%-114%126%-35%48%-17%79%29%-65%-85%105%88%-23%-59%60%13%-117%117%-3%-48%44%-52%-38%59%-87%105%88%-53%7%77%-61%-26%106%-79%60%-74%122%104%-82%-54%109%18%-74%42%110%-50%43%-87%-11%-78%86%-55%-39%60%13%-77%-113%-52%-65%57%-106%-59%84%-37%23%77%-61%54%-1%-65%55%17%-59%-22%-97%106%26%86%117%95%-45%-80%37%-105%53%13%115%122%126%-46%48%-69%-3%-21%66%75%12%83%-55%-49%46%75%12%-101%-87%28%44%-84%-18%-79%-121%37%-124%85%-34%-15%-78%100%-80%98%-27%-96%96%-77%-107%-61%-115%85%27%-73%-84%125%-18%67%95%-60%-52%-25%95%-27%32%96%-115%-81%-4%44%-13%-40%-86%33%95%-53%56%-74%-44%125%51%44%-122%-107%-100%91%108%-19%105%-42%-78%-113%46%-70%-84%54%106%45%-88%28%-78%88%115%-64%83%13%-109%-42%-70%-96%39%47%6%-83%-107%-103%0%-53%32%86%-18%-86%28%114%-104%-45%-21%-86%28%98%-104%-75%127%50%-48%50%-123%-87%-92%-33%82%85%0%75%-116%-123%-80%12%97%53%-31%94%-107%25%-79%-2%-34%114%-124%-64%84%116%-85%-92%63%-24%-119%-53%44%-42%20%-39%-78%-70%125%42%-121%27%-69%93%25%-77%109%43%-118%-107%14%113%-24%-117%-104%-2%52%56%48%112%-91%-49%55%-89%-114%-7%38%-99%42%100%-49%-91%-48%-106%-2%13%-127%31%98%-1%-55%30%-37%-42%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EVcCADrXEeGMCcwsbpLuFA" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EVdQIDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconPushProducer"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Eg1ZsDrXEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
</eAnnotations>
</icon>
- <icon xmi:id="_djiTYDl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%97%0%0%0%98%8%0%0%0%0%101%-7%-30%-47%0%0%2%120%73%68%65%84%104%-127%-75%-38%-51%75%21%81%24%6%-16%-125%-106%105%25%-106%38%-107%84%-76%50%-119%-54%32%90%37%-75%-120%72%-94%69%-117%104%85%86%-46%-90%112%97%73%33%-47%-86%-123%16%33%70%17%-47%-54%-94%47%-24%3%-63%34%-56%-115%20%-35%77%4%-110%65%-123%27%11%51%37%-107%-16%-93%-85%-34%105%-26%-23%74%31%115%-18%120%103%-18%97%-50%-5%60%127%-64%-4%86%103%-26%61%-49%59%10%-99%23%-102%121%105%31%-127%122%-80%72%17%-77%-96%98%68%85%51%-127%116%-82%-87%26%-78%112%76%-35%34%11%117%106%-74%-98%45%32%121%-124%45%96%124%55%91%-64%-40%46%-74%-128%-127%-51%108%1%-3%-107%108%1%61%107%-40%2%-34%-106%-78%5%116%-111%8%95%-64%-45%34%-74%-32%-35%-90%16%-102%0%-17%106%62%89%-128%-45%66%32%50%4%56%-115%108%1%-45%39%-39%2%-110%7%-39%2%38%14%-80%5%-116%-18%96%11%24%-38%-50%22%-48%-73%-127%45%-32%-29%58%-74%-128%-41%43%-39%2%94%-107%-80%5%116%-120%17%97%2%-18%20%-78%5%-9%-70%16%17%42%-64%-67%40%-13%-94%13%23%-112%58%47%66%68%8%72%29%103%11%-104%58%-52%22%48%-79%-113%45%96%108%15%91%-64%-32%54%-74%-128%47%-101%-40%2%-34%-83%103%11%-24%89%-59%22%-16%-94%-116%45%-32%-39%82%-74%-128%-69%-59%108%1%55%11%-40%-126%123%41%54%97%40%-64%109%-54%35%11%-104%-39%-49%22%-34%-105%-109%-123%-127%-86%-104%-128%-87%-16%99%103%92%-64%80%-104%58%20%27%48%19%82%-89%-29%3%70%-126%-41%106%51%18%-104%8%-9%-84%38%39%3%-95%107%-103%13%96%32%-12%-38%125%30%114%11%-33%108%-81%43%-71%-124%113%-21%-6%44%-121%-112%-76%56%8%70%-126%115%-58%26%-120%22%-68%54%-127%-39%56%82%120%36%81%7%69%9%-35%-53%5%-128%40%-95%-73%66%2%-120%16%6%55%-118%0%-31%-62%100%-4%47%-126%-103%48%45%113%57%-119%18%-100%38%41%32%68%-16%-82%-56%21%126%-39%-123%-57%-126%-67%104%86%33%97%53%108%27%8%31%68%91%-10%44%-62%87%-39%101%-60%124%65%122%103%51%79%-104%-107%-34%59%5%-123%95%103%-123%-127%-96%64%40%-41%3%-62%-109%-59%-46%64%64%72%-84%16%7%50%5%-47%22%52%-101%48%-76%-107%0%-24%-62%-28%94%6%-96%9%-87%58%10%-32%11%-18%57%14%-32%11%55%72%-64%127%-95%-109%-10%63%-62%95%-31%13%107%103%-7%79%-24%91%75%3%-2%8%-33%41%7%65%19%126%-42%18%-127%57%-63%57%-63%4%-46%-126%-37%76%5%-46%66%7%23%80%71%85%-36%86%-57%52%-83%-86%-127%-6%-4%-68%-110%97%-11%-87%44%-93%-3%-54%-41%-78%-80%64%75%-111%-106%37%-59%126%86%111%-47%82%-85%-91%-2%84%58%109%-61%80%24%109%-65%-84%-27%-2%67%63%-49%95%-6%73%124%-42%50%19%28%-127%-94%-14%27%-2%-94%-44%59%115%-35%74%-17%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_GvSOQDrXEeGMCcwsbpLuFA" source="image_papyrus">
- <details xmi:id="_GvS1UDrXEeGMCcwsbpLuFA" key="image_name_key" value="ConjIconPushProducer"/>
- <details xmi:id="_G5-bUDrXEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
+ <icon xmi:type="uml:Image" xmi:id="_djiTYDl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%97%0%0%0%98%8%0%0%0%0%101%-7%-30%-47%0%0%2%120%73%68%65%84%104%-127%-75%-38%-51%75%21%81%24%6%-16%-125%-106%105%25%-106%38%-107%84%-76%50%-119%-54%32%90%37%-75%-120%72%-94%69%-117%104%85%86%-46%-90%112%97%73%33%-47%-86%-123%16%33%70%17%-47%-54%-94%47%-24%3%-63%34%-56%-115%20%-35%77%4%-110%65%-123%27%11%51%37%-107%-16%-93%-85%-34%105%-26%-23%74%31%115%-18%120%103%-18%97%-50%-5%60%127%-64%-4%86%103%-26%61%-49%59%10%-99%23%-102%121%105%31%-127%122%-80%72%17%-77%-96%98%68%85%51%-127%116%-82%-87%26%-78%112%76%-35%34%11%117%106%-74%-98%45%32%121%-124%45%96%124%55%91%-64%-40%46%-74%-128%-127%-51%108%1%-3%-107%108%1%61%107%-40%2%-34%-106%-78%5%116%-111%8%95%-64%-45%34%-74%-32%-35%-90%16%-102%0%-17%106%62%89%-128%-45%66%32%50%4%56%-115%108%1%-45%39%-39%2%-110%7%-39%2%38%14%-80%5%-116%-18%96%11%24%-38%-50%22%-48%-73%-127%45%-32%-29%58%-74%-128%-41%43%-39%2%94%-107%-80%5%116%-120%17%97%2%-18%20%-78%5%-9%-70%16%17%42%-64%-67%40%-13%-94%13%23%-112%58%47%66%68%8%72%29%103%11%-104%58%-52%22%48%-79%-113%45%96%108%15%91%-64%-32%54%-74%-128%47%-101%-40%2%-34%-83%103%11%-24%89%-59%22%-16%-94%-116%45%-32%-39%82%-74%-128%-69%-59%108%1%55%11%-40%-126%123%41%54%97%40%-64%109%-54%35%11%-104%-39%-49%22%-34%-105%-109%-123%-127%-86%-104%-128%-87%-16%99%103%92%-64%80%-104%58%20%27%48%19%82%-89%-29%3%70%-126%-41%106%51%18%-104%8%-9%-84%38%39%3%-95%107%-103%13%96%32%-12%-38%125%30%114%11%-33%108%-81%43%-71%-124%113%-21%-6%44%-121%-112%-76%56%8%70%-126%115%-58%26%-120%22%-68%54%-127%-39%56%82%120%36%81%7%69%9%-35%-53%5%-128%40%-95%-73%66%2%-120%16%6%55%-118%0%-31%-62%100%-4%47%-126%-103%48%45%113%57%-119%18%-100%38%41%32%68%-16%-82%-56%21%126%-39%-123%-57%-126%-67%104%86%33%97%53%108%27%8%31%68%91%-10%44%-62%87%-39%101%-60%124%65%122%103%51%79%-104%-107%-34%59%5%-123%95%103%-123%-127%-96%64%40%-41%3%-62%-109%-59%-46%64%64%72%-84%16%7%50%5%-47%22%52%-101%48%-76%-107%0%-24%-62%-28%94%6%-96%9%-87%58%10%-32%11%-18%57%14%-32%11%55%72%-64%127%-95%-109%-10%63%-62%95%-31%13%107%103%-7%79%-24%91%75%3%-2%8%-33%41%7%65%19%126%-42%18%-127%57%-63%57%-63%4%-46%-126%-37%76%5%-46%66%7%23%80%71%85%-36%86%-57%52%-83%-86%-127%-6%-4%-68%-110%97%-11%-87%44%-93%-3%-54%-41%-78%-80%64%75%-111%-106%37%-59%126%86%111%-47%82%-85%-91%-2%84%58%109%-61%80%24%109%-65%-84%-27%-2%67%63%-49%95%-6%73%124%-42%50%19%28%-127%-94%-14%27%-2%-94%-44%59%115%-35%74%-17%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GvSOQDrXEeGMCcwsbpLuFA" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GvS1UDrXEeGMCcwsbpLuFA" key="image_name_key" value="ConjIconPushProducer"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_G5-bUDrXEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
</eAnnotations>
</icon>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_Wtrfw1DlEd6cwecVIgl9nw" name="UseInterface">
- <icon xmi:id="_FzdNoDiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%84%0%0%0%101%8%3%0%0%0%-28%-109%52%-5%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-52%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%82%82%82%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%24%24%24%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-33%61%-9%-93%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%41%73%68%65%84%104%-127%-83%-39%125%91%-38%48%16%0%-16%-29%101%12%-76%32%32%69%17%-95%88%-107%23%-69%45%-43%90%-83%5%117%-32%-9%-1%78%-125%103%-37%67%47%109%115%-105%54%-9%119%-8%61%41%73%-109%-69%43%-120%-14%17%92%86%-105%86%56%-116%15%49%12%-83%-42%26%74%-126%-35%-54%106%8%82%84%74%-95%-125%-58%-117%12%30%98%84%28%125%-84%-74%-99%44%18%-96%87%20%125%-84%127%100%-117%0%83%81%12%85%-112%0%-61%98%-24%-83%-126%4%120%42%-126%-66%61%-87%72%-128%7%125%-44%-97%79%-43%38%-52%-75%-47%-2%25%65%2%-72%-70%-24%104%67%-102%-80%-43%68%107%57%59%19%69%-92%-121%46%25%36%-128%-81%-123%54%115%-99%-15%-85%-41%-88%110%15%81%-83%-51%-123%6%-22%63%100%-125%-45%-50%-3%-91%52%-108%-113%-98%100%-110%-81%-75%94%122%40%27%-99%103%-111%-42%58%115%44%23%-67%-31%-109%108%116%-108%-34%75%-101%93%-18%104%30%-38%77%-17%-7%102%-112%63%-100%-121%-2%72%-19%-95%47%-43%112%22%122%39%-101%118%-92%28%-49%65%-93%-119%100%-122%-118%71%-25%-94%-14%-61%119%8%-109%-125%110%37%-13%-52%-89%126%65%-93%-66%116%-81%15%-87%121%114%-48%26%54%63%-6%-28%47%104%-44%-57%91%-44%-71%-94%77%26%-67%-59%19%-99%51%76%26%-75%-15%102%34%23%-119%-125%86%-16%-61%-65%113%76%18%-75%16%-38%98%-103%20%-38%67%-89%-45%-17%-82%17%20%47%-45%61%-49%-92%-48%48%105%-114%-103%19%37%-48%1%-102%104%-109%105%18%-88%-117%-48%-127%25%-44%67%123%-108%107%18%104%-100%68%-17%-52%-96%17%122%-6%-116%11%-66%8%58%75%-102%54%-37%84%-93%40%-127%96%-66%77%36%-118%-18%-111%-118%33%-12%60%-119%50%14%103%22%58%78%-104%19%-66%-87%68%-125%-126%-21%116%64%-3%-111%91%91%36%-93%-27%-3%-115%95%73%-12%84%11%29%93%0%39%60%29%-12%-115%42%-117%-2%-59%82%7%125%-26%-103%-80%-48%65%57%69%-116%54%-54%13%45%-108%-7%-105%-62%119%29%-12%39%19%-43%90%-3%-63%-104%6%15%-47%-42%65%69%-60%91%127%-51%55%74%116%-81%-73%-57%-72%-114%-114%-15%-103%64%29%77%52%55%-48%5%-51%-53%120%104%20%85%-93%51%67%-24%-73%36%-70%50%-124%-94%-108%111%104%8%-19%-93%-11%103%-25%18%-60%-67%-113%106%-120%-70%33%116%-107%68%-49%13%-95%51%-12%-4%-20%77%-91%70%-5%-24%96%100%-33%-4%68%126%-118%58%112%83%51%-7%-87%-108%75%114%-49%84%2%13%-48%113%-53%77%-91%-87%-22%-28%20%77%-107%-7%86%81%-24%14%-95%78%94%43%70%15%-107%42%-66%23%35%21%-97%-76%85%121%-41%63%93%69%-93%20%29%-100%107%19%-88%92%70%27%-87%-9%83%-99%-119%11%19%-99%9%113%-123%81%70%121%-50%-23%-10%120%-110%-6%108%-96%-37%35%6%-87%-66%20%81%-3%-80%58%104%-82%-124%-62%69%-7%14%90%-6%15%-128%-119%-14%110%-27%-95%65%44%-85%112%82%-70%43%41%46%-45%-55%-31%38%-65%-80%-30%118%122%-85%41%116%-97%-77%-107%-20%-12%74%-119%-59%-1%-80%-34%-53%-95%57%93%126%-69%94%-90%123%46%-35%-41%-57%112%-98%23%35%-23%29%51%-13%69%98%106%91%75%-41%-35%109%-65%92%-9%74%19%21%-115%92%-11%24%15%-70%40%-25%43%-113%-89%-115%-118%119%-14%123%-44%-87%62%42%122%29%2%13%11%-96%-5%13%-85%-82%-68%-118%-95%34%82%78%-42%46%-122%10%113%-93%-8%103%-29%-94%-88%-22%11%111%113%84%-59%-106%64%-9%-73%108%-59%-54%-36%-75%-91%-48%125%-12%-22%97%-38%13%74%-94%-5%8%118%45%27%-61%81%121%-12%16%-2%-70%-46%-16%-38%97%24%-57%113%24%-74%-9%71%-31%31%12%-33%-99%51%8%-119%86%-81%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%45%-25%121%64%-90%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_z5Ar0DrWEeGMCcwsbpLuFA" source="image_papyrus">
- <details xmi:id="_z5BS4DrWEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
- <details xmi:id="_BoRRIDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconUseInterface"/>
+ <icon xmi:type="uml:Image" xmi:id="_FzdNoDiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%84%0%0%0%101%8%3%0%0%0%-28%-109%52%-5%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-52%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%82%82%82%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%24%24%24%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-33%61%-9%-93%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%41%73%68%65%84%104%-127%-83%-39%125%91%-38%48%16%0%-16%-29%101%12%-76%32%32%69%17%-95%88%-107%23%-69%45%-43%90%-83%5%117%-32%-9%-1%78%-125%103%-37%67%47%109%115%-105%54%-9%119%-8%61%41%73%-109%-69%43%-120%-14%17%92%86%-105%86%56%-116%15%49%12%-83%-42%26%74%-126%-35%-54%106%8%82%84%74%-95%-125%-58%-117%12%30%98%84%28%125%-84%-74%-99%44%18%-96%87%20%125%-84%127%100%-117%0%83%81%12%85%-112%0%-61%98%-24%-83%-126%4%120%42%-126%-66%61%-87%72%-128%7%125%-44%-97%79%-43%38%-52%-75%-47%-2%25%65%2%-72%-70%-24%104%67%-102%-80%-43%68%107%57%59%19%69%-92%-121%46%25%36%-128%-81%-123%54%115%-99%-15%-85%-41%-88%110%15%81%-83%-51%-123%6%-22%63%100%-125%-45%-50%-3%-91%52%-108%-113%-98%100%-110%-81%-75%94%122%40%27%-99%103%-111%-42%58%115%44%23%-67%-31%-109%108%116%-108%-34%75%-101%93%-18%104%30%-38%77%-17%-7%102%-112%63%-100%-121%-2%72%-19%-95%47%-43%112%22%122%39%-101%118%-92%28%-49%65%-93%-119%100%-122%-118%71%-25%-94%-14%-61%119%8%-109%-125%110%37%-13%-52%-89%126%65%-93%-66%116%-81%15%-87%121%114%-48%26%54%63%-6%-28%47%104%-44%-57%91%-44%-71%-94%77%26%-67%-59%19%-99%51%76%26%-75%-15%102%34%23%-119%-125%86%-16%-61%-65%113%76%18%-75%16%-38%98%-103%20%-38%67%-89%-45%-17%-82%17%20%47%-45%61%-49%-92%-48%48%105%-114%-103%19%37%-48%1%-102%104%-109%105%18%-88%-117%-48%-127%25%-44%67%123%-108%107%18%104%-100%68%-17%-52%-96%17%122%-6%-116%11%-66%8%58%75%-102%54%-37%84%-93%40%-127%96%-66%77%36%-118%-18%-111%-118%33%-12%60%-119%50%14%103%22%58%78%-104%19%-66%-87%68%-125%-126%-21%116%64%-3%-111%91%91%36%-93%-27%-3%-115%95%73%-12%84%11%29%93%0%39%60%29%-12%-115%42%-117%-2%-59%82%7%125%-26%-103%-80%-48%65%57%69%-116%54%-54%13%45%-108%-7%-105%-62%119%29%-12%39%19%-43%90%-3%-63%-104%6%15%-47%-42%65%69%-60%91%127%-51%55%74%116%-81%-73%-57%-72%-114%-114%-15%-103%64%29%77%52%55%-48%5%-51%-53%120%104%20%85%-93%51%67%-24%-73%36%-70%50%-124%-94%-108%111%104%8%-19%-93%-11%103%-25%18%-60%-67%-113%106%-120%-70%33%116%-107%68%-49%13%-95%51%-12%-4%-20%77%-91%70%-5%-24%96%100%-33%-4%68%126%-118%58%112%83%51%-7%-87%-108%75%114%-49%84%2%13%-48%113%-53%77%-91%-87%-22%-28%20%77%-107%-7%86%81%-24%14%-95%78%94%43%70%15%-107%42%-66%23%35%21%-97%-76%85%121%-41%63%93%69%-93%20%29%-100%107%19%-88%92%70%27%-87%-9%83%-99%-119%11%19%-99%9%113%-123%81%70%121%-50%-23%-10%120%-110%-6%108%-96%-37%35%6%-87%-66%20%81%-3%-80%58%104%-82%-124%-62%69%-7%14%90%-6%15%-128%-119%-14%110%-27%-95%65%44%-85%112%82%-70%43%41%46%-45%-55%-31%38%-65%-80%-30%118%122%-85%41%116%-97%-77%-107%-20%-12%74%-119%-59%-1%-80%-34%-53%-95%57%93%126%-69%94%-90%123%46%-35%-41%-57%112%-98%23%35%-23%29%51%-13%69%98%106%91%75%-41%-35%109%-65%92%-9%74%19%21%-115%92%-11%24%15%-70%40%-25%43%-113%-89%-115%-118%119%-14%123%-44%-87%62%42%122%29%2%13%11%-96%-5%13%-85%-82%-68%-118%-95%34%82%78%-42%46%-122%10%113%-93%-8%103%-29%-94%-88%-22%11%111%113%84%-59%-106%64%-9%-73%108%-59%-54%-36%-75%-91%-48%125%-12%-22%97%-38%13%74%-94%-5%8%118%45%27%-61%81%121%-12%16%-2%-70%-46%-16%-38%97%24%-57%113%24%-74%-9%71%-31%31%12%-33%-99%51%8%-119%86%-81%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%45%-25%121%64%-90%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z5Ar0DrWEeGMCcwsbpLuFA" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z5BS4DrWEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BoRRIDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconUseInterface"/>
</eAnnotations>
</icon>
- <icon xmi:id="_Yy8SMDl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%119%0%0%0%92%8%3%0%0%0%99%-116%-38%77%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%120%120%120%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-71%82%-104%50%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%4%-59%73%68%65%84%104%-127%-59%-102%109%91%-30%58%16%-122%11%-118%40%-88%108%-83%2%-53%-117%93%123%4%-75%-20%110%53%-83%69%-91%-108%30%20%-1%-1%79%58%-107%-77%72%38%77%-109%73%-126%-41%62%95%-55%-52%77%94%-102%-52%76%98%-111%29%104%-2%-74%26%-115%-22%-29%81%-27%-83%31%35%77%44%51%98%-68%58%60%-19%120%22%-91%-27%-76%57%-70%-8%90%-18%-62%127%6%-56%-83%58%-65%-34%-61%47%-30%94%28%-76%-7%-52%63%122%109%-4%-5%5%-36%-59%73%73%79%105%-75%43%59%-26%14%78%-28%-48%-75%-70%-29%-78%-31%-42%-32%94%96%-87%107%-14%96%71%-36%-80%-18%42%96%115%5%-50%46%-72%-117%-82%26%53%-41%-16%-38%-100%-69%127%-91%-116%-51%-43%-116%-52%-72%-15%-67%14%53%87%123%102%-62%117%94%52%-79%-106%-27%-78%-53%75%-127%-101%-88%79%45%5%102%-66%101%60%119%-66%44%117%58%124%-71%15%38%-66%-1%59%-104%-106%-73%-15%-58%122%-36%-92%-60%101%-89%89%-95%63%-108%120%-32%79%75%-42%94%85%-121%-21%100%60%87%-39%36%-31%-76%-75%111%-98%-72%61%-2%-95%-50%-115%121%115%43%-40%127%23%15%-100%-3%-37%-19%41%115%91%69%47%-35%-107%-48%34%-31%-20%-90%-53%-19%-116%-32%-72%-11%-30%127%-81%75%14%88%66%86%-33%11%86%45%53%-18%-96%48%104%47%-123%-115%-128%-93%-8%119%1%92%87%-31%-38%25%107%-34%-112%118%-10%127%-115%-39%51%-60%-21%43%112%27%-84%113%13%71%-51%-43%103%-65%-66%78%-120%-26%-10%-104%81%-10%-86%114%-101%79%37%-20%88%-43%-48%-36%103%3%44%33%51%-90%-57%-18%5%-110%59%102%-2%-16%88%106%1%-107%48%115%28%32%-71%41%52%-13%21%-79%-124%92%-62%121%-14%18%20%-73%2%-79%-33%-112%43%-103%-42%29%116%-47%68%113%97%-108%-4%-54%13%-106%36%10%-65%1%31%87%14%-126%-5%6%-1%-21%72%3%-101%-81%45%120%66%77%16%-36%0%88%60%106%97%-39%-111%-50%-28%-36%8%44%70%-113%119%-22%97%20%-62%-59%121%41%-27%94%-125%-10%-57%-102%88%-10%99%12%-92%92%120%-2%45%-76%-71%33%-40%61%-36%80%-62%13%-63%48%-73%-124%109%-59%58%0%29%-24%75%-72%125%-48%-102%23%-9%99%-27%-128%-51%-29%78%-62%5%-21%-48%45%70%-3%10%2%51%54%-107%112%31%-103%-43%96%-96%17%-19%-22%42%18%115%95%-23%-58%122%123%-58%70%51%-72%66%-123%92%27%-76%-59%-124%54%2%-127%-120%-76%-14%-121%27%-49%120%-86%-46%77%51%51%44%-36%-7%110%63%-72%-47%-92%-115%-88%86%-24%-18%-111%27%-127%47%-23%-34%66%-89%-46%13%67%46%56%80%-97%44%18%103%40%-84%-75%111%-56%-99%-45%-50%-50%45%-46%-60%97%13%-105%51%-77%-96%83%-117%12%-111%92%113%90%34%87%8%-71%9%18%107%-67%25%114%9%-19%-52%-77%46%-1%10%-41%-75%-20%50%14%43%65%-47%15%-91%-104%118%-106%-49%47%-74%106%-79%-21%117%85%45%3%49%58%48%-28%-10%104%103%-7%-9%75%30%112%-36%95%-122%-36%127%104%103%-45%-100%27%-6%-120%93%50%-1%-117%-122%92%-97%118%-42%92%-97%11%73%-19%-8%-119%39%80%39%27%26%114%65%-35%-95%38%60%7%35%-48%-31%-98%-88%-87%92%96%127%122%23%-97%-5%32%-20%-59%103%-37%60%-127%101%-107%-17%86%-62%-58%-57%116%91%-109%112%-110%-112%91%56%103%98%-18%30%-35%-40%-45%-55%-55%62%5%-14%-69%19%9%23%-100%93%70%3%-67%0%-98%-10%100%-7%2%8%-13%59%6%92%88%-101%-103%-53%-72%48%29%-44%-33%-94%29%-112%-119%102%-46%-4%8%-90%-65%-25%-38%92%-80%105%124%36%-64%-78%-4%55%3%6%-17%-102%88%7%6%23%115%57%-9%16%24%100%-102%-87%10%-100%-82%103%34%-25%-62%21%-67%46%17%-88%-117%-119%45%-10%17%92%-72%-83%90%94%-55%-11%-105%80%76%125%115%25%97%-72%-16%-61%-77%-78%51%117%46%83%-119%94%111%3%-14%-70%-39%41%-76%106%41%23%-80%-104%-14%-43%-48%-58%113%7%-48%76%57%29%29%49%-10%119%4%-57%37%108%-11%-6%72%9%91%101%-126%-118%52%-62%114%-49%-40%-56%30%91%-11%-26%97%55%-31%63%-90%-18%-67%-49%-104%90%15%-24%-49%-72%112%49%-15%64%-16%92%-90%-66%-104%-85%-115%43%-96%21%-17%49%95%55%79%29%80%-9%26%78%-31%-82%-52%-67%65%-104%-11%82%-42%108%-101%100%-31%-18%113%126%20%35%-50%-87%-84%-53%118%-77%104%-12%-13%-13%87%-28%-67%-107%95%112%97%121%13%-47%-13%-112%-88%-58%-71%79%-100%110%23%36%-10%126%48%40%122%-79%-68%-96%-84%112%-24%-44%121%-73%-104%93%123%-37%2%-53%13%-7%-113%24%-38%7%-59%42%-113%125%125%-54%77%4%50%58%62%67%-33%-61%-58%-36%59%-50%92%105%112%115%-71%-15%24%-9%-85%71%101%-49%88%-106%96%65%-32%-17%-99%-29%105%-119%-61%-11%-112%-89%-23%75%-102%-118%94%88%64%-84%-54%61%123%-120%76%-32%-72%-22%50%-117%80%-23%61%-61%-111%54%-10%-23%-116%113%-91%-10%126%-93%112%-49%-120%84%113%71%87%124%55%50%19%63%126%-30%107%-56%-119%127%85%-33%-55%68%13%84%-78%76%-21%-111%87%80%85%127%-113%52%127%-106%-93%40%45%-7%85%122%-99%-9%87%123%-27%-81%52%88%93%29%-39%124%31%90%-17%-66%-94%-101%-30%-43%61%-105%-38%40%77%33%53%-33%-71%-123%99%-7%104%103%126%73%95%13%-72%-71%-110%-119%-88%-45%110%32%-82%-17%25%-67%-97%-20%-33%-74%-72%31%-12%-7%-31%74%22%9%25%-66%-37%36%97%127%-4%-13%-76%-67%-119%-4%-68%116%-38%-84%-83%4%-61%-69%51%-18%-89%102%-77%25%-10%-115%-22%-121%-2%3%52%51%-49%67%-105%-19%90%17%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%5%-46%-52%-24%92%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_0rGQEDrWEeGMCcwsbpLuFA" source="image_papyrus">
- <details xmi:id="_0rHeMDrWEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
- <details xmi:id="_C7NfsDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjUseInterface"/>
+ <icon xmi:type="uml:Image" xmi:id="_Yy8SMDl9EeGi35TadupI-A" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%119%0%0%0%92%8%3%0%0%0%99%-116%-38%77%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%120%120%120%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-71%82%-104%50%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%4%-59%73%68%65%84%104%-127%-59%-102%109%91%-30%58%16%-122%11%-118%40%-88%108%-83%2%-53%-117%93%123%4%-75%-20%110%53%-83%69%-91%-108%30%20%-1%-1%79%58%-107%-77%72%38%77%-109%73%-126%-41%62%95%-55%-52%77%94%-102%-52%76%98%-111%29%104%-2%-74%26%-115%-22%-29%81%-27%-83%31%35%77%44%51%98%-68%58%60%-19%120%22%-91%-27%-76%57%-70%-8%90%-18%-62%127%6%-56%-83%58%-65%-34%-61%47%-30%94%28%-76%-7%-52%63%122%109%-4%-5%5%-36%-59%73%73%79%105%-75%43%59%-26%14%78%-28%-48%-75%-70%-29%-78%-31%-42%-32%94%96%-87%107%-14%96%71%-36%-80%-18%42%96%115%5%-50%46%-72%-117%-82%26%53%-41%-16%-38%-100%-69%127%-91%-116%-51%-43%-116%-52%-72%-15%-67%14%53%87%123%102%-62%117%94%52%-79%-106%-27%-78%-53%75%-127%-101%-88%79%45%5%102%-66%101%60%119%-66%44%117%58%124%-71%15%38%-66%-1%59%-104%-106%-73%-15%-58%122%-36%-92%-60%101%-89%89%-95%63%-108%120%-32%79%75%-42%94%85%-121%-21%100%60%87%-39%36%-31%-76%-75%111%-98%-72%61%-2%-95%-50%-115%121%115%43%-40%127%23%15%-100%-3%-37%-19%41%115%91%69%47%-35%-107%-48%34%-31%-20%-90%-53%-19%-116%-32%-72%-11%-30%127%-81%75%14%88%66%86%-33%11%86%45%53%-18%-96%48%104%47%-123%-115%-128%-93%-8%119%1%92%87%-31%-38%25%107%-34%-112%118%-10%127%-115%-39%51%-60%-21%43%112%27%-84%113%13%71%-51%-43%103%-65%-66%78%-120%-26%-10%-104%81%-10%-86%114%-101%79%37%-20%88%-43%-48%-36%103%3%44%33%51%-90%-57%-18%5%-110%59%102%-2%-16%88%106%1%-107%48%115%28%32%-71%41%52%-13%21%-79%-124%92%-62%121%-14%18%20%-73%2%-79%-33%-112%43%-103%-42%29%116%-47%68%113%97%-108%-4%-54%13%-106%36%10%-65%1%31%87%14%-126%-5%6%-1%-21%72%3%-101%-81%45%120%66%77%16%-36%0%88%60%106%97%-39%-111%-50%-28%-36%8%44%70%-113%119%-22%97%20%-62%-59%121%41%-27%94%-125%-10%-57%-102%88%-10%99%12%-92%92%120%-2%45%-76%-71%33%-40%61%-36%80%-62%13%-63%48%-73%-124%109%-59%58%0%29%-24%75%-72%125%-48%-102%23%-9%99%-27%-128%-51%-29%78%-62%5%-21%-48%45%70%-3%10%2%51%54%-107%112%31%-103%-43%96%-96%17%-19%-22%42%18%115%95%-23%-58%122%123%-58%70%51%-72%66%-123%92%27%-76%-59%-124%54%2%-127%-120%-76%-14%-121%27%-49%120%-86%-46%77%51%51%44%-36%-7%110%63%-72%-47%-92%-115%-88%86%-24%-18%-111%27%-127%47%-23%-34%66%-89%-46%13%67%46%56%80%-97%44%18%103%40%-84%-75%111%-56%-99%-45%-50%-50%45%-46%-60%97%13%-105%51%-77%-96%83%-117%12%-111%92%113%90%34%87%8%-71%9%18%107%-67%25%114%9%-19%-52%-77%46%-1%10%-41%-75%-20%50%14%43%65%-47%15%-91%-104%118%-106%-49%47%-74%106%-79%-21%117%85%45%3%49%58%48%-28%-10%104%103%-7%-9%75%30%112%-36%95%-122%-36%127%104%103%-45%-100%27%-6%-120%93%50%-1%-117%-122%92%-97%118%-42%92%-97%11%73%-19%-8%-119%39%80%39%27%26%114%65%-35%-95%38%60%7%35%-48%-31%-98%-88%-87%92%96%127%122%23%-97%-5%32%-20%-59%103%-37%60%-127%101%-107%-17%86%-62%-58%-57%116%91%-109%112%-110%-112%91%56%103%98%-18%30%-35%-40%-45%-55%-55%62%5%-14%-69%19%9%23%-100%93%70%3%-67%0%-98%-10%100%-7%2%8%-13%59%6%92%88%-101%-103%-53%-72%48%29%-44%-33%-94%29%-112%-119%102%-46%-4%8%-90%-65%-25%-38%92%-80%105%124%36%-64%-78%-4%55%3%6%-17%-102%88%7%6%23%115%57%-9%16%24%100%-102%-87%10%-100%-82%103%34%-25%-62%21%-67%46%17%-88%-117%-119%45%-10%17%92%-72%-83%90%94%-55%-11%-105%80%76%125%115%25%97%-72%-16%-61%-77%-78%51%117%46%83%-119%94%111%3%-14%-70%-39%41%-76%106%41%23%-80%-104%-14%-43%-48%-58%113%7%-48%76%57%29%29%49%-10%119%4%-57%37%108%-11%-6%72%9%91%101%-126%-118%52%-62%114%-49%-40%-56%30%91%-11%-26%97%55%-31%63%-90%-18%-67%-49%-104%90%15%-24%-49%-72%112%49%-15%64%-16%92%-90%-66%-104%-85%-115%43%-96%21%-17%49%95%55%79%29%80%-9%26%78%-31%-82%-52%-67%65%-104%-11%82%-42%108%-101%100%-31%-18%113%126%20%35%-50%-87%-84%-53%118%-77%104%-12%-13%-13%87%-28%-67%-107%95%112%97%121%13%-47%-13%-112%-88%-58%-71%79%-100%110%23%36%-10%126%48%40%122%-79%-68%-96%-84%112%-24%-44%121%-73%-104%93%123%-37%2%-53%13%-7%-113%24%-38%7%-59%42%-113%125%125%-54%77%4%50%58%62%67%-33%-61%-58%-36%59%-50%92%105%112%115%-71%-15%24%-9%-85%71%101%-49%88%-106%96%65%-32%-17%-99%-29%105%-119%-61%-11%-112%-89%-23%75%-102%-118%94%88%64%-84%-54%61%123%-120%76%-32%-72%-22%50%-117%80%-23%61%-61%-111%54%-10%-23%-116%113%-91%-10%126%-93%112%-49%-120%84%113%71%87%124%55%50%19%63%126%-30%107%-56%-119%127%85%-33%-55%68%13%84%-78%76%-21%-111%87%80%85%127%-113%52%127%-106%-93%40%45%-7%85%122%-99%-9%87%123%-27%-81%52%88%93%29%-39%124%31%90%-17%-66%-94%-101%-30%-43%61%-105%-38%40%77%33%53%-33%-71%-123%99%-7%104%103%126%73%95%13%-72%-71%-110%-119%-88%-45%110%32%-82%-17%25%-67%-97%-20%-33%-74%-72%31%-12%-7%-31%74%22%9%25%-66%-37%36%97%127%-4%-13%-76%-67%-119%-4%-68%116%-38%-84%-83%4%-61%-69%51%-18%-89%102%-77%25%-10%-115%-22%-121%-2%3%52%51%-49%67%-105%-19%90%17%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%5%-46%-52%-24%92%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_0rGQEDrWEeGMCcwsbpLuFA" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0rHeMDrWEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C7NfsDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjUseInterface"/>
</eAnnotations>
</icon>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="__nMrwLqNEd-SedGzMDDkww" name="AMIpoll">
- <icon xmi:id="_JXZ1gDiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%84%0%0%0%101%8%3%0%0%0%-28%-109%52%-5%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-52%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%82%82%82%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%24%24%24%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-33%61%-9%-93%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%41%73%68%65%84%104%-127%-83%-39%125%91%-38%48%16%0%-16%-29%101%12%-76%32%32%69%17%-95%88%-107%23%-69%45%-43%90%-83%5%117%-32%-9%-1%78%-125%103%-37%67%47%109%115%-105%54%-9%119%-8%61%41%73%-109%-69%43%-120%-14%17%92%86%-105%86%56%-116%15%49%12%-83%-42%26%74%-126%-35%-54%106%8%82%84%74%-95%-125%-58%-117%12%30%98%84%28%125%-84%-74%-99%44%18%-96%87%20%125%-84%127%100%-117%0%83%81%12%85%-112%0%-61%98%-24%-83%-126%4%120%42%-126%-66%61%-87%72%-128%7%125%-44%-97%79%-43%38%-52%-75%-47%-2%25%65%2%-72%-70%-24%104%67%-102%-80%-43%68%107%57%59%19%69%-92%-121%46%25%36%-128%-81%-123%54%115%-99%-15%-85%-41%-88%110%15%81%-83%-51%-123%6%-22%63%100%-125%-45%-50%-3%-91%52%-108%-113%-98%100%-110%-81%-75%94%122%40%27%-99%103%-111%-42%58%115%44%23%-67%-31%-109%108%116%-108%-34%75%-101%93%-18%104%30%-38%77%-17%-7%102%-112%63%-100%-121%-2%72%-19%-95%47%-43%112%22%122%39%-101%118%-92%28%-49%65%-93%-119%100%-122%-118%71%-25%-94%-14%-61%119%8%-109%-125%110%37%-13%-52%-89%126%65%-93%-66%116%-81%15%-87%121%114%-48%26%54%63%-6%-28%47%104%-44%-57%91%-44%-71%-94%77%26%-67%-59%19%-99%51%76%26%-75%-15%102%34%23%-119%-125%86%-16%-61%-65%113%76%18%-75%16%-38%98%-103%20%-38%67%-89%-45%-17%-82%17%20%47%-45%61%-49%-92%-48%48%105%-114%-103%19%37%-48%1%-102%104%-109%105%18%-88%-117%-48%-127%25%-44%67%123%-108%107%18%104%-100%68%-17%-52%-96%17%122%-6%-116%11%-66%8%58%75%-102%54%-37%84%-93%40%-127%96%-66%77%36%-118%-18%-111%-118%33%-12%60%-119%50%14%103%22%58%78%-104%19%-66%-87%68%-125%-126%-21%116%64%-3%-111%91%91%36%-93%-27%-3%-115%95%73%-12%84%11%29%93%0%39%60%29%-12%-115%42%-117%-2%-59%82%7%125%-26%-103%-80%-48%65%57%69%-116%54%-54%13%45%-108%-7%-105%-62%119%29%-12%39%19%-43%90%-3%-63%-104%6%15%-47%-42%65%69%-60%91%127%-51%55%74%116%-81%-73%-57%-72%-114%-114%-15%-103%64%29%77%52%55%-48%5%-51%-53%120%104%20%85%-93%51%67%-24%-73%36%-70%50%-124%-94%-108%111%104%8%-19%-93%-11%103%-25%18%-60%-67%-113%106%-120%-70%33%116%-107%68%-49%13%-95%51%-12%-4%-20%77%-91%70%-5%-24%96%100%-33%-4%68%126%-118%58%112%83%51%-7%-87%-108%75%114%-49%84%2%13%-48%113%-53%77%-91%-87%-22%-28%20%77%-107%-7%86%81%-24%14%-95%78%94%43%70%15%-107%42%-66%23%35%21%-97%-76%85%121%-41%63%93%69%-93%20%29%-100%107%19%-88%92%70%27%-87%-9%83%-99%-119%11%19%-99%9%113%-123%81%70%121%-50%-23%-10%120%-110%-6%108%-96%-37%35%6%-87%-66%20%81%-3%-80%58%104%-82%-124%-62%69%-7%14%90%-6%15%-128%-119%-14%110%-27%-95%65%44%-85%112%82%-70%43%41%46%-45%-55%-31%38%-65%-80%-30%118%122%-85%41%116%-97%-77%-107%-20%-12%74%-119%-59%-1%-80%-34%-53%-95%57%93%126%-69%94%-90%123%46%-35%-41%-57%112%-98%23%35%-23%29%51%-13%69%98%106%91%75%-41%-35%109%-65%92%-9%74%19%21%-115%92%-11%24%15%-70%40%-25%43%-113%-89%-115%-118%119%-14%123%-44%-87%62%42%122%29%2%13%11%-96%-5%13%-85%-82%-68%-118%-95%34%82%78%-42%46%-122%10%113%-93%-8%103%-29%-94%-88%-22%11%111%113%84%-59%-106%64%-9%-73%108%-59%-54%-36%-75%-91%-48%125%-12%-22%97%-38%13%74%-94%-5%8%118%45%27%-61%81%121%-12%16%-2%-70%-46%-16%-38%97%24%-57%113%24%-74%-9%71%-31%31%12%-33%-99%51%8%-119%86%-81%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%45%-25%121%64%-90%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_3DWg4DrWEeGMCcwsbpLuFA" source="image_papyrus">
- <details xmi:id="_3DXH8DrWEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
- <details xmi:id="_9f8J0DrWEeGMCcwsbpLuFA" key="image_name_key" value="IconAMIPoll"/>
+ <icon xmi:type="uml:Image" xmi:id="_JXZ1gDiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%84%0%0%0%101%8%3%0%0%0%-28%-109%52%-5%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-52%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%82%82%82%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%24%24%24%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-33%61%-9%-93%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%41%73%68%65%84%104%-127%-83%-39%125%91%-38%48%16%0%-16%-29%101%12%-76%32%32%69%17%-95%88%-107%23%-69%45%-43%90%-83%5%117%-32%-9%-1%78%-125%103%-37%67%47%109%115%-105%54%-9%119%-8%61%41%73%-109%-69%43%-120%-14%17%92%86%-105%86%56%-116%15%49%12%-83%-42%26%74%-126%-35%-54%106%8%82%84%74%-95%-125%-58%-117%12%30%98%84%28%125%-84%-74%-99%44%18%-96%87%20%125%-84%127%100%-117%0%83%81%12%85%-112%0%-61%98%-24%-83%-126%4%120%42%-126%-66%61%-87%72%-128%7%125%-44%-97%79%-43%38%-52%-75%-47%-2%25%65%2%-72%-70%-24%104%67%-102%-80%-43%68%107%57%59%19%69%-92%-121%46%25%36%-128%-81%-123%54%115%-99%-15%-85%-41%-88%110%15%81%-83%-51%-123%6%-22%63%100%-125%-45%-50%-3%-91%52%-108%-113%-98%100%-110%-81%-75%94%122%40%27%-99%103%-111%-42%58%115%44%23%-67%-31%-109%108%116%-108%-34%75%-101%93%-18%104%30%-38%77%-17%-7%102%-112%63%-100%-121%-2%72%-19%-95%47%-43%112%22%122%39%-101%118%-92%28%-49%65%-93%-119%100%-122%-118%71%-25%-94%-14%-61%119%8%-109%-125%110%37%-13%-52%-89%126%65%-93%-66%116%-81%15%-87%121%114%-48%26%54%63%-6%-28%47%104%-44%-57%91%-44%-71%-94%77%26%-67%-59%19%-99%51%76%26%-75%-15%102%34%23%-119%-125%86%-16%-61%-65%113%76%18%-75%16%-38%98%-103%20%-38%67%-89%-45%-17%-82%17%20%47%-45%61%-49%-92%-48%48%105%-114%-103%19%37%-48%1%-102%104%-109%105%18%-88%-117%-48%-127%25%-44%67%123%-108%107%18%104%-100%68%-17%-52%-96%17%122%-6%-116%11%-66%8%58%75%-102%54%-37%84%-93%40%-127%96%-66%77%36%-118%-18%-111%-118%33%-12%60%-119%50%14%103%22%58%78%-104%19%-66%-87%68%-125%-126%-21%116%64%-3%-111%91%91%36%-93%-27%-3%-115%95%73%-12%84%11%29%93%0%39%60%29%-12%-115%42%-117%-2%-59%82%7%125%-26%-103%-80%-48%65%57%69%-116%54%-54%13%45%-108%-7%-105%-62%119%29%-12%39%19%-43%90%-3%-63%-104%6%15%-47%-42%65%69%-60%91%127%-51%55%74%116%-81%-73%-57%-72%-114%-114%-15%-103%64%29%77%52%55%-48%5%-51%-53%120%104%20%85%-93%51%67%-24%-73%36%-70%50%-124%-94%-108%111%104%8%-19%-93%-11%103%-25%18%-60%-67%-113%106%-120%-70%33%116%-107%68%-49%13%-95%51%-12%-4%-20%77%-91%70%-5%-24%96%100%-33%-4%68%126%-118%58%112%83%51%-7%-87%-108%75%114%-49%84%2%13%-48%113%-53%77%-91%-87%-22%-28%20%77%-107%-7%86%81%-24%14%-95%78%94%43%70%15%-107%42%-66%23%35%21%-97%-76%85%121%-41%63%93%69%-93%20%29%-100%107%19%-88%92%70%27%-87%-9%83%-99%-119%11%19%-99%9%113%-123%81%70%121%-50%-23%-10%120%-110%-6%108%-96%-37%35%6%-87%-66%20%81%-3%-80%58%104%-82%-124%-62%69%-7%14%90%-6%15%-128%-119%-14%110%-27%-95%65%44%-85%112%82%-70%43%41%46%-45%-55%-31%38%-65%-80%-30%118%122%-85%41%116%-97%-77%-107%-20%-12%74%-119%-59%-1%-80%-34%-53%-95%57%93%126%-69%94%-90%123%46%-35%-41%-57%112%-98%23%35%-23%29%51%-13%69%98%106%91%75%-41%-35%109%-65%92%-9%74%19%21%-115%92%-11%24%15%-70%40%-25%43%-113%-89%-115%-118%119%-14%123%-44%-87%62%42%122%29%2%13%11%-96%-5%13%-85%-82%-68%-118%-95%34%82%78%-42%46%-122%10%113%-93%-8%103%-29%-94%-88%-22%11%111%113%84%-59%-106%64%-9%-73%108%-59%-54%-36%-75%-91%-48%125%-12%-22%97%-38%13%74%-94%-5%8%118%45%27%-61%81%121%-12%16%-2%-70%-46%-16%-38%97%24%-57%113%24%-74%-9%71%-31%31%12%-33%-99%51%8%-119%86%-81%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%45%-25%121%64%-90%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3DWg4DrWEeGMCcwsbpLuFA" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3DXH8DrWEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9f8J0DrWEeGMCcwsbpLuFA" key="image_name_key" value="IconAMIPoll"/>
</eAnnotations>
</icon>
- <icon xmi:id="_3-hIoDrWEeGMCcwsbpLuFA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%119%0%0%0%92%8%3%0%0%0%99%-116%-38%77%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%120%120%120%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-71%82%-104%50%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%4%-59%73%68%65%84%104%-127%-59%-102%109%91%-30%58%16%-122%11%-118%40%-88%108%-83%2%-53%-117%93%123%4%-75%-20%110%53%-83%69%-91%-108%30%20%-1%-1%79%58%-107%-77%72%38%77%-109%73%-126%-41%62%95%-55%-52%77%94%-102%-52%76%98%-111%29%104%-2%-74%26%-115%-22%-29%81%-27%-83%31%35%77%44%51%98%-68%58%60%-19%120%22%-91%-27%-76%57%-70%-8%90%-18%-62%127%6%-56%-83%58%-65%-34%-61%47%-30%94%28%-76%-7%-52%63%122%109%-4%-5%5%-36%-59%73%73%79%105%-75%43%59%-26%14%78%-28%-48%-75%-70%-29%-78%-31%-42%-32%94%96%-87%107%-14%96%71%-36%-80%-18%42%96%115%5%-50%46%-72%-117%-82%26%53%-41%-16%-38%-100%-69%127%-91%-116%-51%-43%-116%-52%-72%-15%-67%14%53%87%123%102%-62%117%94%52%-79%-106%-27%-78%-53%75%-127%-101%-88%79%45%5%102%-66%101%60%119%-66%44%117%58%124%-71%15%38%-66%-1%59%-104%-106%-73%-15%-58%122%-36%-92%-60%101%-89%89%-95%63%-108%120%-32%79%75%-42%94%85%-121%-21%100%60%87%-39%36%-31%-76%-75%111%-98%-72%61%-2%-95%-50%-115%121%115%43%-40%127%23%15%-100%-3%-37%-19%41%115%91%69%47%-35%-107%-48%34%-31%-20%-90%-53%-19%-116%-32%-72%-11%-30%127%-81%75%14%88%66%86%-33%11%86%45%53%-18%-96%48%104%47%-123%-115%-128%-93%-8%119%1%92%87%-31%-38%25%107%-34%-112%118%-10%127%-115%-39%51%-60%-21%43%112%27%-84%113%13%71%-51%-43%103%-65%-66%78%-120%-26%-10%-104%81%-10%-86%114%-101%79%37%-20%88%-43%-48%-36%103%3%44%33%51%-90%-57%-18%5%-110%59%102%-2%-16%88%106%1%-107%48%115%28%32%-71%41%52%-13%21%-79%-124%92%-62%121%-14%18%20%-73%2%-79%-33%-112%43%-103%-42%29%116%-47%68%113%97%-108%-4%-54%13%-106%36%10%-65%1%31%87%14%-126%-5%6%-1%-21%72%3%-101%-81%45%120%66%77%16%-36%0%88%60%106%97%-39%-111%-50%-28%-36%8%44%70%-113%119%-22%97%20%-62%-59%121%41%-27%94%-125%-10%-57%-102%88%-10%99%12%-92%92%120%-2%45%-76%-71%33%-40%61%-36%80%-62%13%-63%48%-73%-124%109%-59%58%0%29%-24%75%-72%125%-48%-102%23%-9%99%-27%-128%-51%-29%78%-62%5%-21%-48%45%70%-3%10%2%51%54%-107%112%31%-103%-43%96%-96%17%-19%-22%42%18%115%95%-23%-58%122%123%-58%70%51%-72%66%-123%92%27%-76%-59%-124%54%2%-127%-120%-76%-14%-121%27%-49%120%-86%-46%77%51%51%44%-36%-7%110%63%-72%-47%-92%-115%-88%86%-24%-18%-111%27%-127%47%-23%-34%66%-89%-46%13%67%46%56%80%-97%44%18%103%40%-84%-75%111%-56%-99%-45%-50%-50%45%-46%-60%97%13%-105%51%-77%-96%83%-117%12%-111%92%113%90%34%87%8%-71%9%18%107%-67%25%114%9%-19%-52%-77%46%-1%10%-41%-75%-20%50%14%43%65%-47%15%-91%-104%118%-106%-49%47%-74%106%-79%-21%117%85%45%3%49%58%48%-28%-10%104%103%-7%-9%75%30%112%-36%95%-122%-36%127%104%103%-45%-100%27%-6%-120%93%50%-1%-117%-122%92%-97%118%-42%92%-97%11%73%-19%-8%-119%39%80%39%27%26%114%65%-35%-95%38%60%7%35%-48%-31%-98%-88%-87%92%96%127%122%23%-97%-5%32%-20%-59%103%-37%60%-127%101%-107%-17%86%-62%-58%-57%116%91%-109%112%-110%-112%91%56%103%98%-18%30%-35%-40%-45%-55%-55%62%5%-14%-69%19%9%23%-100%93%70%3%-67%0%-98%-10%100%-7%2%8%-13%59%6%92%88%-101%-103%-53%-72%48%29%-44%-33%-94%29%-112%-119%102%-46%-4%8%-90%-65%-25%-38%92%-80%105%124%36%-64%-78%-4%55%3%6%-17%-102%88%7%6%23%115%57%-9%16%24%100%-102%-87%10%-100%-82%103%34%-25%-62%21%-67%46%17%-88%-117%-119%45%-10%17%92%-72%-83%90%94%-55%-11%-105%80%76%125%115%25%97%-72%-16%-61%-77%-78%51%117%46%83%-119%94%111%3%-14%-70%-39%41%-76%106%41%23%-80%-104%-14%-43%-48%-58%113%7%-48%76%57%29%29%49%-10%119%4%-57%37%108%-11%-6%72%9%91%101%-126%-118%52%-62%114%-49%-40%-56%30%91%-11%-26%97%55%-31%63%-90%-18%-67%-49%-104%90%15%-24%-49%-72%112%49%-15%64%-16%92%-90%-66%-104%-85%-115%43%-96%21%-17%49%95%55%79%29%80%-9%26%78%-31%-82%-52%-67%65%-104%-11%82%-42%108%-101%100%-31%-18%113%126%20%35%-50%-87%-84%-53%118%-77%104%-12%-13%-13%87%-28%-67%-107%95%112%97%121%13%-47%-13%-112%-88%-58%-71%79%-100%110%23%36%-10%126%48%40%122%-79%-68%-96%-84%112%-24%-44%121%-73%-104%93%123%-37%2%-53%13%-7%-113%24%-38%7%-59%42%-113%125%125%-54%77%4%50%58%62%67%-33%-61%-58%-36%59%-50%92%105%112%115%-71%-15%24%-9%-85%71%101%-49%88%-106%96%65%-32%-17%-99%-29%105%-119%-61%-11%-112%-89%-23%75%-102%-118%94%88%64%-84%-54%61%123%-120%76%-32%-72%-22%50%-117%80%-23%61%-61%-111%54%-10%-23%-116%113%-91%-10%126%-93%112%-49%-120%84%113%71%87%124%55%50%19%63%126%-30%107%-56%-119%127%85%-33%-55%68%13%84%-78%76%-21%-111%87%80%85%127%-113%52%127%-106%-93%40%45%-7%85%122%-99%-9%87%123%-27%-81%52%88%93%29%-39%124%31%90%-17%-66%-94%-101%-30%-43%61%-105%-38%40%77%33%53%-33%-71%-123%99%-7%104%103%126%73%95%13%-72%-71%-110%-119%-88%-45%110%32%-82%-17%25%-67%-97%-20%-33%-74%-72%31%-12%-7%-31%74%22%9%25%-66%-37%36%97%127%-4%-13%-76%-67%-119%-4%-68%116%-38%-84%-83%4%-61%-69%51%-18%-89%102%-77%25%-10%-115%-22%-121%-2%3%52%51%-49%67%-105%-19%90%17%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%5%-46%-52%-24%92%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
- <eAnnotations xmi:id="_54LY8DrWEeGMCcwsbpLuFA" source="image_papyrus">
- <details xmi:id="_54MnEDrWEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
- <details xmi:id="_ACEvYDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjAMIPoll"/>
+ <icon xmi:type="uml:Image" xmi:id="_3-hIoDrWEeGMCcwsbpLuFA" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%119%0%0%0%92%8%3%0%0%0%99%-116%-38%77%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%120%120%120%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%-51%-51%-51%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-71%82%-104%50%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%4%-59%73%68%65%84%104%-127%-59%-102%109%91%-30%58%16%-122%11%-118%40%-88%108%-83%2%-53%-117%93%123%4%-75%-20%110%53%-83%69%-91%-108%30%20%-1%-1%79%58%-107%-77%72%38%77%-109%73%-126%-41%62%95%-55%-52%77%94%-102%-52%76%98%-111%29%104%-2%-74%26%-115%-22%-29%81%-27%-83%31%35%77%44%51%98%-68%58%60%-19%120%22%-91%-27%-76%57%-70%-8%90%-18%-62%127%6%-56%-83%58%-65%-34%-61%47%-30%94%28%-76%-7%-52%63%122%109%-4%-5%5%-36%-59%73%73%79%105%-75%43%59%-26%14%78%-28%-48%-75%-70%-29%-78%-31%-42%-32%94%96%-87%107%-14%96%71%-36%-80%-18%42%96%115%5%-50%46%-72%-117%-82%26%53%-41%-16%-38%-100%-69%127%-91%-116%-51%-43%-116%-52%-72%-15%-67%14%53%87%123%102%-62%117%94%52%-79%-106%-27%-78%-53%75%-127%-101%-88%79%45%5%102%-66%101%60%119%-66%44%117%58%124%-71%15%38%-66%-1%59%-104%-106%-73%-15%-58%122%-36%-92%-60%101%-89%89%-95%63%-108%120%-32%79%75%-42%94%85%-121%-21%100%60%87%-39%36%-31%-76%-75%111%-98%-72%61%-2%-95%-50%-115%121%115%43%-40%127%23%15%-100%-3%-37%-19%41%115%91%69%47%-35%-107%-48%34%-31%-20%-90%-53%-19%-116%-32%-72%-11%-30%127%-81%75%14%88%66%86%-33%11%86%45%53%-18%-96%48%104%47%-123%-115%-128%-93%-8%119%1%92%87%-31%-38%25%107%-34%-112%118%-10%127%-115%-39%51%-60%-21%43%112%27%-84%113%13%71%-51%-43%103%-65%-66%78%-120%-26%-10%-104%81%-10%-86%114%-101%79%37%-20%88%-43%-48%-36%103%3%44%33%51%-90%-57%-18%5%-110%59%102%-2%-16%88%106%1%-107%48%115%28%32%-71%41%52%-13%21%-79%-124%92%-62%121%-14%18%20%-73%2%-79%-33%-112%43%-103%-42%29%116%-47%68%113%97%-108%-4%-54%13%-106%36%10%-65%1%31%87%14%-126%-5%6%-1%-21%72%3%-101%-81%45%120%66%77%16%-36%0%88%60%106%97%-39%-111%-50%-28%-36%8%44%70%-113%119%-22%97%20%-62%-59%121%41%-27%94%-125%-10%-57%-102%88%-10%99%12%-92%92%120%-2%45%-76%-71%33%-40%61%-36%80%-62%13%-63%48%-73%-124%109%-59%58%0%29%-24%75%-72%125%-48%-102%23%-9%99%-27%-128%-51%-29%78%-62%5%-21%-48%45%70%-3%10%2%51%54%-107%112%31%-103%-43%96%-96%17%-19%-22%42%18%115%95%-23%-58%122%123%-58%70%51%-72%66%-123%92%27%-76%-59%-124%54%2%-127%-120%-76%-14%-121%27%-49%120%-86%-46%77%51%51%44%-36%-7%110%63%-72%-47%-92%-115%-88%86%-24%-18%-111%27%-127%47%-23%-34%66%-89%-46%13%67%46%56%80%-97%44%18%103%40%-84%-75%111%-56%-99%-45%-50%-50%45%-46%-60%97%13%-105%51%-77%-96%83%-117%12%-111%92%113%90%34%87%8%-71%9%18%107%-67%25%114%9%-19%-52%-77%46%-1%10%-41%-75%-20%50%14%43%65%-47%15%-91%-104%118%-106%-49%47%-74%106%-79%-21%117%85%45%3%49%58%48%-28%-10%104%103%-7%-9%75%30%112%-36%95%-122%-36%127%104%103%-45%-100%27%-6%-120%93%50%-1%-117%-122%92%-97%118%-42%92%-97%11%73%-19%-8%-119%39%80%39%27%26%114%65%-35%-95%38%60%7%35%-48%-31%-98%-88%-87%92%96%127%122%23%-97%-5%32%-20%-59%103%-37%60%-127%101%-107%-17%86%-62%-58%-57%116%91%-109%112%-110%-112%91%56%103%98%-18%30%-35%-40%-45%-55%-55%62%5%-14%-69%19%9%23%-100%93%70%3%-67%0%-98%-10%100%-7%2%8%-13%59%6%92%88%-101%-103%-53%-72%48%29%-44%-33%-94%29%-112%-119%102%-46%-4%8%-90%-65%-25%-38%92%-80%105%124%36%-64%-78%-4%55%3%6%-17%-102%88%7%6%23%115%57%-9%16%24%100%-102%-87%10%-100%-82%103%34%-25%-62%21%-67%46%17%-88%-117%-119%45%-10%17%92%-72%-83%90%94%-55%-11%-105%80%76%125%115%25%97%-72%-16%-61%-77%-78%51%117%46%83%-119%94%111%3%-14%-70%-39%41%-76%106%41%23%-80%-104%-14%-43%-48%-58%113%7%-48%76%57%29%29%49%-10%119%4%-57%37%108%-11%-6%72%9%91%101%-126%-118%52%-62%114%-49%-40%-56%30%91%-11%-26%97%55%-31%63%-90%-18%-67%-49%-104%90%15%-24%-49%-72%112%49%-15%64%-16%92%-90%-66%-104%-85%-115%43%-96%21%-17%49%95%55%79%29%80%-9%26%78%-31%-82%-52%-67%65%-104%-11%82%-42%108%-101%100%-31%-18%113%126%20%35%-50%-87%-84%-53%118%-77%104%-12%-13%-13%87%-28%-67%-107%95%112%97%121%13%-47%-13%-112%-88%-58%-71%79%-100%110%23%36%-10%126%48%40%122%-79%-68%-96%-84%112%-24%-44%121%-73%-104%93%123%-37%2%-53%13%-7%-113%24%-38%7%-59%42%-113%125%125%-54%77%4%50%58%62%67%-33%-61%-58%-36%59%-50%92%105%112%115%-71%-15%24%-9%-85%71%101%-49%88%-106%96%65%-32%-17%-99%-29%105%-119%-61%-11%-112%-89%-23%75%-102%-118%94%88%64%-84%-54%61%123%-120%76%-32%-72%-22%50%-117%80%-23%61%-61%-111%54%-10%-23%-116%113%-91%-10%126%-93%112%-49%-120%84%113%71%87%124%55%50%19%63%126%-30%107%-56%-119%127%85%-33%-55%68%13%84%-78%76%-21%-111%87%80%85%127%-113%52%127%-106%-93%40%45%-7%85%122%-99%-9%87%123%-27%-81%52%88%93%29%-39%124%31%90%-17%-66%-94%-101%-30%-43%61%-105%-38%40%77%33%53%-33%-71%-123%99%-7%104%103%126%73%95%13%-72%-71%-110%-119%-88%-45%110%32%-82%-17%25%-67%-97%-20%-33%-74%-72%31%-12%-7%-31%74%22%9%25%-66%-37%36%97%127%-4%-13%-76%-67%-119%-4%-68%116%-38%-84%-83%4%-61%-69%51%-18%-89%102%-77%25%-10%-115%-22%-121%-2%3%52%51%-49%67%-105%-19%90%17%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%5%-46%-52%-24%92%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_54LY8DrWEeGMCcwsbpLuFA" source="image_papyrus">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_54MnEDrWEeGMCcwsbpLuFA" key="image_kind_key" value="icon"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ACEvYDrXEeGMCcwsbpLuFA" key="image_name_key" value="IconConjAMIPoll"/>
</eAnnotations>
</icon>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_AQZZwLqOEd-SedGzMDDkww" name="AMIcallback">
- <icon xmi:id="_KoY8QDiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%72%0%0%0%104%8%3%0%0%0%101%-97%70%67%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%103%103%103%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%-34%-34%-34%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-51%-46%-59%107%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%-13%73%68%65%84%88%-123%-75%-39%109%67%-86%48%20%0%-32%-39%53%75%-67%105%26%-23%-51%74%52%73%45%-13%-86%13%-13%37%-55%-105%-44%-1%-1%-109%-82%-70%13%6%-116%-77%-93%113%-49%-73%-28%-12%48%-74%113%-40%-128%80%116%12%55%-39%-4%116%78%-56%-14%-13%-6%-9%-13%40%120%-108%32%21%-69%121%85%39%82%52%-14%109%-65%-123%-124%-102%-9%36%20%-85%-92%125%44%84%-67%13%51%-5%-72%-33%30%7%117%-44%-52%62%-78%110%-93%-12%-48%-80%31%-19%16%82%40%98%-95%-30%-89%-12%111%-26%52%-105%-51%-68%79%-66%-91%-97%-26%51%28%100%23%-68%-50%-51%-82%-59%-123%84%47%-67%-50%-65%27%-95%-96%-116%-56%-81%-65%-7%-122%-37%62%119%-101%-107%-73%17%-48%-117%-37%23%70%-24%-102%-35%-66%-21%-22%33%-93%-63%115%51%-74%-30%104%-57%-30%71%23%90%72%-100%-76%-93%62%-36%-30%-121%-57%58%-56%-31%-89%-20%71%37%116%-71%-76%-47%64%57%-106%118%59%-116%-52%-56%-77%-116%50%12%-35%-16%6%-43%-12%109%126%0%-95%54%75%-54%65%-115%-50%-120%-127%-125%-96%-100%56%-101%-66%-43%101%8%26%-78%-79%-81%64%14%-91%31%-20%108%14%0%85%-7%20%-126%-95%36%-53%106%6%-96%-46%-52%-117%95%-18%-48%66%-15%-59%-78%82%62%40%41%-33%-42%34%28%24%-78%89%86%90%-122%54%10%-122%-112%80%-103%15%4%59%-7%64%-122%6%74%72%-29%-48%-54%33%107%34%-25%77%-108%-112%-22%118%-107%99%-50%38%-101%30%-102%105%32%-106%-107%-43%67%-64%13%-78%15%-125%101%117%-62%80%-91%-59%-29%-110%-91%-92%96%40%-63%-78%90%97%104%18%56%-41%68%-15%-33%82%-16%17%122%4%32%58%61%-4%109%-35%64%-114%-51%70%-1%-101%66%16%127%48%-66%65%16%-81%16%61%16%90%-80%-92%70%-88%-18%123%49%92%-79%-100%45%8%-15%-71%-74%59%93%100%-16%70%-101%67%24%58%-29%51%-96%29%-27%60%89%-18%-56%-126%16%-17%110%98%85%-43%-114%99%-78%-29%-53%-95%14%-86%-15%38%-103%79%42%103%-79%-108%90%12%67%-18%-125%-51%82%76%-53%103%-79%-124%27%-37%122%104%84%22%119%-54%-57%34%112%89%110%-83%88%30%70%85%3%-47%-46%74%-28%-109%-63%-38%43%4%-43%-65%-30%113%77%-22%-20%12%58%-120%62%74%107%80%115%-48%105%-83%-41%-83%-117%-98%-89%19%43%65%113%-112%-41%-91%-54%112%-121%65%15%81%67%93%94%14%81%113%-85%21%2%-94%118%-38%-118%112%-6%94%65%-57%64%-14%16%-55%-31%27%72%28%-76%-21%-87%92%-35%-81%52%-14%-2%-46%-119%-123%-10%91%-111%94%69%40%-53%65%104%51%-126%-121%14%81%122%-36%38%-86%-54%-57%-63%-111%80%116%-60%9%57%-25%111%44%-106%63%-125%-38%-127%73%114%42%84%12%12%-21%-55%80%45%56%-51%78%-123%30%-30%-126%-24%-8%4%-56%72%-68%-20%6%-89%37%-105%114%66%111%-6%-26%81%-112%-109%-54%-117%-62%50%-10%65%94%96%-26%81%45%39%13%-78%-68%-75%56%14%58%43%-5%26%-33%61%17%26%-11%2%-35%-103%60%13%-86%-122%106%110%-30%36%40%21%46%-109%-2%81%67%66%41%9%88%-26%95%55%-50%-20%107%45%-41%36%44%-44%116%21%43%-89%92%9%32%-95%-124%123%93%-3%63%-22%22%-29%-96%-110%-104%-77%-26%-103%-102%-63%66%124%-57%73%-54%-91%40%7%7%-119%5%87%5%88%4%98%-96%-30%-73%-34%65%65%124%-28%-83%47%-64%65%65%108%-37%2%47%-109%49%16%-33%-58%-107%-31%109%18%2%-30%-101%-19%103%-48%65%64%35%54%23%87%-102%125%-101%30%-30%-101%-19%46%-123%67%15%-99%51%72%-77%71%70%64%108%105%100%106%28%5%52%-99%-7%-29%-18%-16%-21%-57%-15%-112%58%-46%113%65%-16%108%-4%95%-48%117%92%-48%107%92%-48%-80%16%13%-127%-81%-75%-126%-48%-18%-2%-68%-32%-117%-73%-105%-106%27%-20%21%-76%-26%117%20%-26%-19%113%-102%53%-87%-88%73%-45%67%-4%85%-61%86%-109%-90%-121%28%6%93%-1%24%18%5%82%-13%-42%6%1%-15%89%-95%-71%73%16%-112%-63%42%-101%-75%0%-77%48%31%15%-82%88%-109%-32%-94%-115%-127%120%-115%-124%-117%36%-22%-69%-56%59%-105%-96%119%82%40%-56%48%-11%18%-18%-109%79%91%-36%114%-23%-56%126%66%126%59%18%-53%17%82%-114%26%59%36%52%114%-117%94%-93%-89%94%2%96%63%-117%21%-35%-3%44%33%-123%-74%-30%21%55%22%-94%-122%36%17%82%-97%78%38%19%-33%-73%9%52%68%-115%80%-39%-13%125%-100%-64%67%-69%103%110%-61%15%-7%-54%-17%49%16%117%62%99%-126%-88%-99%24%-57%3%-19%98%-47%-81%-57%3%-19%-30%-95%-35%43%-49%119%113%46%-1%-8%15%83%120%-125%-89%63%57%-45%-36%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%32%-103%-56%60%27%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"/>
- <icon xmi:id="_WTUY0ENnEeGoAtSeIK7WLg" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%72%0%0%0%104%8%3%0%0%0%101%-97%70%67%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%103%103%103%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%-34%-34%-34%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-51%-46%-59%107%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%-13%73%68%65%84%88%-123%-75%-39%109%67%-86%48%20%0%-32%-39%53%75%-67%105%26%-23%-51%74%52%73%45%-13%-86%13%-13%37%-55%-105%-44%-1%-1%-109%-82%-70%13%6%-116%-77%-93%113%-49%-73%-28%-12%48%-74%113%-40%-128%80%116%12%55%-39%-4%116%78%-56%-14%-13%-6%-9%-13%40%120%-108%32%21%-69%121%85%39%82%52%-14%109%-65%-123%-124%-102%-9%36%20%-85%-92%125%44%84%-67%13%51%-5%-72%-33%30%7%117%-44%-52%62%-78%110%-93%-12%-48%-80%31%-19%16%82%40%98%-95%-30%-89%-12%111%-26%52%-105%-51%-68%79%-66%-91%-97%-26%51%28%100%23%-68%-50%-51%-82%-59%-123%84%47%-67%-50%-65%27%-95%-96%-116%-56%-81%-65%-7%-122%-37%62%119%-101%-107%-73%17%-48%-117%-37%23%70%-24%-102%-35%-66%-21%-22%33%-93%-63%115%51%-74%-30%104%-57%-30%71%23%90%72%-100%-76%-93%62%-36%-30%-121%-57%58%-56%-31%-89%-20%71%37%116%-71%-76%-47%64%57%-106%118%59%-116%-52%-56%-77%-116%50%12%-35%-16%6%-43%-12%109%126%0%-95%54%75%-54%65%-115%-50%-120%-127%-125%-96%-100%56%-101%-66%-43%101%8%26%-78%-79%-81%64%14%-91%31%-20%108%14%0%85%-7%20%-126%-95%36%-53%106%6%-96%-46%-52%-117%95%-18%-48%66%-15%-59%-78%82%62%40%41%-33%-42%34%28%24%-78%89%86%90%-122%54%10%-122%-112%80%-103%15%4%59%-7%64%-122%6%74%72%-29%-48%-54%33%107%34%-25%77%-108%-112%-22%118%-107%99%-50%38%-101%30%-102%105%32%-106%-107%-43%67%-64%13%-78%15%-125%101%117%-62%80%-91%-59%-29%-110%-91%-92%96%40%-63%-78%90%97%104%18%56%-41%68%-15%-33%82%-16%17%122%4%32%58%61%-4%109%-35%64%-114%-51%70%-1%-101%66%16%127%48%-66%65%16%-81%16%61%16%90%-80%-92%70%-88%-18%123%49%92%-79%-100%45%8%-15%-71%-74%59%93%100%-16%70%-101%67%24%58%-29%51%-96%29%-27%60%89%-18%-56%-126%16%-17%110%98%85%-43%-114%99%-78%-29%-53%-95%14%-86%-15%38%-103%79%42%103%-79%-108%90%12%67%-18%-125%-51%82%76%-53%103%-79%-124%27%-37%122%104%84%22%119%-54%-57%34%112%89%110%-83%88%30%70%85%3%-47%-46%74%-28%-109%-63%-38%43%4%-43%-65%-30%113%77%-22%-20%12%58%-120%62%74%107%80%115%-48%105%-83%-41%-83%-117%-98%-89%19%43%65%113%-112%-41%-91%-54%112%-121%65%15%81%67%93%94%14%81%113%-85%21%2%-94%118%-38%-118%112%-6%94%65%-57%64%-14%16%-55%-31%27%72%28%-76%-21%-87%92%-35%-81%52%-14%-2%-46%-119%-123%-10%91%-111%94%69%40%-53%65%104%51%-126%-121%14%81%122%-36%38%-86%-54%-57%-63%-111%80%116%-60%9%57%-25%111%44%-106%63%-125%-38%-127%73%114%42%84%12%12%-21%-55%80%45%56%-51%78%-123%30%-30%-126%-24%-8%4%-56%72%-68%-20%6%-89%37%-105%114%66%111%-6%-26%81%-112%-109%-54%-117%-62%50%-10%65%94%96%-26%81%45%39%13%-78%-68%-75%56%14%58%43%-5%26%-33%61%17%26%-11%2%-35%-103%60%13%-86%-122%106%110%-30%36%40%21%46%-109%-2%81%67%66%41%9%88%-26%95%55%-50%-20%107%45%-41%36%44%-44%116%21%43%-89%92%9%32%-95%-124%123%93%-3%63%-22%22%-29%-96%-110%-104%-77%-26%-103%-102%-63%66%124%-57%73%-54%-91%40%7%7%-119%5%87%5%88%4%98%-96%-30%-73%-34%65%65%124%-28%-83%47%-64%65%65%108%-37%2%47%-109%49%16%-33%-58%-107%-31%109%18%2%-30%-101%-19%103%-48%65%64%35%54%23%87%-102%125%-101%30%-30%-101%-19%46%-123%67%15%-99%51%72%-77%71%70%64%108%105%100%106%28%5%52%-99%-7%-29%-18%-16%-21%-57%-15%-112%58%-46%113%65%-16%108%-4%95%-48%117%92%-48%107%92%-48%-80%16%13%-127%-81%-75%-126%-48%-18%-2%-68%-32%-117%-73%-105%-106%27%-20%21%-76%-26%117%20%-26%-19%113%-102%53%-87%-88%73%-45%67%-4%85%-61%86%-109%-90%-121%28%6%93%-1%24%18%5%82%-13%-42%6%1%-15%89%-95%-71%73%16%-112%-63%42%-101%-75%0%-77%48%31%15%-82%88%-109%-32%-94%-115%-127%120%-115%-124%-117%36%-22%-69%-56%59%-105%-96%119%82%40%-56%48%-11%18%-18%-109%79%91%-36%114%-23%-56%126%66%126%59%18%-53%17%82%-114%26%59%36%52%114%-117%94%-93%-89%94%2%96%63%-117%21%-35%-3%44%33%-123%-74%-30%21%55%22%-94%-122%36%17%82%-97%78%38%19%-33%-73%9%52%68%-115%80%-39%-13%125%-100%-64%67%-69%103%110%-61%15%-7%-54%-17%49%16%117%62%99%-126%-88%-99%24%-57%3%-19%98%-47%-81%-57%3%-19%-30%-95%-35%43%-49%119%113%46%-1%-8%15%83%120%-125%-89%63%57%-45%-36%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%32%-103%-56%60%27%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"/>
+ <icon xmi:type="uml:Image" xmi:id="_KoY8QDiyEeGiupyIkgMHVw" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%72%0%0%0%104%8%3%0%0%0%101%-97%70%67%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%103%103%103%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%-34%-34%-34%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-51%-46%-59%107%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%-13%73%68%65%84%88%-123%-75%-39%109%67%-86%48%20%0%-32%-39%53%75%-67%105%26%-23%-51%74%52%73%45%-13%-86%13%-13%37%-55%-105%-44%-1%-1%-109%-82%-70%13%6%-116%-77%-93%113%-49%-73%-28%-12%48%-74%113%-40%-128%80%116%12%55%-39%-4%116%78%-56%-14%-13%-6%-9%-13%40%120%-108%32%21%-69%121%85%39%82%52%-14%109%-65%-123%-124%-102%-9%36%20%-85%-92%125%44%84%-67%13%51%-5%-72%-33%30%7%117%-44%-52%62%-78%110%-93%-12%-48%-80%31%-19%16%82%40%98%-95%-30%-89%-12%111%-26%52%-105%-51%-68%79%-66%-91%-97%-26%51%28%100%23%-68%-50%-51%-82%-59%-123%84%47%-67%-50%-65%27%-95%-96%-116%-56%-81%-65%-7%-122%-37%62%119%-101%-107%-73%17%-48%-117%-37%23%70%-24%-102%-35%-66%-21%-22%33%-93%-63%115%51%-74%-30%104%-57%-30%71%23%90%72%-100%-76%-93%62%-36%-30%-121%-57%58%-56%-31%-89%-20%71%37%116%-71%-76%-47%64%57%-106%118%59%-116%-52%-56%-77%-116%50%12%-35%-16%6%-43%-12%109%126%0%-95%54%75%-54%65%-115%-50%-120%-127%-125%-96%-100%56%-101%-66%-43%101%8%26%-78%-79%-81%64%14%-91%31%-20%108%14%0%85%-7%20%-126%-95%36%-53%106%6%-96%-46%-52%-117%95%-18%-48%66%-15%-59%-78%82%62%40%41%-33%-42%34%28%24%-78%89%86%90%-122%54%10%-122%-112%80%-103%15%4%59%-7%64%-122%6%74%72%-29%-48%-54%33%107%34%-25%77%-108%-112%-22%118%-107%99%-50%38%-101%30%-102%105%32%-106%-107%-43%67%-64%13%-78%15%-125%101%117%-62%80%-91%-59%-29%-110%-91%-92%96%40%-63%-78%90%97%104%18%56%-41%68%-15%-33%82%-16%17%122%4%32%58%61%-4%109%-35%64%-114%-51%70%-1%-101%66%16%127%48%-66%65%16%-81%16%61%16%90%-80%-92%70%-88%-18%123%49%92%-79%-100%45%8%-15%-71%-74%59%93%100%-16%70%-101%67%24%58%-29%51%-96%29%-27%60%89%-18%-56%-126%16%-17%110%98%85%-43%-114%99%-78%-29%-53%-95%14%-86%-15%38%-103%79%42%103%-79%-108%90%12%67%-18%-125%-51%82%76%-53%103%-79%-124%27%-37%122%104%84%22%119%-54%-57%34%112%89%110%-83%88%30%70%85%3%-47%-46%74%-28%-109%-63%-38%43%4%-43%-65%-30%113%77%-22%-20%12%58%-120%62%74%107%80%115%-48%105%-83%-41%-83%-117%-98%-89%19%43%65%113%-112%-41%-91%-54%112%-121%65%15%81%67%93%94%14%81%113%-85%21%2%-94%118%-38%-118%112%-6%94%65%-57%64%-14%16%-55%-31%27%72%28%-76%-21%-87%92%-35%-81%52%-14%-2%-46%-119%-123%-10%91%-111%94%69%40%-53%65%104%51%-126%-121%14%81%122%-36%38%-86%-54%-57%-63%-111%80%116%-60%9%57%-25%111%44%-106%63%-125%-38%-127%73%114%42%84%12%12%-21%-55%80%45%56%-51%78%-123%30%-30%-126%-24%-8%4%-56%72%-68%-20%6%-89%37%-105%114%66%111%-6%-26%81%-112%-109%-54%-117%-62%50%-10%65%94%96%-26%81%45%39%13%-78%-68%-75%56%14%58%43%-5%26%-33%61%17%26%-11%2%-35%-103%60%13%-86%-122%106%110%-30%36%40%21%46%-109%-2%81%67%66%41%9%88%-26%95%55%-50%-20%107%45%-41%36%44%-44%116%21%43%-89%92%9%32%-95%-124%123%93%-3%63%-22%22%-29%-96%-110%-104%-77%-26%-103%-102%-63%66%124%-57%73%-54%-91%40%7%7%-119%5%87%5%88%4%98%-96%-30%-73%-34%65%65%124%-28%-83%47%-64%65%65%108%-37%2%47%-109%49%16%-33%-58%-107%-31%109%18%2%-30%-101%-19%103%-48%65%64%35%54%23%87%-102%125%-101%30%-30%-101%-19%46%-123%67%15%-99%51%72%-77%71%70%64%108%105%100%106%28%5%52%-99%-7%-29%-18%-16%-21%-57%-15%-112%58%-46%113%65%-16%108%-4%95%-48%117%92%-48%107%92%-48%-80%16%13%-127%-81%-75%-126%-48%-18%-2%-68%-32%-117%-73%-105%-106%27%-20%21%-76%-26%117%20%-26%-19%113%-102%53%-87%-88%73%-45%67%-4%85%-61%86%-109%-90%-121%28%6%93%-1%24%18%5%82%-13%-42%6%1%-15%89%-95%-71%73%16%-112%-63%42%-101%-75%0%-77%48%31%15%-82%88%-109%-32%-94%-115%-127%120%-115%-124%-117%36%-22%-69%-56%59%-105%-96%119%82%40%-56%48%-11%18%-18%-109%79%91%-36%114%-23%-56%126%66%126%59%18%-53%17%82%-114%26%59%36%52%114%-117%94%-93%-89%94%2%96%63%-117%21%-35%-3%44%33%-123%-74%-30%21%55%22%-94%-122%36%17%82%-97%78%38%19%-33%-73%9%52%68%-115%80%-39%-13%125%-100%-64%67%-69%103%110%-61%15%-7%-54%-17%49%16%117%62%99%-126%-88%-99%24%-57%3%-19%98%-47%-81%-57%3%-19%-30%-95%-35%43%-49%119%113%46%-1%-8%15%83%120%-125%-89%63%57%-45%-36%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%32%-103%-56%60%27%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"/>
+ <icon xmi:type="uml:Image" xmi:id="_WTUY0ENnEeGoAtSeIK7WLg" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%72%0%0%0%104%8%3%0%0%0%101%-97%70%67%0%0%0%4%103%65%77%65%0%0%-79%-113%11%-4%97%5%0%0%0%-43%80%76%84%69%0%0%0%-81%-81%-81%-85%-85%-85%-103%-103%-103%-107%-107%-107%-111%-111%-111%-115%-115%-115%-119%-119%-119%119%119%119%115%115%115%111%111%111%107%107%107%103%103%103%85%85%85%81%81%81%77%77%77%73%73%73%69%69%69%-18%-18%-18%-22%-22%-22%-26%-26%-26%51%51%51%-30%-30%-30%47%47%47%-34%-34%-34%43%43%43%39%39%39%35%35%35%-52%-52%-52%-56%-56%-56%-60%-60%-60%17%17%17%-64%-64%-64%13%13%13%-68%-68%-68%9%9%9%5%5%5%-86%-86%-86%-90%-90%-90%-94%-94%-94%-98%-98%-98%-102%-102%-102%-120%-120%-120%-124%-124%-124%-128%-128%-128%124%124%124%102%102%102%98%98%98%94%94%94%90%90%90%86%86%86%-1%-1%-1%-5%-5%-5%-9%-9%-9%68%68%68%-13%-13%-13%64%64%64%60%60%60%56%56%56%52%52%52%-35%-35%-35%-39%-39%-39%-43%-43%-43%34%34%34%-47%-47%-47%30%30%30%26%26%26%22%22%22%-69%-69%-69%-73%-73%-73%-77%-77%-77%-51%-46%-59%107%0%0%0%61%116%69%88%116%83%111%102%116%119%97%114%101%0%88%86%32%118%101%114%115%105%111%110%32%51%46%49%48%97%45%106%117%109%98%111%70%105%120%43%69%110%104%32%111%102%32%50%48%48%56%49%50%49%54%32%40%105%110%116%101%114%105%109%33%41%-80%-32%124%-127%0%0%3%-13%73%68%65%84%88%-123%-75%-39%109%67%-86%48%20%0%-32%-39%53%75%-67%105%26%-23%-51%74%52%73%45%-13%-86%13%-13%37%-55%-105%-44%-1%-1%-109%-82%-70%13%6%-116%-77%-93%113%-49%-73%-28%-12%48%-74%113%-40%-128%80%116%12%55%-39%-4%116%78%-56%-14%-13%-6%-9%-13%40%120%-108%32%21%-69%121%85%39%82%52%-14%109%-65%-123%-124%-102%-9%36%20%-85%-92%125%44%84%-67%13%51%-5%-72%-33%30%7%117%-44%-52%62%-78%110%-93%-12%-48%-80%31%-19%16%82%40%98%-95%-30%-89%-12%111%-26%52%-105%-51%-68%79%-66%-91%-97%-26%51%28%100%23%-68%-50%-51%-82%-59%-123%84%47%-67%-50%-65%27%-95%-96%-116%-56%-81%-65%-7%-122%-37%62%119%-101%-107%-73%17%-48%-117%-37%23%70%-24%-102%-35%-66%-21%-22%33%-93%-63%115%51%-74%-30%104%-57%-30%71%23%90%72%-100%-76%-93%62%-36%-30%-121%-57%58%-56%-31%-89%-20%71%37%116%-71%-76%-47%64%57%-106%118%59%-116%-52%-56%-77%-116%50%12%-35%-16%6%-43%-12%109%126%0%-95%54%75%-54%65%-115%-50%-120%-127%-125%-96%-100%56%-101%-66%-43%101%8%26%-78%-79%-81%64%14%-91%31%-20%108%14%0%85%-7%20%-126%-95%36%-53%106%6%-96%-46%-52%-117%95%-18%-48%66%-15%-59%-78%82%62%40%41%-33%-42%34%28%24%-78%89%86%90%-122%54%10%-122%-112%80%-103%15%4%59%-7%64%-122%6%74%72%-29%-48%-54%33%107%34%-25%77%-108%-112%-22%118%-107%99%-50%38%-101%30%-102%105%32%-106%-107%-43%67%-64%13%-78%15%-125%101%117%-62%80%-91%-59%-29%-110%-91%-92%96%40%-63%-78%90%97%104%18%56%-41%68%-15%-33%82%-16%17%122%4%32%58%61%-4%109%-35%64%-114%-51%70%-1%-101%66%16%127%48%-66%65%16%-81%16%61%16%90%-80%-92%70%-88%-18%123%49%92%-79%-100%45%8%-15%-71%-74%59%93%100%-16%70%-101%67%24%58%-29%51%-96%29%-27%60%89%-18%-56%-126%16%-17%110%98%85%-43%-114%99%-78%-29%-53%-95%14%-86%-15%38%-103%79%42%103%-79%-108%90%12%67%-18%-125%-51%82%76%-53%103%-79%-124%27%-37%122%104%84%22%119%-54%-57%34%112%89%110%-83%88%30%70%85%3%-47%-46%74%-28%-109%-63%-38%43%4%-43%-65%-30%113%77%-22%-20%12%58%-120%62%74%107%80%115%-48%105%-83%-41%-83%-117%-98%-89%19%43%65%113%-112%-41%-91%-54%112%-121%65%15%81%67%93%94%14%81%113%-85%21%2%-94%118%-38%-118%112%-6%94%65%-57%64%-14%16%-55%-31%27%72%28%-76%-21%-87%92%-35%-81%52%-14%-2%-46%-119%-123%-10%91%-111%94%69%40%-53%65%104%51%-126%-121%14%81%122%-36%38%-86%-54%-57%-63%-111%80%116%-60%9%57%-25%111%44%-106%63%-125%-38%-127%73%114%42%84%12%12%-21%-55%80%45%56%-51%78%-123%30%-30%-126%-24%-8%4%-56%72%-68%-20%6%-89%37%-105%114%66%111%-6%-26%81%-112%-109%-54%-117%-62%50%-10%65%94%96%-26%81%45%39%13%-78%-68%-75%56%14%58%43%-5%26%-33%61%17%26%-11%2%-35%-103%60%13%-86%-122%106%110%-30%36%40%21%46%-109%-2%81%67%66%41%9%88%-26%95%55%-50%-20%107%45%-41%36%44%-44%116%21%43%-89%92%9%32%-95%-124%123%93%-3%63%-22%22%-29%-96%-110%-104%-77%-26%-103%-102%-63%66%124%-57%73%-54%-91%40%7%7%-119%5%87%5%88%4%98%-96%-30%-73%-34%65%65%124%-28%-83%47%-64%65%65%108%-37%2%47%-109%49%16%-33%-58%-107%-31%109%18%2%-30%-101%-19%103%-48%65%64%35%54%23%87%-102%125%-101%30%-30%-101%-19%46%-123%67%15%-99%51%72%-77%71%70%64%108%105%100%106%28%5%52%-99%-7%-29%-18%-16%-21%-57%-15%-112%58%-46%113%65%-16%108%-4%95%-48%117%92%-48%107%92%-48%-80%16%13%-127%-81%-75%-126%-48%-18%-2%-68%-32%-117%-73%-105%-106%27%-20%21%-76%-26%117%20%-26%-19%113%-102%53%-87%-88%73%-45%67%-4%85%-61%86%-109%-90%-121%28%6%93%-1%24%18%5%82%-13%-42%6%1%-15%89%-95%-71%73%16%-112%-63%42%-101%-75%0%-77%48%31%15%-82%88%-109%-32%-94%-115%-127%120%-115%-124%-117%36%-22%-69%-56%59%-105%-96%119%82%40%-56%48%-11%18%-18%-109%79%91%-36%114%-23%-56%126%66%126%59%18%-53%17%82%-114%26%59%36%52%114%-117%94%-93%-89%94%2%96%63%-117%21%-35%-3%44%33%-123%-74%-30%21%55%22%-94%-122%36%17%82%-97%78%38%19%-33%-73%9%52%68%-115%80%-39%-13%125%-100%-64%67%-69%103%110%-61%15%-7%-54%-17%49%16%117%62%99%-126%-88%-99%24%-57%3%-19%98%-47%-81%-57%3%-19%-30%-95%-35%43%-49%119%113%46%-1%-8%15%83%120%-125%-89%63%57%-45%-36%0%0%0%7%116%73%77%69%7%-36%1%6%14%1%32%-103%-56%60%27%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_GjnlcC8qEeKx7OxAiA06uw" name="PushProdPullCons">
- <icon xmi:id="_0I0rMEMLEeKGIL695HkFYQ" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%112%0%0%0%103%8%0%0%0%0%-3%88%-103%-76%0%0%7%56%73%68%65%84%104%-127%-75%-102%123%80%21%85%28%-57%-9%-18%-67%92%121%-91%40%-124%38%70%64%-26%11%-33%-118%-29%115%124%84%-90%83%106%-91%-93%2%-115%83%-90%102%-90%-7%-56%-55%-41%-104%58%-26%-116%-40%56%-102%-64%-116%-88%53%101%62%-54%102%-14%81%26%86%102%-58%4%78%102%-120%14%89%62%72%5%-15%9%72%112%-111%-57%-62%-23%42%23%-10%123%118%-49%-18%-98%-35%-69%-2%-2%-29%-100%-33%-2%62%-105%-35%-13%123%-100%-33%57%2%-31%23%-23%-20%-87%-101%-116%-31%-102%-69%38%108%16%-127%31%-105%-38%78%16%-100%83%47%-46%-93%-43%-97%116%17%-59%94%-23%53%-10%3%-85%-34%116%9%15%36%-106%34%86%39%63%28%20%-109%-1%-77%29%-72%-92%-111%39%8%-29%-85%96%52%-75%105%116%90%-75%-51%-64%-116%22%62%-53%66%-28%101%121%-76%122%96%-45%-88%-72%-76%-34%86%-32%-31%80%-95%89%-66%-105%-121%47%61%-39%60%-22%78%-77%19%120%-90%-83%-52%19%-14%-28%-15%-62%56%121%56%116%-97%125%-64%-62%-98%-64%-21%120%93%-98%-88%26%12%19%109%-114%-39%5%44%123%22%-52%10%91%112%-22%-101%64%-104%-119%62%103%15%80%74%114%-128%-43%23%-53%113%-50%-25%22%62%-23%117%-51%22%-32%42%39%-40%-20%83%76%79%-106%-67%-128%-60%81%-58%65%-57%24%-72%-93%5%88%-20%-112%-81%-100%-66%-103%-128%-60%-55%30%-65%-127%-103%-32%16%66%-21%-29%106%-123%11%79%-125%-126%56%-73%-42%79%96%126%52%-104%11%-38%-55%82%-55%121%28%84%2%-42%-7%7%-68%-34%11%95%-40%-70%58%-90%-46%-63%-57%64%39%-28%115%127%-128%-98%-25%-112%55%-29%-66%-122%-38%118%-4%-52%97%-121%-83%3%-91%-23%-24%16%99%52%51%66%-3%-121%34%-24%69%-99%-78%12%92%-29%2%59%61%-117%-75%21%107%-26%-32%-101%-24%-10%-113%69%-32%23%24%70%-94%114%-11%126%90%-59%68%36%14%101%21%6%-58%-64%19%-83%-64%70%-85%31%-12%120%-124%-108%12%69%-30%-72%50%11%64%72%61%-34%-46%-30%-45%6%125%32%-71%26%15%-22%-30%76%-83%-11%-91%13%-68%-35%7%127%-14%74%-74%67%-96%-28%70%-127%126%-64%7%-110%73%-96%-121%-118%-111%111%104%-2%96%-112%-93%97%-16%68%96%-70%73%-32%76%116%-120%81%-9%56%120%-124%-20%13%-126%103%66%-65%50%5%92%-113%14%-47%-11%10%23%-113%-44%111%-62%-68%18%-98%101%2%-72%-41%13%79%70%-98%-26%-29%121%-35%113%41%126%-121%-40%-13%-36%-64%-109%-24%16%-63%-103%-68%60%66%42%95%67%98%127%86%-88%96%1%11%48%67%56%-73%25%57%4%74%-39%88%36%14%47%-27%2%-106%80%14%-79%-62%-40%33%80%-118%-6%-31%-61%83%-85%84%10%106%-96%-12%18%46%-48%100%-11%35%-6%-110%31%11%79%59%22%-87%-36%81%13%-100%-117%-111%127%-104%118%-116%-46%-110%19%88%-61%6%108%52%4%110%70%-121%-120%-27%116%8%74%14%-32%-110%11%82%-26%99%37%112%63%58%68%-60%31%22%120%-92%126%43%102%-103%-106%-118%-88%-81%0%-2%-114%-31%41%-8%59%43%60%66%106%87%99%0%104%-105%71%77%-46%-64%43%88%-127%9%105%90%1%-40%72%60%-77%-48%76%-89%34%77%96%101%95%84%92%96%84%-15%105%75%-7%-85%104%104%48%-106%-57%8%-84%-101%-128%106%-109%121%-73%-104%44%-71%51%4%77%-31%30%22%-127%-117%-47%1%19%-52%59%4%-54%-91%46%96%-53%49%67%-2%56%0%-92%98%125%76%-127%95%60%-17%-14%123%2%-84%57%87%49%-128%-103%-104%-51%-38%-24%-106%122%92%114%-76%53%-40%115%103%-88%-128%-25%-38%-64%-68%-21%-96%-103%-120%-83%33%-69%-15%63%8%57%-92%0%-34%-120%-63%-81%-68%-103%-77%67%-96%43%13%31%81%-7%56%-121%2%86%12%66%-34%60%-21%14%-127%82%-77%16%-115%-58%92%4%96%-35%100%-100%-102%-32%-113%67%-96%84%38%-94%-39%-34%55%101%-32%10%116%-120%-34%37%54%-15%-68%-7%120%36%18%71%120%-102%-128%59%-112%-41%94%111%103%96%86%-118%-79%-1%-31%72%-108%26%-127%-57%48%67%-124%-8%-17%16%40%-25%-79%60%118%-66%-1%16%120%1%-13%-105%75%-93%-100%-76%44%89%-24%110%-31%69%94%96%113%71%124%-49%41%118%56%4%37%-5%-63%29%-59%84%47%-112%-6%-82%-13%-52%-107%76%60%-46%-112%14%-18%56%64%18%-14%112%-63%-116%54%-20%122%88%-112%44%-8%100%125%37%97%62%-16%-30%-17%60%2%-34%5%-88%114%29%-21%-119%-48%94%-2%51%-20%-46%35%-32%-35%-22%15%-1%81%-40%95%68%-64%125%-28%86%27%66%-74%66%42%38%-127%125%71%-94%-41%45%54%-94%79%88%-84%-102%-76%-91%-10%61%92%-110%-61%-68%-91%-65%112%59%0%70%66%-71%55%74%124%-46%-80%5%19%70%-41%-85%-28%-127%-29%83%91%-84%-88%-117%-122%70%-52%-56%1%76%-119%17%15%-1%27%111%-92%-103%-126%-60%78%-73%108%-28%-3%22%1%-106%-125%15%18%31%-16%-2%112%-22%61%87%-40%-58%43%120%6%-20%-70%55%-111%38%32%41%-19%-122%-60%41%-4%-89%44%-6%82%58%2%-84%58%23%18%25%72%10%-80%37%35%44%-78%39%-68%121%-110%-48%-24%-53%77%-91%105%99%2%-2%19%-73%20%-62%70%59%2%120%-35%114%52%57%-80%-71%-8%-10%-43%52%71%-80%1%-23%-38%-25%127%0%104%-56%64%-121%-120%-109%79%115%-102%-86%-74%109%-72%13%13%57%-18%55%48%19%-33%89%120%-74%60%-47%92%-105%-82%68%98%100%30%-53%-120%9%57%-35%14%-84%5%-19%-127%25%-71%-14%-98%-123%121%42%-90%72%109%-60%-124%20%-10%0%91%1%41%56%37%3%-21%-88%-114%-57%0%127%-10%50%-9%-80%115%-19%-104%69%109%51%97%51%83%-47%-101%90%-57%60%-3%60%-74%120%94%71%67%99%-24%62%8%110%-41%-118%-30%80%-15%109%-85%1%64%90%-125%11%52%-31%6%61%75%-19%-128%-13%-15%4%66%88%109%113%-57%77%117%-82%-97%82%30%-27%-48%123%-4%-97%67%64%-41%-75%-35%-110%59%-2%68%117%-82%127%84%78%43%-70%24%123%48%59%90%-22%98%-100%-61%70%93%-32%103%-86%121%101%-97%-122%-38%98%69%-28%-104%-26%81%-67%54%-41%90%-75%-126%-86%19%-75%0%3%64%-76%-39%124%124%15%-5%18%-30%116%-58%-70%83%1%-21%38%82%59%41%115%-123%99%-19%108%92%117%35%24%-35%75%70%115%-81%18%-49%117%-123%-25%-71%111%4%120%-91%-98%-6%32%-35%-103%71%57%-116%126%-23%45%-20%120%-16%53%-12%125%-14%101%48%60%24%-59%-114%-57%-52%-114%112%123%36%46%-31%-34%127%-1%18%14%-113%-75%-44%88%-30%-58%61%111%-25%22%-50%124%76%29%-107%6%102%104%104%-79%-69%-6%-5%49%88%4%127%-51%-59%-93%-70%93%-30%50%-109%39%51%105%24%0%-62%127%-27%-32%81%53%-67%-112%100%-6%-20%105%57%-70%99%7%-29%-126%-68%6%119%97%-62%112%-19%-66%-124%22%80%-102%-122%-18%-40%-29%95%35%-32%-57%88%20%-59%-21%-88%107%-98%-82%-47%-57%-65%35%13%2%-64%1%60%119%-114%-52%-42%-47%-44%62%63%-92%-49%-13%18%43%-11%120%39%35%65%53%84%119%-111%-23%-100%-112%-46%-3%-24%-7%58%1%-32%114%103%80%12%-40%-84%-57%-45%61%3%-50%69%71%118%-90%104%22%-28%119%71%-127%-98%-72%80%-33%109%117%79%-71%-113%96%62%14%-38%-87%-111%-113%-85%-88%19%-82%-119%6%-101%33%-3%-117%3%25%-72%-10%90%-79%-113%-39%-22%-105%-95%7%13%49%-38%-18%25%92%-115%88%-117%-25%52%109%-103%-7%120%43%54%-50%-30%12%27%117%6%64%-23%29%-4%-7%-99%24%-7%-8%80%75%80%-32%-120%73%70%-73%77%60%-44%9%-60%32%-43%11%59%-125%-103%37%100%-105%33%-49%-8%62%-51%93%-22%4%-30%21%69%62%46%-60%-30%-39%-99%-62%54%97%14%72%-82%117%71%-30%108%-86%91%92%54%26%-25%-34%-30%-23%36%115%-36%-119%58%-117%45%79%-9%-73%56%-75%1%121%-29%-54%-75%44%-104%4%-110%99%-104%-113%-57%-62%-65%113%37%6%38%-6%-23%-36%70%49%9%36%-69%-96%86%-23%12%123%-123%108%8%12%-86%-102%-34%31%32%-39%36%7%-128%104%-72%-69%-106%41%-13%-62%-114%-14%-15%56%-127%-46%-30%-26%0%48%6%-118%-37%-13%-51%-25%75%-116%-102%-34%47%-96%55%94%-6%-14%-79%115%55%-116%-42%-114%-9%-15%-60%85%-36%-115%15%-34%-5%-91%37%-109%26%-119%115%-88%-22%-35%87%-88%-119%-17%62%-126%43%-69%82%90%127%-105%-69%-25%94%-123%-27%-53%-55%-34%72%26%-67%-61%68%99%-121%-1%82%50%33%-27%-84%-46%-81%-28%-52%-33%-90%-6%72%-1%3%78%-120%-67%33%108%33%82%26%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"/>
- <icon xmi:id="_12mboEMLEeKGIL695HkFYQ" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%112%0%0%0%103%8%0%0%0%0%-3%88%-103%-76%0%0%7%56%73%68%65%84%104%-127%-75%-102%123%80%21%85%28%-57%-9%-18%-67%92%121%-91%40%-124%38%70%64%-26%11%-33%-118%-29%115%124%84%-90%83%106%-91%-93%2%-115%83%-90%102%-90%-7%-56%-55%-41%-104%58%-26%-116%-40%56%-102%-64%-116%-88%53%101%62%-54%102%-14%81%26%86%102%-58%4%78%102%-120%14%89%62%72%5%-15%9%72%112%-111%-57%-62%-23%42%23%-10%123%118%-49%-18%-98%-35%-69%-2%-2%-29%-100%-33%-2%62%-105%-35%-13%123%-100%-33%57%2%-31%23%-23%-20%-87%-101%-116%-31%-102%-69%38%108%16%-127%31%-105%-38%78%16%-100%83%47%-46%-93%-43%-97%116%17%-59%94%-23%53%-10%3%-85%-34%116%9%15%36%-106%34%86%39%63%28%20%-109%-1%-77%29%-72%-92%-111%39%8%-29%-85%96%52%-75%105%116%90%-75%-51%-64%-116%22%62%-53%66%-28%101%121%-76%122%96%-45%-88%-72%-76%-34%86%-32%-31%80%-95%89%-66%-105%-121%47%61%-39%60%-22%78%-77%19%120%-90%-83%-52%19%-14%-28%-15%-62%56%121%56%116%-97%125%-64%-62%-98%-64%-21%120%93%-98%-88%26%12%19%109%-114%-39%5%44%123%22%-52%10%91%112%-22%-101%64%-104%-119%62%103%15%80%74%114%-128%-43%23%-53%113%-50%-25%22%62%-23%117%-51%22%-32%42%39%-40%-20%83%76%79%-106%-67%-128%-60%81%-58%65%-57%24%-72%-93%5%88%-20%-112%-81%-100%-66%-103%-128%-60%-55%30%-65%-127%-103%-32%16%66%-21%-29%106%-123%11%79%-125%-126%56%-73%-42%79%96%126%52%-104%11%-38%-55%82%-55%121%28%84%2%-42%-7%7%-68%-34%11%95%-40%-70%58%-90%-46%-63%-57%64%39%-28%115%127%-128%-98%-25%-112%55%-29%-66%-122%-38%118%-4%-52%97%-121%-83%3%-91%-23%-24%16%99%52%51%66%-3%-121%34%-24%69%-99%-78%12%92%-29%2%59%61%-117%-75%21%107%-26%-32%-101%-24%-10%-113%69%-32%23%24%70%-94%114%-11%126%90%-59%68%36%14%101%21%6%-58%-64%19%-83%-64%70%-85%31%-12%120%-124%-108%12%69%-30%-72%50%11%64%72%61%-34%-46%-30%-45%6%125%32%-71%26%15%-22%-30%76%-83%-11%-91%13%-68%-35%7%127%-14%74%-74%67%-96%-28%70%-127%126%-64%7%-110%73%-96%-121%-118%-111%111%104%-2%96%-112%-93%97%-16%68%96%-70%73%-32%76%116%-120%81%-9%56%120%-124%-20%13%-126%103%66%-65%50%5%92%-113%14%-47%-11%10%23%-113%-44%111%-62%-68%18%-98%101%2%-72%-41%13%79%70%-98%-26%-29%121%-35%113%41%126%-121%-40%-13%-36%-64%-109%-24%16%-63%-103%-68%60%66%42%95%67%98%127%86%-88%96%1%11%48%67%56%-73%25%57%4%74%-39%88%36%14%47%-27%2%-106%80%14%-79%-62%-40%33%80%-118%-6%-31%-61%83%-85%84%10%106%-96%-12%18%46%-48%100%-11%35%-6%-110%31%11%79%59%22%-87%-36%81%13%-100%-117%-111%127%-104%118%-116%-46%-110%19%88%-61%6%108%52%4%110%70%-121%-120%-27%116%8%74%14%-32%-110%11%82%-26%99%37%112%63%58%68%-60%31%22%120%-92%126%43%102%-103%-106%-118%-88%-81%0%-2%-114%-31%41%-8%59%43%60%66%106%87%99%0%104%-105%71%77%-46%-64%43%88%-127%9%105%90%1%-40%72%60%-77%-48%76%-89%34%77%96%101%95%84%92%96%84%-15%105%75%-7%-85%104%104%48%-106%-57%8%-84%-101%-128%106%-109%121%-73%-104%44%-71%51%4%77%-31%30%22%-127%-117%-47%1%19%-52%59%4%-54%-91%46%96%-53%49%67%-2%56%0%-92%98%125%76%-127%95%60%-17%-14%123%2%-84%57%87%49%-128%-103%-104%-51%-38%-24%-106%122%92%114%-76%53%-40%115%103%-88%-128%-25%-38%-64%-68%-21%-96%-103%-120%-83%33%-69%-15%63%8%57%-92%0%-34%-120%-63%-81%-68%-103%-77%67%-96%43%13%31%81%-7%56%-121%2%86%12%66%-34%60%-21%14%-127%82%-77%16%-115%-58%92%4%96%-35%100%-100%-102%-32%-113%67%-96%84%38%-94%-39%-34%55%101%-32%10%116%-120%-34%37%54%-15%-68%-7%120%36%18%71%120%-102%-128%59%-112%-41%94%111%103%96%86%-118%-79%-1%-31%72%-108%26%-127%-57%48%67%-124%-8%-17%16%40%-25%-79%60%118%-66%-1%16%120%1%-13%-105%75%-93%-100%-76%44%89%-24%110%-31%69%94%96%113%71%124%-49%41%118%56%4%37%-5%-63%29%-59%84%47%-112%-6%-82%-13%-52%-107%76%60%-46%-112%14%-18%56%64%18%-14%112%-63%-116%54%-20%122%88%-112%44%-8%100%125%37%97%62%-16%-30%-17%60%2%-34%5%-88%114%29%-21%-119%-48%94%-2%51%-20%-46%35%-32%-35%-22%15%-1%81%-40%95%68%-64%125%-28%86%27%66%-74%66%42%38%-127%125%71%-94%-41%45%54%-94%79%88%-84%-102%-76%-91%-10%61%92%-110%-61%-68%-91%-65%112%59%0%70%66%-71%55%74%124%-46%-80%5%19%70%-41%-85%-28%-127%-29%83%91%-84%-88%-117%-122%70%-52%-56%1%76%-119%17%15%-1%27%111%-92%-103%-126%-60%78%-73%108%-28%-3%22%1%-106%-125%15%18%31%-16%-2%112%-22%61%87%-40%-58%43%120%6%-20%-70%55%-111%38%32%41%-19%-122%-60%41%-4%-89%44%-6%82%58%2%-84%58%23%18%25%72%10%-80%37%35%44%-78%39%-68%121%-110%-48%-24%-53%77%-91%105%99%2%-2%19%-73%20%-62%70%59%2%120%-35%114%52%57%-80%-71%-8%-10%-43%52%71%-80%1%-23%-38%-25%127%0%104%-56%64%-121%-120%-109%79%115%-102%-86%-74%109%-72%13%13%57%-18%55%48%19%-33%89%120%-74%60%-47%92%-105%-82%68%98%100%30%-53%-120%9%57%-35%14%-84%5%-19%-127%25%-71%-14%-98%-123%121%42%-90%72%109%-60%-124%20%-10%0%91%1%41%56%37%3%-21%-88%-114%-57%0%127%-10%50%-9%-80%115%-19%-104%69%109%51%97%51%83%-47%-101%90%-57%60%-3%60%-74%120%94%71%67%99%-24%62%8%110%-41%-118%-30%80%-15%109%-85%1%64%90%-125%11%52%-31%6%61%75%-19%-128%-13%-15%4%66%88%109%113%-57%77%117%-82%-97%82%30%-27%-48%123%-4%-97%67%64%-41%-75%-35%-110%59%-2%68%117%-82%127%84%78%43%-70%24%123%48%59%90%-22%98%-100%-61%70%93%-32%103%-86%121%101%-97%-122%-38%98%69%-28%-104%-26%81%-67%54%-41%90%-75%-126%-86%19%-75%0%3%64%-76%-39%124%124%15%-5%18%-30%116%-58%-70%83%1%-21%38%82%59%41%115%-123%99%-19%108%92%117%35%24%-35%75%70%115%-81%18%-49%117%-123%-25%-71%111%4%120%-91%-98%-6%32%-35%-103%71%57%-116%126%-23%45%-20%120%-16%53%-12%125%-14%101%48%60%24%-59%-114%-57%-52%-114%112%123%36%46%-31%-34%127%-1%18%14%-113%-75%-44%88%-30%-58%61%111%-25%22%-50%124%76%29%-107%6%102%104%104%-79%-69%-6%-5%49%88%4%127%-51%-59%-93%-70%93%-30%50%-109%39%51%105%24%0%-62%127%-27%-32%81%53%-67%-112%100%-6%-20%105%57%-70%99%7%-29%-126%-68%6%119%97%-62%112%-19%-66%-124%22%80%-102%-122%-18%-40%-29%95%35%-32%-57%88%20%-59%-21%-88%107%-98%-82%-47%-57%-65%35%13%2%-64%1%60%119%-114%-52%-42%-47%-44%62%63%-92%-49%-13%18%43%-11%120%39%35%65%53%84%119%-111%-23%-100%-112%-46%-3%-24%-7%58%1%-32%114%103%80%12%-40%-84%-57%-45%61%3%-50%69%71%118%-90%104%22%-28%119%71%-127%-98%-72%80%-33%109%117%79%-71%-113%96%62%14%-38%-87%-111%-113%-85%-88%19%-82%-119%6%-101%33%-3%-117%3%25%-72%-10%90%-79%-113%-39%-22%-105%-95%7%13%49%-38%-18%25%92%-115%88%-117%-25%52%109%-103%-7%120%43%54%-50%-30%12%27%117%6%64%-23%29%-4%-7%-99%24%-7%-8%80%75%80%-32%-120%73%70%-73%77%60%-44%9%-60%32%-43%11%59%-125%-103%37%100%-105%33%-49%-8%62%-51%93%-22%4%-30%21%69%62%46%-60%-30%-39%-99%-62%54%97%14%72%-82%117%71%-30%108%-86%91%92%54%26%-25%-34%-30%-23%36%115%-36%-119%58%-117%45%79%-9%-73%56%-75%1%121%-29%-54%-75%44%-104%4%-110%99%-104%-113%-57%-62%-65%113%37%6%38%-6%-23%-36%70%49%9%36%-69%-96%86%-23%12%123%-123%108%8%12%-86%-102%-34%31%32%-39%36%7%-128%104%-72%-69%-106%41%-13%-62%-114%-14%-15%56%-127%-46%-30%-26%0%48%6%-118%-37%-13%-51%-25%75%-116%-102%-34%47%-96%55%94%-6%-14%-79%115%55%-116%-42%-114%-9%-15%-60%85%-36%-115%15%-34%-5%-91%37%-109%26%-119%115%-88%-22%-35%87%-88%-119%-17%62%-126%43%-69%82%90%127%-105%-69%-25%94%-123%-27%-53%-55%-34%72%26%-67%-61%68%99%-121%-1%82%50%33%-27%-84%-46%-81%-28%-52%-33%-90%-6%72%-1%3%78%-120%-67%33%108%33%82%26%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"/>
+ <icon xmi:type="uml:Image" xmi:id="_0I0rMEMLEeKGIL695HkFYQ" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%112%0%0%0%103%8%0%0%0%0%-3%88%-103%-76%0%0%7%56%73%68%65%84%104%-127%-75%-102%123%80%21%85%28%-57%-9%-18%-67%92%121%-91%40%-124%38%70%64%-26%11%-33%-118%-29%115%124%84%-90%83%106%-91%-93%2%-115%83%-90%102%-90%-7%-56%-55%-41%-104%58%-26%-116%-40%56%-102%-64%-116%-88%53%101%62%-54%102%-14%81%26%86%102%-58%4%78%102%-120%14%89%62%72%5%-15%9%72%112%-111%-57%-62%-23%42%23%-10%123%118%-49%-18%-98%-35%-69%-2%-2%-29%-100%-33%-2%62%-105%-35%-13%123%-100%-33%57%2%-31%23%-23%-20%-87%-101%-116%-31%-102%-69%38%108%16%-127%31%-105%-38%78%16%-100%83%47%-46%-93%-43%-97%116%17%-59%94%-23%53%-10%3%-85%-34%116%9%15%36%-106%34%86%39%63%28%20%-109%-1%-77%29%-72%-92%-111%39%8%-29%-85%96%52%-75%105%116%90%-75%-51%-64%-116%22%62%-53%66%-28%101%121%-76%122%96%-45%-88%-72%-76%-34%86%-32%-31%80%-95%89%-66%-105%-121%47%61%-39%60%-22%78%-77%19%120%-90%-83%-52%19%-14%-28%-15%-62%56%121%56%116%-97%125%-64%-62%-98%-64%-21%120%93%-98%-88%26%12%19%109%-114%-39%5%44%123%22%-52%10%91%112%-22%-101%64%-104%-119%62%103%15%80%74%114%-128%-43%23%-53%113%-50%-25%22%62%-23%117%-51%22%-32%42%39%-40%-20%83%76%79%-106%-67%-128%-60%81%-58%65%-57%24%-72%-93%5%88%-20%-112%-81%-100%-66%-103%-128%-60%-55%30%-65%-127%-103%-32%16%66%-21%-29%106%-123%11%79%-125%-126%56%-73%-42%79%96%126%52%-104%11%-38%-55%82%-55%121%28%84%2%-42%-7%7%-68%-34%11%95%-40%-70%58%-90%-46%-63%-57%64%39%-28%115%127%-128%-98%-25%-112%55%-29%-66%-122%-38%118%-4%-52%97%-121%-83%3%-91%-23%-24%16%99%52%51%66%-3%-121%34%-24%69%-99%-78%12%92%-29%2%59%61%-117%-75%21%107%-26%-32%-101%-24%-10%-113%69%-32%23%24%70%-94%114%-11%126%90%-59%68%36%14%101%21%6%-58%-64%19%-83%-64%70%-85%31%-12%120%-124%-108%12%69%-30%-72%50%11%64%72%61%-34%-46%-30%-45%6%125%32%-71%26%15%-22%-30%76%-83%-11%-91%13%-68%-35%7%127%-14%74%-74%67%-96%-28%70%-127%126%-64%7%-110%73%-96%-121%-118%-111%111%104%-2%96%-112%-93%97%-16%68%96%-70%73%-32%76%116%-120%81%-9%56%120%-124%-20%13%-126%103%66%-65%50%5%92%-113%14%-47%-11%10%23%-113%-44%111%-62%-68%18%-98%101%2%-72%-41%13%79%70%-98%-26%-29%121%-35%113%41%126%-121%-40%-13%-36%-64%-109%-24%16%-63%-103%-68%60%66%42%95%67%98%127%86%-88%96%1%11%48%67%56%-73%25%57%4%74%-39%88%36%14%47%-27%2%-106%80%14%-79%-62%-40%33%80%-118%-6%-31%-61%83%-85%84%10%106%-96%-12%18%46%-48%100%-11%35%-6%-110%31%11%79%59%22%-87%-36%81%13%-100%-117%-111%127%-104%118%-116%-46%-110%19%88%-61%6%108%52%4%110%70%-121%-120%-27%116%8%74%14%-32%-110%11%82%-26%99%37%112%63%58%68%-60%31%22%120%-92%126%43%102%-103%-106%-118%-88%-81%0%-2%-114%-31%41%-8%59%43%60%66%106%87%99%0%104%-105%71%77%-46%-64%43%88%-127%9%105%90%1%-40%72%60%-77%-48%76%-89%34%77%96%101%95%84%92%96%84%-15%105%75%-7%-85%104%104%48%-106%-57%8%-84%-101%-128%106%-109%121%-73%-104%44%-71%51%4%77%-31%30%22%-127%-117%-47%1%19%-52%59%4%-54%-91%46%96%-53%49%67%-2%56%0%-92%98%125%76%-127%95%60%-17%-14%123%2%-84%57%87%49%-128%-103%-104%-51%-38%-24%-106%122%92%114%-76%53%-40%115%103%-88%-128%-25%-38%-64%-68%-21%-96%-103%-120%-83%33%-69%-15%63%8%57%-92%0%-34%-120%-63%-81%-68%-103%-77%67%-96%43%13%31%81%-7%56%-121%2%86%12%66%-34%60%-21%14%-127%82%-77%16%-115%-58%92%4%96%-35%100%-100%-102%-32%-113%67%-96%84%38%-94%-39%-34%55%101%-32%10%116%-120%-34%37%54%-15%-68%-7%120%36%18%71%120%-102%-128%59%-112%-41%94%111%103%96%86%-118%-79%-1%-31%72%-108%26%-127%-57%48%67%-124%-8%-17%16%40%-25%-79%60%118%-66%-1%16%120%1%-13%-105%75%-93%-100%-76%44%89%-24%110%-31%69%94%96%113%71%124%-49%41%118%56%4%37%-5%-63%29%-59%84%47%-112%-6%-82%-13%-52%-107%76%60%-46%-112%14%-18%56%64%18%-14%112%-63%-116%54%-20%122%88%-112%44%-8%100%125%37%97%62%-16%-30%-17%60%2%-34%5%-88%114%29%-21%-119%-48%94%-2%51%-20%-46%35%-32%-35%-22%15%-1%81%-40%95%68%-64%125%-28%86%27%66%-74%66%42%38%-127%125%71%-94%-41%45%54%-94%79%88%-84%-102%-76%-91%-10%61%92%-110%-61%-68%-91%-65%112%59%0%70%66%-71%55%74%124%-46%-80%5%19%70%-41%-85%-28%-127%-29%83%91%-84%-88%-117%-122%70%-52%-56%1%76%-119%17%15%-1%27%111%-92%-103%-126%-60%78%-73%108%-28%-3%22%1%-106%-125%15%18%31%-16%-2%112%-22%61%87%-40%-58%43%120%6%-20%-70%55%-111%38%32%41%-19%-122%-60%41%-4%-89%44%-6%82%58%2%-84%58%23%18%25%72%10%-80%37%35%44%-78%39%-68%121%-110%-48%-24%-53%77%-91%105%99%2%-2%19%-73%20%-62%70%59%2%120%-35%114%52%57%-80%-71%-8%-10%-43%52%71%-80%1%-23%-38%-25%127%0%104%-56%64%-121%-120%-109%79%115%-102%-86%-74%109%-72%13%13%57%-18%55%48%19%-33%89%120%-74%60%-47%92%-105%-82%68%98%100%30%-53%-120%9%57%-35%14%-84%5%-19%-127%25%-71%-14%-98%-123%121%42%-90%72%109%-60%-124%20%-10%0%91%1%41%56%37%3%-21%-88%-114%-57%0%127%-10%50%-9%-80%115%-19%-104%69%109%51%97%51%83%-47%-101%90%-57%60%-3%60%-74%120%94%71%67%99%-24%62%8%110%-41%-118%-30%80%-15%109%-85%1%64%90%-125%11%52%-31%6%61%75%-19%-128%-13%-15%4%66%88%109%113%-57%77%117%-82%-97%82%30%-27%-48%123%-4%-97%67%64%-41%-75%-35%-110%59%-2%68%117%-82%127%84%78%43%-70%24%123%48%59%90%-22%98%-100%-61%70%93%-32%103%-86%121%101%-97%-122%-38%98%69%-28%-104%-26%81%-67%54%-41%90%-75%-126%-86%19%-75%0%3%64%-76%-39%124%124%15%-5%18%-30%116%-58%-70%83%1%-21%38%82%59%41%115%-123%99%-19%108%92%117%35%24%-35%75%70%115%-81%18%-49%117%-123%-25%-71%111%4%120%-91%-98%-6%32%-35%-103%71%57%-116%126%-23%45%-20%120%-16%53%-12%125%-14%101%48%60%24%-59%-114%-57%-52%-114%112%123%36%46%-31%-34%127%-1%18%14%-113%-75%-44%88%-30%-58%61%111%-25%22%-50%124%76%29%-107%6%102%104%104%-79%-69%-6%-5%49%88%4%127%-51%-59%-93%-70%93%-30%50%-109%39%51%105%24%0%-62%127%-27%-32%81%53%-67%-112%100%-6%-20%105%57%-70%99%7%-29%-126%-68%6%119%97%-62%112%-19%-66%-124%22%80%-102%-122%-18%-40%-29%95%35%-32%-57%88%20%-59%-21%-88%107%-98%-82%-47%-57%-65%35%13%2%-64%1%60%119%-114%-52%-42%-47%-44%62%63%-92%-49%-13%18%43%-11%120%39%35%65%53%84%119%-111%-23%-100%-112%-46%-3%-24%-7%58%1%-32%114%103%80%12%-40%-84%-57%-45%61%3%-50%69%71%118%-90%104%22%-28%119%71%-127%-98%-72%80%-33%109%117%79%-71%-113%96%62%14%-38%-87%-111%-113%-85%-88%19%-82%-119%6%-101%33%-3%-117%3%25%-72%-10%90%-79%-113%-39%-22%-105%-95%7%13%49%-38%-18%25%92%-115%88%-117%-25%52%109%-103%-7%120%43%54%-50%-30%12%27%117%6%64%-23%29%-4%-7%-99%24%-7%-8%80%75%80%-32%-120%73%70%-73%77%60%-44%9%-60%32%-43%11%59%-125%-103%37%100%-105%33%-49%-8%62%-51%93%-22%4%-30%21%69%62%46%-60%-30%-39%-99%-62%54%97%14%72%-82%117%71%-30%108%-86%91%92%54%26%-25%-34%-30%-23%36%115%-36%-119%58%-117%45%79%-9%-73%56%-75%1%121%-29%-54%-75%44%-104%4%-110%99%-104%-113%-57%-62%-65%113%37%6%38%-6%-23%-36%70%49%9%36%-69%-96%86%-23%12%123%-123%108%8%12%-86%-102%-34%31%32%-39%36%7%-128%104%-72%-69%-106%41%-13%-62%-114%-14%-15%56%-127%-46%-30%-26%0%48%6%-118%-37%-13%-51%-25%75%-116%-102%-34%47%-96%55%94%-6%-14%-79%115%55%-116%-42%-114%-9%-15%-60%85%-36%-115%15%-34%-5%-91%37%-109%26%-119%115%-88%-22%-35%87%-88%-119%-17%62%-126%43%-69%82%90%127%-105%-69%-25%94%-123%-27%-53%-55%-34%72%26%-67%-61%68%99%-121%-1%82%50%33%-27%-84%-46%-81%-28%-52%-33%-90%-6%72%-1%3%78%-120%-67%33%108%33%82%26%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"/>
+ <icon xmi:type="uml:Image" xmi:id="_12mboEMLEeKGIL695HkFYQ" content="-119%80%78%71%13%10%26%10%0%0%0%13%73%72%68%82%0%0%0%112%0%0%0%103%8%0%0%0%0%-3%88%-103%-76%0%0%7%56%73%68%65%84%104%-127%-75%-102%123%80%21%85%28%-57%-9%-18%-67%92%121%-91%40%-124%38%70%64%-26%11%-33%-118%-29%115%124%84%-90%83%106%-91%-93%2%-115%83%-90%102%-90%-7%-56%-55%-41%-104%58%-26%-116%-40%56%-102%-64%-116%-88%53%101%62%-54%102%-14%81%26%86%102%-58%4%78%102%-120%14%89%62%72%5%-15%9%72%112%-111%-57%-62%-23%42%23%-10%123%118%-49%-18%-98%-35%-69%-2%-2%-29%-100%-33%-2%62%-105%-35%-13%123%-100%-33%57%2%-31%23%-23%-20%-87%-101%-116%-31%-102%-69%38%108%16%-127%31%-105%-38%78%16%-100%83%47%-46%-93%-43%-97%116%17%-59%94%-23%53%-10%3%-85%-34%116%9%15%36%-106%34%86%39%63%28%20%-109%-1%-77%29%-72%-92%-111%39%8%-29%-85%96%52%-75%105%116%90%-75%-51%-64%-116%22%62%-53%66%-28%101%121%-76%122%96%-45%-88%-72%-76%-34%86%-32%-31%80%-95%89%-66%-105%-121%47%61%-39%60%-22%78%-77%19%120%-90%-83%-52%19%-14%-28%-15%-62%56%121%56%116%-97%125%-64%-62%-98%-64%-21%120%93%-98%-88%26%12%19%109%-114%-39%5%44%123%22%-52%10%91%112%-22%-101%64%-104%-119%62%103%15%80%74%114%-128%-43%23%-53%113%-50%-25%22%62%-23%117%-51%22%-32%42%39%-40%-20%83%76%79%-106%-67%-128%-60%81%-58%65%-57%24%-72%-93%5%88%-20%-112%-81%-100%-66%-103%-128%-60%-55%30%-65%-127%-103%-32%16%66%-21%-29%106%-123%11%79%-125%-126%56%-73%-42%79%96%126%52%-104%11%-38%-55%82%-55%121%28%84%2%-42%-7%7%-68%-34%11%95%-40%-70%58%-90%-46%-63%-57%64%39%-28%115%127%-128%-98%-25%-112%55%-29%-66%-122%-38%118%-4%-52%97%-121%-83%3%-91%-23%-24%16%99%52%51%66%-3%-121%34%-24%69%-99%-78%12%92%-29%2%59%61%-117%-75%21%107%-26%-32%-101%-24%-10%-113%69%-32%23%24%70%-94%114%-11%126%90%-59%68%36%14%101%21%6%-58%-64%19%-83%-64%70%-85%31%-12%120%-124%-108%12%69%-30%-72%50%11%64%72%61%-34%-46%-30%-45%6%125%32%-71%26%15%-22%-30%76%-83%-11%-91%13%-68%-35%7%127%-14%74%-74%67%-96%-28%70%-127%126%-64%7%-110%73%-96%-121%-118%-111%111%104%-2%96%-112%-93%97%-16%68%96%-70%73%-32%76%116%-120%81%-9%56%120%-124%-20%13%-126%103%66%-65%50%5%92%-113%14%-47%-11%10%23%-113%-44%111%-62%-68%18%-98%101%2%-72%-41%13%79%70%-98%-26%-29%121%-35%113%41%126%-121%-40%-13%-36%-64%-109%-24%16%-63%-103%-68%60%66%42%95%67%98%127%86%-88%96%1%11%48%67%56%-73%25%57%4%74%-39%88%36%14%47%-27%2%-106%80%14%-79%-62%-40%33%80%-118%-6%-31%-61%83%-85%84%10%106%-96%-12%18%46%-48%100%-11%35%-6%-110%31%11%79%59%22%-87%-36%81%13%-100%-117%-111%127%-104%118%-116%-46%-110%19%88%-61%6%108%52%4%110%70%-121%-120%-27%116%8%74%14%-32%-110%11%82%-26%99%37%112%63%58%68%-60%31%22%120%-92%126%43%102%-103%-106%-118%-88%-81%0%-2%-114%-31%41%-8%59%43%60%66%106%87%99%0%104%-105%71%77%-46%-64%43%88%-127%9%105%90%1%-40%72%60%-77%-48%76%-89%34%77%96%101%95%84%92%96%84%-15%105%75%-7%-85%104%104%48%-106%-57%8%-84%-101%-128%106%-109%121%-73%-104%44%-71%51%4%77%-31%30%22%-127%-117%-47%1%19%-52%59%4%-54%-91%46%96%-53%49%67%-2%56%0%-92%98%125%76%-127%95%60%-17%-14%123%2%-84%57%87%49%-128%-103%-104%-51%-38%-24%-106%122%92%114%-76%53%-40%115%103%-88%-128%-25%-38%-64%-68%-21%-96%-103%-120%-83%33%-69%-15%63%8%57%-92%0%-34%-120%-63%-81%-68%-103%-77%67%-96%43%13%31%81%-7%56%-121%2%86%12%66%-34%60%-21%14%-127%82%-77%16%-115%-58%92%4%96%-35%100%-100%-102%-32%-113%67%-96%84%38%-94%-39%-34%55%101%-32%10%116%-120%-34%37%54%-15%-68%-7%120%36%18%71%120%-102%-128%59%-112%-41%94%111%103%96%86%-118%-79%-1%-31%72%-108%26%-127%-57%48%67%-124%-8%-17%16%40%-25%-79%60%118%-66%-1%16%120%1%-13%-105%75%-93%-100%-76%44%89%-24%110%-31%69%94%96%113%71%124%-49%41%118%56%4%37%-5%-63%29%-59%84%47%-112%-6%-82%-13%-52%-107%76%60%-46%-112%14%-18%56%64%18%-14%112%-63%-116%54%-20%122%88%-112%44%-8%100%125%37%97%62%-16%-30%-17%60%2%-34%5%-88%114%29%-21%-119%-48%94%-2%51%-20%-46%35%-32%-35%-22%15%-1%81%-40%95%68%-64%125%-28%86%27%66%-74%66%42%38%-127%125%71%-94%-41%45%54%-94%79%88%-84%-102%-76%-91%-10%61%92%-110%-61%-68%-91%-65%112%59%0%70%66%-71%55%74%124%-46%-80%5%19%70%-41%-85%-28%-127%-29%83%91%-84%-88%-117%-122%70%-52%-56%1%76%-119%17%15%-1%27%111%-92%-103%-126%-60%78%-73%108%-28%-3%22%1%-106%-125%15%18%31%-16%-2%112%-22%61%87%-40%-58%43%120%6%-20%-70%55%-111%38%32%41%-19%-122%-60%41%-4%-89%44%-6%82%58%2%-84%58%23%18%25%72%10%-80%37%35%44%-78%39%-68%121%-110%-48%-24%-53%77%-91%105%99%2%-2%19%-73%20%-62%70%59%2%120%-35%114%52%57%-80%-71%-8%-10%-43%52%71%-80%1%-23%-38%-25%127%0%104%-56%64%-121%-120%-109%79%115%-102%-86%-74%109%-72%13%13%57%-18%55%48%19%-33%89%120%-74%60%-47%92%-105%-82%68%98%100%30%-53%-120%9%57%-35%14%-84%5%-19%-127%25%-71%-14%-98%-123%121%42%-90%72%109%-60%-124%20%-10%0%91%1%41%56%37%3%-21%-88%-114%-57%0%127%-10%50%-9%-80%115%-19%-104%69%109%51%97%51%83%-47%-101%90%-57%60%-3%60%-74%120%94%71%67%99%-24%62%8%110%-41%-118%-30%80%-15%109%-85%1%64%90%-125%11%52%-31%6%61%75%-19%-128%-13%-15%4%66%88%109%113%-57%77%117%-82%-97%82%30%-27%-48%123%-4%-97%67%64%-41%-75%-35%-110%59%-2%68%117%-82%127%84%78%43%-70%24%123%48%59%90%-22%98%-100%-61%70%93%-32%103%-86%121%101%-97%-122%-38%98%69%-28%-104%-26%81%-67%54%-41%90%-75%-126%-86%19%-75%0%3%64%-76%-39%124%124%15%-5%18%-30%116%-58%-70%83%1%-21%38%82%59%41%115%-123%99%-19%108%92%117%35%24%-35%75%70%115%-81%18%-49%117%-123%-25%-71%111%4%120%-91%-98%-6%32%-35%-103%71%57%-116%126%-23%45%-20%120%-16%53%-12%125%-14%101%48%60%24%-59%-114%-57%-52%-114%112%123%36%46%-31%-34%127%-1%18%14%-113%-75%-44%88%-30%-58%61%111%-25%22%-50%124%76%29%-107%6%102%104%104%-79%-69%-6%-5%49%88%4%127%-51%-59%-93%-70%93%-30%50%-109%39%51%105%24%0%-62%127%-27%-32%81%53%-67%-112%100%-6%-20%105%57%-70%99%7%-29%-126%-68%6%119%97%-62%112%-19%-66%-124%22%80%-102%-122%-18%-40%-29%95%35%-32%-57%88%20%-59%-21%-88%107%-98%-82%-47%-57%-65%35%13%2%-64%1%60%119%-114%-52%-42%-47%-44%62%63%-92%-49%-13%18%43%-11%120%39%35%65%53%84%119%-111%-23%-100%-112%-46%-3%-24%-7%58%1%-32%114%103%80%12%-40%-84%-57%-45%61%3%-50%69%71%118%-90%104%22%-28%119%71%-127%-98%-72%80%-33%109%117%79%-71%-113%96%62%14%-38%-87%-111%-113%-85%-88%19%-82%-119%6%-101%33%-3%-117%3%25%-72%-10%90%-79%-113%-39%-22%-105%-95%7%13%49%-38%-18%25%92%-115%88%-117%-25%52%109%-103%-7%120%43%54%-50%-30%12%27%117%6%64%-23%29%-4%-7%-99%24%-7%-8%80%75%80%-32%-120%73%70%-73%77%60%-44%9%-60%32%-43%11%59%-125%-103%37%100%-105%33%-49%-8%62%-51%93%-22%4%-30%21%69%62%46%-60%-30%-39%-99%-62%54%97%14%72%-82%117%71%-30%108%-86%91%92%54%26%-25%-34%-30%-23%36%115%-36%-119%58%-117%45%79%-9%-73%56%-75%1%121%-29%-54%-75%44%-104%4%-110%99%-104%-113%-57%-62%-65%113%37%6%38%-6%-23%-36%70%49%9%36%-69%-96%86%-23%12%123%-123%108%8%12%-86%-102%-34%31%32%-39%36%7%-128%104%-72%-69%-106%41%-13%-62%-114%-14%-15%56%-127%-46%-30%-26%0%48%6%-118%-37%-13%-51%-25%75%-116%-102%-34%47%-96%55%94%-6%-14%-79%115%55%-116%-42%-114%-9%-15%-60%85%-36%-115%15%-34%-5%-91%37%-109%26%-119%115%-88%-22%-35%87%-88%-119%-17%62%-126%43%-69%82%90%127%-105%-69%-25%94%-123%-27%-53%-55%-34%72%26%-67%-61%68%99%-121%-1%82%50%33%-27%-84%-46%-81%-28%-52%-33%-90%-6%72%-1%3%78%-120%-67%33%108%33%82%26%0%0%0%0%73%69%78%68%-82%66%96%-126%" format="Papyrus"/>
</packagedElement>
<packagedElement xmi:type="uml:Interface" xmi:id="_1FxlEH-QEeOtkrzuMiGEow" name="Please update derived elements"/>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_HmnpEJsrEd61Eo3nmu3JhQ" name="StdPorts">
- <ownedComment xmi:id="_Yq-O8Nt2Ed6nqsBVkgJEEA" annotatedElement="_-WNegNtxEd6nqsBVkgJEEA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_Yq-O8Nt2Ed6nqsBVkgJEEA" annotatedElement="_-WNegNtxEd6nqsBVkgJEEA">
<body>Is called during component activation &amp; deactivation. The two functions may not block i.e. return control to the caller after &quot;a very short&quot; period</body>
</ownedComment>
- <ownedComment xmi:id="_OcN78Nt2Ed6nqsBVkgJEEA" annotatedElement="_N6fa4JsrEd61Eo3nmu3JhQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_OcN78Nt2Ed6nqsBVkgJEEA" annotatedElement="_N6fa4JsrEd61Eo3nmu3JhQ">
<body>Is called during startup. Expected to block. Only one component instance per node may define it.</body>
</ownedComment>
<packagedElement xmi:type="uml:Class" xmi:id="_N6fa4JsrEd61Eo3nmu3JhQ" name="Cstart" isAbstract="true">
@@ -852,22 +852,22 @@ m_state = FOLLOWER;</body>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_xtlE8ARAEd--t-uhRn9OBA" name="ContainerServices">
- <ownedComment xmi:id="_hGEOAMT8Ed-zx4a_r4xAYw" annotatedElement="_SiY_AP-EEd6628OhKk_dpg">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_hGEOAMT8Ed-zx4a_r4xAYw" annotatedElement="_SiY_AP-EEd6628OhKk_dpg">
<body>A thread service supporting the LifeCycle port. Once started, it calls the activate operation (via the required port rLC) of a connected component in a new thread of a specific priority (a configuration attribute). This C++ implementation is based on the POSIX pthread library. It will further assume that the execution is done with root privileges, since these are required to set the thread priority. The thread properties assume round-robin (SCHED_RR) scheduling.
</body>
</ownedComment>
- <ownedComment xmi:id="_EuvHYCXREeGX6PuSE-DJlQ" annotatedElement="_5J9coCXQEeGX6PuSE-DJlQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_EuvHYCXREeGX6PuSE-DJlQ" annotatedElement="_5J9coCXQEeGX6PuSE-DJlQ">
<body> Interceptor variant of thread (inherits all, only difference to Thread superclass: tagged as connector)</body>
</ownedComment>
<packagedElement xmi:type="uml:Class" xmi:id="_SiY_AP-EEd6628OhKk_dpg" name="Thread">
- <ownedComment xmi:id="_lCtoICnOEeGxrprK9wB9iA" annotatedElement="_rVfYoMGJEd-Mveea1W_olA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_lCtoICnOEeGxrprK9wB9iA" annotatedElement="_rVfYoMGJEd-Mveea1W_olA">
<body>Priority of the thread. The interpretation of the value is OS specific. In case of POSIX; priorities are only taken into accound for threads with a FIFO and round-robin scheduliung policy.</body>
</ownedComment>
- <generalization xmi:id="_6bsEkARAEd--t-uhRn9OBA" general="_-WNegNtxEd6nqsBVkgJEEA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_6bsEkARAEd--t-uhRn9OBA" general="_-WNegNtxEd6nqsBVkgJEEA"/>
<ownedAttribute xmi:type="uml:Port" xmi:id="_ZjdOAP-EEd6628OhKk_dpg" name="rLC" aggregation="composite">
<type xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_rVfYoMGJEd-Mveea1W_olA" name="priority" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_rVfYoMGJEd-Mveea1W_olA" name="priority" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e6XsEFjmEeKaM_PspnG53g" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e6ckkFjmEeKaM_PspnG53g" value="1"/>
@@ -875,17 +875,17 @@ m_state = FOLLOWER;</body>
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <interfaceRealization xmi:id="_lrFSQDz9Ed-v9PxuTj6Elw" name="derived realization of ILifeCycle" client="_SiY_AP-EEd6628OhKk_dpg">
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_lrFSQDz9Ed-v9PxuTj6Elw" name="derived realization of ILifeCycle" client="_SiY_AP-EEd6628OhKk_dpg">
<supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
- <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
+ <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
</interfaceRealization>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_MWW4MAQyEd--t-uhRn9OBA" name="staticAct" specification="_yv198P-EEd6628OhKk_dpg">
- <ownedParameter xmi:id="_TJjA4CxyEeOMQpc6Y-MAJw" name="arg">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_TJjA4CxyEeOMQpc6Y-MAJw" name="arg">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TKI2wCxyEeOMQpc6Y-MAJw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TKVrECxyEeOMQpc6Y-MAJw" value="1"/>
</ownedParameter>
- <ownedParameter xmi:id="_TKyXACxyEeOMQpc6Y-MAJw" name="ret" direction="return">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_TKyXACxyEeOMQpc6Y-MAJw" name="ret" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TTLeACxyEeOMQpc6Y-MAJw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TTZgcCxyEeOMQpc6Y-MAJw" value="1"/>
@@ -908,23 +908,23 @@ pthread_setschedparam (pt, SCHED_RR, &amp;schedParam);
// TODO: check return code (in particular, SCHED_RR only works for root)
</body>
</ownedBehavior>
- <ownedOperation xmi:id="_yv198P-EEd6628OhKk_dpg" name="staticAct" isStatic="true" method="_MWW4MAQyEd--t-uhRn9OBA">
- <ownedParameter xmi:id="_1TXqoP-EEd6628OhKk_dpg" name="arg">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_yv198P-EEd6628OhKk_dpg" name="staticAct" isStatic="true" method="_MWW4MAQyEd--t-uhRn9OBA">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_1TXqoP-EEd6628OhKk_dpg" name="arg">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3MCccP-EEd6628OhKk_dpg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3MDDgP-EEd6628OhKk_dpg" value="1"/>
</ownedParameter>
- <ownedParameter xmi:id="_BywjgP-FEd6628OhKk_dpg" name="ret" direction="return">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_BywjgP-FEd6628OhKk_dpg" name="ret" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:id="_JmxyMD16Ed-Bk-AHd6yyoA" name="activate" method="_oP6UcED4Ed-_DOja_sRgWA"/>
- <ownedOperation xmi:id="_JqB6gD16Ed-Bk-AHd6yyoA" name="deactivate"/>
- <ownedOperation xmi:id="_TBScwCxyEeOMQpc6Y-MAJw" name="configuration_complete"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_JmxyMD16Ed-Bk-AHd6yyoA" name="activate" method="_oP6UcED4Ed-_DOja_sRgWA"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_JqB6gD16Ed-Bk-AHd6yyoA" name="deactivate"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_TBScwCxyEeOMQpc6Y-MAJw" name="configuration_complete"/>
</packagedElement>
<packagedElement xmi:type="uml:Dependency" xmi:id="_wCkVcNYGEd-CgJIavLpOxQ" name="ImplRequirement" client="_SiY_AP-EEd6628OhKk_dpg" supplier="_ea234NYGEd-CgJIavLpOxQ"/>
<packagedElement xmi:type="uml:Class" xmi:id="_WkkjoPNUEeCovO8AYZymZQ" name="CallEvent_">
- <ownedAttribute xmi:id="_YKtbAPNUEeCovO8AYZymZQ" name="operationID" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_YKtbAPNUEeCovO8AYZymZQ" name="operationID" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aDHHEPNUEeCovO8AYZymZQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aDIVMPNUEeCovO8AYZymZQ" value="1"/>
@@ -932,19 +932,19 @@ pthread_setschedparam (pt, SCHED_RR, &amp;schedParam);
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_gQGNwPNUEeCovO8AYZymZQ" name="kind" visibility="public" type="_jQjHAPNUEeCovO8AYZymZQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gQGNwPNUEeCovO8AYZymZQ" name="kind" visibility="public" type="_jQjHAPNUEeCovO8AYZymZQ">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_imLUUPNUEeCovO8AYZymZQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_imL7YPNUEeCovO8AYZymZQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_imuG4PNUEeCovO8AYZymZQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_-_HCMBI0EeGU49ezpRnvLg" name="portID">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_-_HCMBI0EeGU49ezpRnvLg" name="portID">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-_LToBI0EeGU49ezpRnvLg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-_L6sBI0EeGU49ezpRnvLg" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_qzHgkPNUEeCovO8AYZymZQ" name="params" visibility="public" type="_OU5asFaNEeKxltxu9uR4dg">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_qzHgkPNUEeCovO8AYZymZQ" name="params" visibility="public" type="_OU5asFaNEeKxltxu9uR4dg">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sMOBgPNUEeCovO8AYZymZQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sMPPoPNUEeCovO8AYZymZQ" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_sMRE0PNUEeCovO8AYZymZQ">
@@ -960,14 +960,14 @@ pthread_setschedparam (pt, SCHED_RR, &amp;schedParam);
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_k-OpoPN8EeCovO8AYZymZQ" name="events" visibility="public" type="_WkkjoPNUEeCovO8AYZymZQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_k-OpoPN8EeCovO8AYZymZQ" name="events" visibility="public" type="_WkkjoPNUEeCovO8AYZymZQ">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mr7hkPN8EeCovO8AYZymZQ" value="20"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mr-k4PN8EeCovO8AYZymZQ" value="20"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_msGgsPN8EeCovO8AYZymZQ">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="__a1A0PQXEeCovO8AYZymZQ" name="m_size" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="__a1A0PQXEeCovO8AYZymZQ" name="m_size" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A1N7MPQYEeCovO8AYZymZQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A1OiQPQYEeCovO8AYZymZQ" value="1"/>
@@ -975,7 +975,7 @@ pthread_setschedparam (pt, SCHED_RR, &amp;schedParam);
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_KnS5QPQYEeCovO8AYZymZQ" name="m_cond" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_KnS5QPQYEeCovO8AYZymZQ" name="m_cond" visibility="public">
<type xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_QWlVgPRTEeCUGrV0Hl4JwQ"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KyZ9EPQYEeCovO8AYZymZQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KyakIPQYEeCovO8AYZymZQ" value="1"/>
@@ -983,13 +983,13 @@ pthread_setschedparam (pt, SCHED_RR, &amp;schedParam);
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_Ig_MUCSlEeG6GJ4vU06VYQ" name="ID_TIMEOUT" isStatic="true">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Ig_MUCSlEeG6GJ4vU06VYQ" name="ID_TIMEOUT" isStatic="true">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IjAlkCSlEeG6GJ4vU06VYQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IjCawCSlEeG6GJ4vU06VYQ" value="1"/>
<defaultValue xmi:type="uml:LiteralInteger" xmi:id="_SjUM4CSlEeG6GJ4vU06VYQ" name="" value="-1"/>
</ownedAttribute>
- <interfaceRealization xmi:id="_mI0xEPQXEeCovO8AYZymZQ" name="derived realization of IPoolControl" client="_JRmo0PNAEeCovO8AYZymZQ" supplier="_omxU4PNAEeCovO8AYZymZQ" contract="_omxU4PNAEeCovO8AYZymZQ"/>
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_mI0xEPQXEeCovO8AYZymZQ" name="derived realization of IPoolControl" client="_JRmo0PNAEeCovO8AYZymZQ" supplier="_omxU4PNAEeCovO8AYZymZQ" contract="_omxU4PNAEeCovO8AYZymZQ"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_2HjeoPQXEeCovO8AYZymZQ" name="writeEvent" specification="_f1HmEPQREeCovO8AYZymZQ0">
<language>C/C++</language>
<body>events[0] = event;
@@ -1018,56 +1018,56 @@ return events[0];</body>
<language>C/C++</language>
<body>m_cond.lock();</body>
</ownedBehavior>
- <ownedOperation xmi:id="_tK0poPQWEeCovO8AYZymZQ0" name="readEvent" method="_9xRCAPQXEeCovO8AYZymZQ">
- <ownedParameter xmi:id="_HUTnoCVyEeGaL60JjVj19Q" name="timeout">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_tK0poPQWEeCovO8AYZymZQ0" name="readEvent" method="_9xRCAPQXEeCovO8AYZymZQ">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_HUTnoCVyEeGaL60JjVj19Q" name="timeout">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HUWq8CVyEeGaL60JjVj19Q" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HUXSACVyEeGaL60JjVj19Q" value="1"/>
</ownedParameter>
- <ownedParameter xmi:id="_HUZHMCVyEeGaL60JjVj19Q" type="_WkkjoPNUEeCovO8AYZymZQ" direction="return">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_HUZHMCVyEeGaL60JjVj19Q" type="_WkkjoPNUEeCovO8AYZymZQ" direction="return">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HUbjcCVyEeGaL60JjVj19Q" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HUcxkCVyEeGaL60JjVj19Q" value="1"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:id="_FBMo4PQXEeCovO8AYZymZQ0" name="size" method="_5Sw2YPQXEeCovO8AYZymZQ">
- <ownedParameter xmi:id="_mKtAYPQXEeCovO8AYZymZQ" direction="return">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_FBMo4PQXEeCovO8AYZymZQ0" name="size" method="_5Sw2YPQXEeCovO8AYZymZQ">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_mKtAYPQXEeCovO8AYZymZQ" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mKvcoPQXEeCovO8AYZymZQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mKwqwPQXEeCovO8AYZymZQ" value="1"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:id="_f1HmEPQREeCovO8AYZymZQ0" name="writeEvent" method="_2HjeoPQXEeCovO8AYZymZQ">
- <ownedParameter xmi:id="_HRdvACVyEeGaL60JjVj19Q" name="event" type="_WkkjoPNUEeCovO8AYZymZQ">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_f1HmEPQREeCovO8AYZymZQ0" name="writeEvent" method="_2HjeoPQXEeCovO8AYZymZQ">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_HRdvACVyEeGaL60JjVj19Q" name="event" type="_WkkjoPNUEeCovO8AYZymZQ">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HUNhACVyEeGaL60JjVj19Q" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HUOvICVyEeGaL60JjVj19Q" value="1"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:id="_lrF08PRTEeCUGrV0Hl4JwQ" name="EventPool" method="_JoG14PRUEeCKVJwdD4MMsg"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_lrF08PRTEeCUGrV0Hl4JwQ" name="EventPool" method="_JoG14PRUEeCKVJwdD4MMsg"/>
</packagedElement>
<packagedElement xmi:type="uml:Interface" xmi:id="_elkpwPQREeCovO8AYZymZQ" name="IWriteEvent">
- <ownedOperation xmi:id="_f1HmEPQREeCovO8AYZymZQ" name="writeEvent" visibility="public" isAbstract="true">
- <ownedComment xmi:id="_wAdzUPQREeCovO8AYZymZQ">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_f1HmEPQREeCovO8AYZymZQ" name="writeEvent" visibility="public" isAbstract="true">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_wAdzUPQREeCovO8AYZymZQ">
<body>&lt;&lt;TextualRepresentation>>public abstract writeEvent (in event:BasicCalls::ContainerServices::Event) ;</body>
</ownedComment>
- <ownedParameter xmi:id="__4qMgCUQEeGXBt65HZzY7g" name="event" type="_WkkjoPNUEeCovO8AYZymZQ">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="__4qMgCUQEeGXBt65HZzY7g" name="event" type="_WkkjoPNUEeCovO8AYZymZQ">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__4raoCUQEeGXBt65HZzY7g" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__4sowCUQEeGXBt65HZzY7g" value="1"/>
</ownedParameter>
</ownedOperation>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_jQjHAPNUEeCovO8AYZymZQ" name="EventKind">
- <ownedLiteral xmi:id="_jv4uYPNUEeCovO8AYZymZQ" name="CallEvent"/>
- <ownedLiteral xmi:id="_kuDm0PNUEeCovO8AYZymZQ" name="SignalEvent"/>
- <ownedLiteral xmi:id="_ljD8MPNUEeCovO8AYZymZQ" name="TimeEvent"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_jv4uYPNUEeCovO8AYZymZQ" name="CallEvent"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kuDm0PNUEeCovO8AYZymZQ" name="SignalEvent"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ljD8MPNUEeCovO8AYZymZQ" name="TimeEvent"/>
</packagedElement>
<packagedElement xmi:type="uml:Interface" xmi:id="_omxU4PNAEeCovO8AYZymZQ" name="IPoolControl">
- <generalization xmi:id="_feaHgPQXEeCovO8AYZymZQ" general="_elkpwPQREeCovO8AYZymZQ"/>
- <generalization xmi:id="_GwxT0CUREeGXBt65HZzY7g" general="_DY2VwCUREeGXBt65HZzY7g"/>
- <ownedOperation xmi:id="_FBMo4PQXEeCovO8AYZymZQ" name="size" visibility="public" isAbstract="true">
- <ownedComment xmi:id="_NaRMoPQXEeCovO8AYZymZQ">
+ <generalization xmi:type="uml:Generalization" xmi:id="_feaHgPQXEeCovO8AYZymZQ" general="_elkpwPQREeCovO8AYZymZQ"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_GwxT0CUREeGXBt65HZzY7g" general="_DY2VwCUREeGXBt65HZzY7g"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_FBMo4PQXEeCovO8AYZymZQ" name="size" visibility="public" isAbstract="true">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_NaRMoPQXEeCovO8AYZymZQ">
<body>&lt;&lt;TextualRepresentation>>public abstract size () : BasicCalls::Long ;</body>
</ownedComment>
- <ownedParameter xmi:id="_RlkvcPQXEeCovO8AYZymZQ" direction="return">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_RlkvcPQXEeCovO8AYZymZQ" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Rll9kPQXEeCovO8AYZymZQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RlmkoPQXEeCovO8AYZymZQ" value="1"/>
@@ -1075,29 +1075,29 @@ return events[0];</body>
</ownedOperation>
</packagedElement>
<packagedElement xmi:type="uml:Interface" xmi:id="_DY2VwCUREeGXBt65HZzY7g" name="IReadEvent">
- <ownedOperation xmi:id="_tK0poPQWEeCovO8AYZymZQ" name="readEvent" visibility="public" isAbstract="true">
- <ownedComment xmi:id="_xPdjwPQWEeCovO8AYZymZQ">
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_tK0poPQWEeCovO8AYZymZQ" name="readEvent" visibility="public" isAbstract="true">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_xPdjwPQWEeCovO8AYZymZQ">
<body>&lt;&lt;TextualRepresentation>>public abstract readEvent(in timeout : BasicCalls::Long) : BasicCalls::ContainerServices::Event ;</body>
</ownedComment>
- <ownedParameter xmi:id="_PnwykPRREeCUGrV0Hl4JwQ" name="timeout">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_PnwykPRREeCUGrV0Hl4JwQ" name="timeout">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PofyYPRREeCUGrV0Hl4JwQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Pow4IPRREeCUGrV0Hl4JwQ" value="1"/>
</ownedParameter>
- <ownedParameter xmi:id="_Po7QMPRREeCUGrV0Hl4JwQ" type="_WkkjoPNUEeCovO8AYZymZQ" direction="return">
+ <ownedParameter xmi:type="uml:Parameter" xmi:id="_Po7QMPRREeCUGrV0Hl4JwQ" type="_WkkjoPNUEeCovO8AYZymZQ" direction="return">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PpWG8PRREeCUGrV0Hl4JwQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ppl-kPRREeCUGrV0Hl4JwQ" value="1"/>
</ownedParameter>
</ownedOperation>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_5J9coCXQEeGX6PuSE-DJlQ" name="ThreadInterceptor">
- <generalization xmi:id="_9thucCXQEeGX6PuSE-DJlQ" general="_SiY_AP-EEd6628OhKk_dpg"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_9thucCXQEeGX6PuSE-DJlQ" general="_SiY_AP-EEd6628OhKk_dpg"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_9V8OQCjYEeGFbebITJYb9g" name="PeriodicTimer">
- <ownedComment xmi:id="_zLeSkCnOEeGxrprK9wB9iA" annotatedElement="_tmNeoCjbEeGFbebITJYb9g">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_zLeSkCnOEeGxrprK9wB9iA" annotatedElement="_tmNeoCjbEeGFbebITJYb9g">
<body>The period length of the perdioci timer in ticks. Currently, a tick corresponds to 1 ms (simulation time in the underlying OS abstraction layer). It is planned to support VSL expressions, i.e. a value/unit pair.</body>
</ownedComment>
- <generalization xmi:id="_Y6lPACjZEeGFbebITJYb9g" general="_-WNegNtxEd6nqsBVkgJEEA"/>
+ <generalization xmi:type="uml:Generalization" xmi:id="_Y6lPACjZEeGFbebITJYb9g" general="_-WNegNtxEd6nqsBVkgJEEA"/>
<ownedAttribute xmi:type="uml:Port" xmi:id="_ATRiECjZEeGFbebITJYb9g" name="tick" visibility="public" aggregation="composite">
<type xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_Xb-y0AweEd6it_RkGhz_AA"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_E3y2ICjZEeGFbebITJYb9g" value="1"/>
@@ -1106,7 +1106,7 @@ return events[0];</body>
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_tmNeoCjbEeGFbebITJYb9g" name="periodLength" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_tmNeoCjbEeGFbebITJYb9g" name="periodLength" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tmmgMCjbEeGFbebITJYb9g" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tmnHQCjbEeGFbebITJYb9g" value="1"/>
@@ -1114,9 +1114,9 @@ return events[0];</body>
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <interfaceRealization xmi:id="_F9_-UCjbEeGFbebITJYb9g" name="derived realization of ILifeCycle" client="_9V8OQCjYEeGFbebITJYb9g">
+ <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_F9_-UCjbEeGFbebITJYb9g" name="derived realization of ILifeCycle" client="_9V8OQCjYEeGFbebITJYb9g">
<supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
- <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
+ <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
</interfaceRealization>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_RMkvkCjbEeGFbebITJYb9g" name="activate" specification="_F-cDMCjbEeGFbebITJYb9g">
<language>C/C++</language>
@@ -1129,12 +1129,12 @@ for (;;) {
timer.wakeUp(time);
}</body>
</ownedBehavior>
- <ownedOperation xmi:id="_F-cDMCjbEeGFbebITJYb9g" name="activate" method="_RMkvkCjbEeGFbebITJYb9g"/>
- <ownedOperation xmi:id="_F-iJ0CjbEeGFbebITJYb9g" name="deactivate"/>
- <ownedOperation xmi:id="_rljQcFy8EeOwKfaVRwV11Q" name="configuration_complete"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_F-cDMCjbEeGFbebITJYb9g" name="activate" method="_RMkvkCjbEeGFbebITJYb9g"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_F-iJ0CjbEeGFbebITJYb9g" name="deactivate"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_rljQcFy8EeOwKfaVRwV11Q" name="configuration_complete"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_1sCBICjZEeGFbebITJYb9g" name="PeriodicTimerRule">
- <ownedAttribute xmi:id="_6yVMkCjZEeGFbebITJYb9g" name="timer" visibility="public" type="_9V8OQCjYEeGFbebITJYb9g">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_6yVMkCjZEeGFbebITJYb9g" name="timer" visibility="public" type="_9V8OQCjYEeGFbebITJYb9g">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_54aFgCjaEeGFbebITJYb9g" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_54bToCjaEeGFbebITJYb9g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_54eW8CjaEeGFbebITJYb9g">
@@ -1143,14 +1143,14 @@ for (;;) {
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_-X6zMCjZEeGFbebITJYb9g" name="PeriodicTimerWithThread">
- <ownedAttribute xmi:id="_ARs_UCjaEeGFbebITJYb9g" name="timer" visibility="public" type="_9V8OQCjYEeGFbebITJYb9g" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ARs_UCjaEeGFbebITJYb9g" name="timer" visibility="public" type="_9V8OQCjYEeGFbebITJYb9g" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k_FtQCjaEeGFbebITJYb9g" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k_G7YCjaEeGFbebITJYb9g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_k_J-sCjaEeGFbebITJYb9g">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_RMqEkCjaEeGFbebITJYb9g" name="thread" visibility="public" type="_SiY_AP-EEd6628OhKk_dpg" aggregation="composite">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_RMqEkCjaEeGFbebITJYb9g" name="thread" visibility="public" type="_SiY_AP-EEd6628OhKk_dpg" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_j8bWYCjaEeGFbebITJYb9g" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_j8ckgCjaEeGFbebITJYb9g" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_j8eZsCjaEeGFbebITJYb9g">
@@ -1165,22 +1165,22 @@ for (;;) {
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedConnector xmi:id="_iDCL0CjaEeGFbebITJYb9g" name="Connector1">
- <end xmi:id="_iDCy4CjaEeGFbebITJYb9g" partWithPort="_RMqEkCjaEeGFbebITJYb9g" role="_ZjdOAP-EEd6628OhKk_dpg">
+ <ownedConnector xmi:type="uml:Connector" xmi:id="_iDCL0CjaEeGFbebITJYb9g" name="Connector1">
+ <end xmi:type="uml:ConnectorEnd" xmi:id="_iDCy4CjaEeGFbebITJYb9g" partWithPort="_RMqEkCjaEeGFbebITJYb9g" role="_ZjdOAP-EEd6628OhKk_dpg">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iDCy4ijaEeGFbebITJYb9g" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iDCy4SjaEeGFbebITJYb9g" value="1"/>
</end>
- <end xmi:id="_iDCy4yjaEeGFbebITJYb9g" partWithPort="_ARs_UCjaEeGFbebITJYb9g" role="__SLXgNtxEd6nqsBVkgJEEA">
+ <end xmi:type="uml:ConnectorEnd" xmi:id="_iDCy4yjaEeGFbebITJYb9g" partWithPort="_ARs_UCjaEeGFbebITJYb9g" role="__SLXgNtxEd6nqsBVkgJEEA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iDCy5SjaEeGFbebITJYb9g" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iDCy5CjaEeGFbebITJYb9g" value="1"/>
</end>
</ownedConnector>
- <ownedConnector xmi:id="_84IJsCkAEeGDDbdzqSb4UA" name="Connector2">
- <end xmi:id="_84JX0CkAEeGDDbdzqSb4UA" partWithPort="_ARs_UCjaEeGFbebITJYb9g" role="_ATRiECjZEeGFbebITJYb9g">
+ <ownedConnector xmi:type="uml:Connector" xmi:id="_84IJsCkAEeGDDbdzqSb4UA" name="Connector2">
+ <end xmi:type="uml:ConnectorEnd" xmi:id="_84JX0CkAEeGDDbdzqSb4UA" partWithPort="_ARs_UCjaEeGFbebITJYb9g" role="_ATRiECjZEeGFbebITJYb9g">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_84JX0ikAEeGDDbdzqSb4UA" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_84JX0SkAEeGDDbdzqSb4UA" value="1"/>
</end>
- <end xmi:id="_84L0ECkAEeGDDbdzqSb4UA" role="_3NSGwCkAEeGDDbdzqSb4UA">
+ <end xmi:type="uml:ConnectorEnd" xmi:id="_84L0ECkAEeGDDbdzqSb4UA" role="_3NSGwCkAEeGDDbdzqSb4UA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_84L0EikAEeGDDbdzqSb4UA" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_84L0ESkAEeGDDbdzqSb4UA" value="1"/>
</end>
@@ -1190,7 +1190,7 @@ for (;;) {
<supplier xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_ETakYDj8Edy0Rd6V_tf1-Q"/>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_OU5asFaNEeKxltxu9uR4dg" name="ParamValues">
- <ownedAttribute xmi:id="_RW82cFaNEeKxltxu9uR4dg" name="values" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_RW82cFaNEeKxltxu9uR4dg" name="values" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_IYEXcB-VEd6nGq8wpI2tjg"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TAmU0FaNEeKxltxu9uR4dg" value="200"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TAqmQFaNEeKxltxu9uR4dg" value="200"/>
@@ -1200,7 +1200,7 @@ for (;;) {
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_Y8dPQFaNEeKxltxu9uR4dg" name="QoS">
- <ownedAttribute xmi:id="_fYeQcFaNEeKxltxu9uR4dg" name="deadline" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_fYeQcFaNEeKxltxu9uR4dg" name="deadline" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gFUvYFaNEeKxltxu9uR4dg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gFYZwFaNEeKxltxu9uR4dg" value="1"/>
@@ -1208,7 +1208,7 @@ for (;;) {
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_oUVYMFaNEeKxltxu9uR4dg" name="period" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_oUVYMFaNEeKxltxu9uR4dg" name="period" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rUQF8FaNEeKxltxu9uR4dg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rUSiMFaNEeKxltxu9uR4dg" value="1"/>
@@ -1216,7 +1216,7 @@ for (;;) {
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_xXGZMFaNEeKxltxu9uR4dg" name="readyTime" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_xXGZMFaNEeKxltxu9uR4dg" name="readyTime" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yjbCYFaNEeKxltxu9uR4dg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yjcQgFaNEeKxltxu9uR4dg" value="1"/>
@@ -1234,14 +1234,14 @@ for (;;) {
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_y4qB4ARJEd--t-uhRn9OBA" name="containerRules">
- <ownedComment xmi:id="_q-kFUMTJEd-cLazKlAeYsQ" annotatedElement="_14WtMARJEd--t-uhRn9OBA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_q-kFUMTJEd-cLazKlAeYsQ" annotatedElement="_14WtMARJEd--t-uhRn9OBA">
<body>This rule adds an interceptor for the lifecycle (lc) port. It will use the Thread implementation that executes the activate method in a new thread of a given priority (property of the interceptor implementation)</body>
</ownedComment>
- <ownedComment xmi:id="_H0IrsDbgEeGdqp2YT1LwWw" annotatedElement="_1sCBICjZEeGFbebITJYb9g">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_H0IrsDbgEeGdqp2YT1LwWw" annotatedElement="_1sCBICjZEeGFbebITJYb9g">
<body>Adds a periodic timer to the container</body>
</ownedComment>
<packagedElement xmi:type="uml:Class" xmi:id="_14WtMARJEd--t-uhRn9OBA" name="runStartThread">
- <ownedAttribute xmi:id="_mvN04PTWEeCn1-FCrfecFg" name="start" visibility="public" type="_5J9coCXQEeGX6PuSE-DJlQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_mvN04PTWEeCn1-FCrfecFg" name="start" visibility="public" type="_5J9coCXQEeGX6PuSE-DJlQ">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nPVfYPTWEeCn1-FCrfecFg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nPXUkPTWEeCn1-FCrfecFg" value="1"/>
</ownedAttribute>
@@ -1264,17 +1264,17 @@ for (;;) {
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_uFRRUH7dEd-FNNgSS03RxQ" name="configOptions">
<packagedElement xmi:type="uml:Class" xmi:id="_29YhgH7dEd-FNNgSS03RxQ" name="Distribution">
- <ownedComment xmi:id="_INNDgH7eEd-FNNgSS03RxQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_INNDgH7eEd-FNNgSS03RxQ">
<body>Use for distributed applications</body>
</ownedComment>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_3myD0H7dEd-FNNgSS03RxQ" name="Debug">
- <ownedComment xmi:id="_9u2OQH7dEd-FNNgSS03RxQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_9u2OQH7dEd-FNNgSS03RxQ">
<body>Use for debugging in general</body>
</ownedComment>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_7JeHcH7dEd-FNNgSS03RxQ" name="Trace">
- <ownedComment xmi:id="_MzHesH7eEd-FNNgSS03RxQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_MzHesH7eEd-FNNgSS03RxQ">
<body>Use for tracing.</body>
</ownedComment>
</packagedElement>
@@ -1283,35 +1283,35 @@ for (;;) {
<packagedElement xmi:type="uml:Class" xmi:id="_ea234NYGEd-CgJIavLpOxQ" name="pthread"/>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_m7SIwOUYEd-P08Bciq_LqQ" name="perClass">
- <ownedTemplateSignature xmi:id="_rNm5kOUYEd-P08Bciq_LqQ" parameter="_wfwIoOUYEd-P08Bciq_LqQ">
+ <ownedTemplateSignature xmi:type="uml:TemplateSignature" xmi:id="_rNm5kOUYEd-P08Bciq_LqQ" parameter="_wfwIoOUYEd-P08Bciq_LqQ">
<ownedParameter xmi:type="uml:ClassifierTemplateParameter" xmi:id="_wfwIoOUYEd-P08Bciq_LqQ" parameteredElement="_6uRBMOuqEeCTfOY57pgE3w">
<ownedParameteredElement xmi:type="uml:Class" xmi:id="_6uRBMOuqEeCTfOY57pgE3w" name="T" templateParameter="_wfwIoOUYEd-P08Bciq_LqQ"/>
</ownedParameter>
</ownedTemplateSignature>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_QQPDUCQeEeGj_4swHBbKwg" name="PortIDs">
- <ownedLiteral xmi:id="_QQPDUSQeEeGj_4swHBbKwg" name="PORTID_[name/]"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_QQPDUSQeEeGj_4swHBbKwg" name="PORTID_[name/]"/>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_RPCMoOxIEd-2rr_yAeKkjQ" name="methodCall_comp">
- <ownedComment xmi:id="_q1w5MK8qEeCXIcykFPsB8Q" annotatedElement="_RPCMoOxIEd-2rr_yAeKkjQ">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_q1w5MK8qEeCXIcykFPsB8Q" annotatedElement="_RPCMoOxIEd-2rr_yAeKkjQ">
<body>Elements in this package depend not only on the Interface I (which is a non-owned template parameter taken from the methodCall signature), but also on a class parameter T, which is bound to the component within a container binding.
Be aware that the number of instantiated template packages will be considerably larger compared to a dependency of the interface only</body>
</ownedComment>
- <ownedTemplateSignature xmi:id="_ewC6kOxIEd-2rr_yAeKkjQ" parameter="_WzWVUPfBEd2TbIfwytOyPA _QBCTAOxJEd-2rr_yAeKkjQ">
+ <ownedTemplateSignature xmi:type="uml:TemplateSignature" xmi:id="_ewC6kOxIEd-2rr_yAeKkjQ" parameter="_WzWVUPfBEd2TbIfwytOyPA _QBCTAOxJEd-2rr_yAeKkjQ">
<ownedParameter xmi:type="uml:ClassifierTemplateParameter" xmi:id="_QBCTAOxJEd-2rr_yAeKkjQ" parameteredElement="_zILRsPPlEd-BP4i7K5Y1eA">
<ownedParameteredElement xmi:type="uml:Class" xmi:id="_zILRsPPlEd-BP4i7K5Y1eA" name="T" templateParameter="_QBCTAOxJEd-2rr_yAeKkjQ"/>
</ownedParameter>
</ownedTemplateSignature>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="__lTvkPN0EeCovO8AYZymZQ" name="methodCall_size">
- <ownedTemplateSignature xmi:id="_EfH-MPN1EeCovO8AYZymZQ" parameter="_WzWVUPfBEd2TbIfwytOyPA _TbLb4PN3EeCovO8AYZymZQ">
- <ownedParameter xmi:id="_TbLb4PN3EeCovO8AYZymZQ" parameteredElement="_VGE3cPN3EeCovO8AYZymZQ">
+ <ownedTemplateSignature xmi:type="uml:TemplateSignature" xmi:id="_EfH-MPN1EeCovO8AYZymZQ" parameter="_WzWVUPfBEd2TbIfwytOyPA _TbLb4PN3EeCovO8AYZymZQ">
+ <ownedParameter xmi:type="uml:TemplateParameter" xmi:id="_TbLb4PN3EeCovO8AYZymZQ" parameteredElement="_VGE3cPN3EeCovO8AYZymZQ">
<ownedParameteredElement xmi:type="uml:LiteralInteger" xmi:id="_VGE3cPN3EeCovO8AYZymZQ" name="size" templateParameter="_TbLb4PN3EeCovO8AYZymZQ"/>
</ownedParameter>
</ownedTemplateSignature>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_gEZXADY7EeKvFqG4YPX3sg" name="methodCall_port">
- <ownedTemplateSignature xmi:id="_kCZdoDY7EeKvFqG4YPX3sg" parameter="_WzWVUPfBEd2TbIfwytOyPA _udDzwDY9EeKvFqG4YPX3sg">
+ <ownedTemplateSignature xmi:type="uml:TemplateSignature" xmi:id="_kCZdoDY7EeKvFqG4YPX3sg" parameter="_WzWVUPfBEd2TbIfwytOyPA _udDzwDY9EeKvFqG4YPX3sg">
<ownedParameter xmi:type="uml:ConnectableElementTemplateParameter" xmi:id="_udDzwDY9EeKvFqG4YPX3sg" parameteredElement="_9GMAUDY9EeKvFqG4YPX3sg">
<ownedParameteredElement xmi:type="uml:Port" xmi:id="_9GMAUDY9EeKvFqG4YPX3sg" name="P" templateParameter="_udDzwDY9EeKvFqG4YPX3sg"/>
</ownedParameter>
@@ -1325,30 +1325,31 @@ Be aware that the number of instantiated template packages will be considerably
<packagedElement xmi:type="uml:Package" xmi:id="_tkiC4HI3EeOCrdvV8oxOKA" name="bindingHelpers">
<packagedElement xmi:type="uml:Class" xmi:id="_z2tyoHI3EeOCrdvV8oxOKA" name="LoopOperations"/>
<packagedElement xmi:type="uml:Class" xmi:id="_4H-ZoHkgEeOCpqruXGWNPw" name="BindOperation"/>
+ <packagedElement xmi:type="uml:Class" xmi:id="_g8oe8LsMEeO0n5elMxN1LQ" name="BindCppIncludeToFirstActual"/>
</packagedElement>
- <profileApplication xmi:id="_O6TiIjLUEd26WNosUASSSw">
- <eAnnotations xmi:id="_O6TiIzLUEd26WNosUASSSw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_O6TiIjLUEd26WNosUASSSw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O6TiIzLUEd26WNosUASSSw" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/>
</eAnnotations>
- <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
</profileApplication>
- <profileApplication xmi:id="_ugrx4AHIEd6pm-KfUZMnnQ">
- <eAnnotations xmi:id="_ugztsAHIEd6pm-KfUZMnnQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ugrx4AHIEd6pm-KfUZMnnQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ugztsAHIEd6pm-KfUZMnnQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
</eAnnotations>
- <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
</profileApplication>
- <profileApplication xmi:id="_u03PkFRxEd6GqrP6fkWBoQ">
- <eAnnotations xmi:id="_u1sWAFRxEd6GqrP6fkWBoQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_u03PkFRxEd6GqrP6fkWBoQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_u1sWAFRxEd6GqrP6fkWBoQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/>
</eAnnotations>
- <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
</profileApplication>
- <profileApplication xmi:id="_0x8woBn3EeONpa5JgejICQ">
- <eAnnotations xmi:id="_01dXoBn3EeONpa5JgejICQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_0x8woBn3EeONpa5JgejICQ">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_01dXoBn3EeONpa5JgejICQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Concurrency"/>
</eAnnotations>
- <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_A_vtYBJeEdy3Td9UhuLFPg"/>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_A_vtYBJeEdy3Td9UhuLFPg"/>
</profileApplication>
</uml:Model>
<FCM:Port xmi:id="_u1uLMFRxEd6GqrP6fkWBoQ" base_Port="_P4xVsNtuEd2eM5kqcby5ZA" kind="_9Fif4FRxEd6GqrP6fkWBoQ"/>
@@ -1548,4 +1549,5 @@ Be aware that the number of instantiated template packages will be considerably
</FCM:DerivedElement>
<FCM:BindingHelper xmi:id="_nLe_sHJDEeOMF7YEvnQt5g" base_Class="_z2tyoHI3EeOCrdvV8oxOKA"/>
<FCM:BindingHelper xmi:id="_7qhTUHkgEeOCpqruXGWNPw" base_Class="_4H-ZoHkgEeOCpqruXGWNPw"/>
+ <FCM:BindingHelper xmi:id="_mFUQALsMEeO0n5elMxN1LQ" base_Class="_g8oe8LsMEeO0n5elMxN1LQ"/>
</xmi:XMI>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml
index f1319fa6607..16db2ded696 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml
@@ -141,8 +141,16 @@
class="org.eclipse.papyrus.qompass.modellibs.core.bindinghelpers.BindOperation">
</client>
</extension>
+ <extension
+ id="BindCppIncludeToFirstActual"
+ point="org.eclipse.papyrus.fcm.profile.fcmBindingHelper">
+ <client
+ bindingHelperName="BindCppIncludeToFirstActual"
+ class="org.eclipse.papyrus.qompass.modellibs.core.bindinghelpers.BindCppIncludeToFirstActual">
+ </client>
+ </extension>
<extension point="org.eclipse.help.toc">
<toc file="help/modellibs-core-examples.xml"/>
<toc file="help/modellibs-core-library.xml"/>
</extension>
-</plugin> \ No newline at end of file
+</plugin>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppInclude.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindCppIncludeToFirstActual.java
index 4fcbc12df1f..0e6f173894b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppInclude.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindCppIncludeToFirstActual.java
@@ -12,41 +12,37 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.qompass.designer.core.templates;
+package org.eclipse.papyrus.qompass.modellibs.core.bindinghelpers;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.C_Cpp.Include;
+import org.eclipse.papyrus.FCM.util.IBindingHelper;
import org.eclipse.papyrus.qompass.designer.core.acceleo.AcceleoDriverWrapper;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PostCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.TemplateBinding;
import org.eclipse.uml2.uml.util.UMLUtil;
/**
- * Instantiate the text within a C++Include tag.
- * TODO: this function is C++ specific and should not be here
+ * Instantiate (bind Acceleo template) the text within a C++Include stereotype.
+ *
+ * The actual is the first actual within the template binding. This function does not check
+ * whether the classifier has the template stereotype.
+ *
+ * Note: this function is C++ specific, but many parts of the model library are C++ specific as well
*
*/
-public class InstantiateCppInclude implements CopyListener {
-
- public static InstantiateCppInclude getInstance() {
- if(instance == null) {
- instance = new InstantiateCppInclude();
- }
- return instance;
- }
+public class BindCppIncludeToFirstActual implements PostCopyListener, IBindingHelper {
- public void init(TemplateBinding binding, Object[] args) {
- this.binding = binding;
- }
-
- public EObject copyEObject(Copy copy, EObject targetEObj) {
+ public void postCopyEObject(LazyCopier copy, EObject targetEObj) {
// if (copy.get(sourceEObj) isWithinTemplate)
if(targetEObj instanceof Classifier) {
- // TODO: C++ specific code!
+
Classifier targetCl = (Classifier)targetEObj;
try {
Classifier actual = TemplateUtils.getFirstActualFromBinding(binding);
@@ -65,12 +61,12 @@ public class InstantiateCppInclude implements CopyListener {
throw new RuntimeException(e);
}
}
- return targetEObj;
}
- private static InstantiateCppInclude instance = null;
-
- private TemplateBinding binding;
+ protected TemplateBinding binding;
- // private Copy copy;
+ @Override
+ public void handleElement(TemplateBinding binding, Element object) {
+ this.binding = binding;
+ }
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindOperation.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindOperation.java
index 61fb5030c0c..c705d243fa0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindOperation.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/BindOperation.java
@@ -2,10 +2,10 @@ package org.eclipse.papyrus.qompass.modellibs.core.bindinghelpers;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.FCM.util.IBindingHelper;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
import org.eclipse.papyrus.qompass.designer.core.templates.BindingUtils;
import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.papyrus.qompass.modellibs.core.Activator;
import org.eclipse.uml2.uml.Behavior;
@@ -19,12 +19,12 @@ import org.eclipse.uml2.uml.TemplateBinding;
* Bind an operation to an actual, i.e. evaluate the Acceleo template within the opaque behavior associated with
* the operation.
*/
-public class BindOperation implements IBindingHelper, CopyListener {
+public class BindOperation implements IBindingHelper, PreCopyListener {
private TemplateBinding binding;
@Override
- public EObject copyEObject(Copy copy, EObject sourceEObj) {
+ public EObject preCopyEObject(LazyCopier copy, EObject sourceEObj) {
if(sourceEObj instanceof Operation) {
Operation operation = (Operation) sourceEObj;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppIncludeWOB.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/InstantiateCppIncludeWithItSelf.java
index 85f5766d599..4d6fa72e82e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppIncludeWOB.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/InstantiateCppIncludeWithItSelf.java
@@ -12,37 +12,36 @@
*
*****************************************************************************/
-package org.eclipse.papyrus.qompass.designer.core.templates;
+package org.eclipse.papyrus.qompass.modellibs.core.bindinghelpers;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.C_Cpp.Include;
import org.eclipse.papyrus.FCM.Template;
+import org.eclipse.papyrus.FCM.util.IBindingHelper;
import org.eclipse.papyrus.qompass.designer.core.acceleo.AcceleoDriverWrapper;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PostCopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.TemplateBinding;
import org.eclipse.uml2.uml.util.UMLUtil;
/**
- * Instantiate the text within a C++Include tag.
+ * Instantiate (bind Acceleo template) the text within a C++Include stereotype.
+ *
* Difference to InstantiateCppInclude: This function does not obtain the actual from a template
- * binding.
+ * binding. Instead it takes the classifier having the Template stereotype as actual.
+ * TODO: What's the use of this function. The classifier is known at this time - unless in a template?
*
- * TODO: this function is C++ specific and should not be here
+ * Note: this function is C++ specific, but many parts of the model library are C++ specific as well
*
*/
-public class InstantiateCppIncludeWOB implements CopyListener {
+@Deprecated
+public class InstantiateCppIncludeWithItSelf implements PostCopyListener, IBindingHelper {
- public static InstantiateCppIncludeWOB getInstance() {
- if(instance == null) {
- instance = new InstantiateCppIncludeWOB();
- }
- return instance;
- }
-
- public EObject copyEObject(Copy copy, EObject targetEObj) {
+ public void postCopyEObject(LazyCopier copy, EObject targetEObj) {
// if (copy.get(sourceEObj) isWithinTemplate)
if(targetEObj instanceof Classifier) {
// TODO: C++ specific code!
@@ -65,8 +64,10 @@ public class InstantiateCppIncludeWOB implements CopyListener {
}
}
}
- return targetEObj;
}
- private static InstantiateCppIncludeWOB instance = null;
+ @Override
+ public void handleElement(TemplateBinding binding, Element object) {
+ // don't need to handle binding
+ }
}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java
index 11f066f202b..d12ffca85ee 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java
@@ -5,10 +5,10 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.FCM.util.IBindingHelper;
import org.eclipse.papyrus.qompass.designer.core.acceleo.AcceleoDriverWrapper;
-import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
+import org.eclipse.papyrus.qompass.designer.core.listeners.PreCopyListener;
import org.eclipse.papyrus.qompass.designer.core.templates.BindingUtils;
import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.papyrus.qompass.modellibs.core.Activator;
import org.eclipse.uml2.uml.Behavior;
@@ -21,11 +21,11 @@ import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.TemplateBinding;
import org.eclipse.uml2.uml.Type;
-public class LoopOperations implements IBindingHelper, CopyListener {
+public class LoopOperations implements IBindingHelper, PreCopyListener {
private TemplateBinding binding;
- public EObject copyEObject(Copy copy, EObject sourceEObj) {
+ public EObject preCopyEObject(LazyCopier copy, EObject sourceEObj) {
if(sourceEObj instanceof Operation) {
Operation operation = (Operation)sourceEObj;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
index d3e20ce76c6..dfae71fc195 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.FCM.util.ITemplateMappingRule;
import org.eclipse.papyrus.qompass.designer.core.Utils;
import org.eclipse.papyrus.qompass.designer.core.templates.TemplateInstantiation;
import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
-import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FixTemplateSync;
import org.eclipse.uml2.uml.Class;
@@ -124,7 +124,7 @@ public class TemplatePort implements ITemplateMappingRule {
try {
TemplateBinding binding =
TemplateUtils.fixedBinding(model, extendedPort, (Classifier)type);
- Copy copy = new Copy(model, model, false);
+ LazyCopier copy = new LazyCopier(model, model, false, true);
TemplateInstantiation ti = new TemplateInstantiation(copy, binding);
// remove listener synchronizing implementation, since it would add derived
// elements for the extended port itself (e.g. provided operations)
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml
index 9d6b03fb1c4..b14f69f2b81 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/ClientServerTraceTest.uml
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc">
<uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ClientServerTraceTest">
- <packageImport xmi:type="uml:PackageImport" xmi:id="_O6TiITLUEd26WNosUASSSw">
+ <packageImport xmi:id="_O6TiITLUEd26WNosUASSSw">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
- <packageImport xmi:type="uml:PackageImport" xmi:id="_Bc1WIFW4Ed63BrxiKsw-0Q">
+ <packageImport xmi:id="_Bc1WIFW4Ed63BrxiKsw-0Q">
<importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/>
</packageImport>
- <packageImport xmi:type="uml:PackageImport" xmi:id="_rwBsMP7AEd6Zw96O-tCw7A">
+ <packageImport xmi:id="_rwBsMP7AEd6Zw96O-tCw7A">
<importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/>
</packageImport>
- <packageImport xmi:type="uml:PackageImport" xmi:id="_7K0UkACUEd-PD8FdFs7bpA">
+ <packageImport xmi:id="_7K0UkACUEd-PD8FdFs7bpA">
<importedPackage xmi:type="uml:Model" href="pathmap://QML_DISTRIBUTION/distribution.uml#_O6TiIDLUEd26WNosUASSSw"/>
</packageImport>
- <packageImport xmi:type="uml:PackageImport" xmi:id="__D5MwE2WEeGzNbfAXPgNLA">
+ <packageImport xmi:id="__D5MwE2WEeGzNbfAXPgNLA">
<importedPackage xmi:type="uml:Model" href="pathmap://QML_TRACE/tracing.uml#_H-ZqYDKeEd-WprEKTCaiMA"/>
</packageImport>
<packagedElement xmi:type="uml:Package" xmi:id="_LOqIEDLaEd2qeKRLMdIx_A" name="components">
<packagedElement xmi:type="uml:Package" xmi:id="_OGM88DLaEd2qeKRLMdIx_A" name="Server">
- <packagedElement xmi:type="uml:Class" xmi:id="_oqZNUDLaEd2qeKRLMdIx_A" clientDependency="_YQqH0JYlEd6G9q9hwr11bw" name="CServer_impl" classifierBehavior="_5Vd9UDclEeKAhIrFXfR8zQ">
+ <packagedElement xmi:type="uml:Class" xmi:id="_oqZNUDLaEd2qeKRLMdIx_A" name="CServer_impl" classifierBehavior="_5Vd9UDclEeKAhIrFXfR8zQ">
<ownedAttribute xmi:type="uml:Port" xmi:id="_4KiE8DLbEd2qeKRLMdIx_A" name="p" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/>
- <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/>
+ <interfaceRealization xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ML-4AKI5Ed6FqJCjEUrkqQ" name="add" specification="_TbIjUJYlEd6G9q9hwr11bw">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_xOQMoC7NEeOY-cM3M1mqKw" name="a">
+ <ownedParameter xmi:id="_xOQMoC7NEeOY-cM3M1mqKw" name="a">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xOzmQC7NEeOY-cM3M1mqKw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xO_zgC7NEeOY-cM3M1mqKw" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_xPLZsC7NEeOY-cM3M1mqKw" name="b">
+ <ownedParameter xmi:id="_xPLZsC7NEeOY-cM3M1mqKw" name="b">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xPuzUC7NEeOY-cM3M1mqKw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xP6ZgC7NEeOY-cM3M1mqKw" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_xQF_sC7NEeOY-cM3M1mqKw" name="res" direction="return">
+ <ownedParameter xmi:id="_xQF_sC7NEeOY-cM3M1mqKw" name="res" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xQvf8C7NEeOY-cM3M1mqKw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xQ7GIC7NEeOY-cM3M1mqKw" value="1"/>
@@ -42,17 +42,17 @@
return a+b;</body>
</ownedBehavior>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_I1R3YAcDEeGnrLqQ0OQeAg" name="mult" specification="_4ZEZwHecEd6r18stFZxmFQ">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_xRMy8C7NEeOY-cM3M1mqKw" name="a">
+ <ownedParameter xmi:id="_xRMy8C7NEeOY-cM3M1mqKw" name="a">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xRwzoC7NEeOY-cM3M1mqKw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xR8Z0C7NEeOY-cM3M1mqKw" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_xSInEC7NEeOY-cM3M1mqKw" name="b">
+ <ownedParameter xmi:id="_xSInEC7NEeOY-cM3M1mqKw" name="b">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xStO0C7NEeOY-cM3M1mqKw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xS41AC7NEeOY-cM3M1mqKw" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_xTFCQC7NEeOY-cM3M1mqKw" name="res" direction="return">
+ <ownedParameter xmi:id="_xTFCQC7NEeOY-cM3M1mqKw" name="res" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xTn00C7NEeOY-cM3M1mqKw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xT0CEC7NEeOY-cM3M1mqKw" value="1"/>
@@ -62,55 +62,55 @@ return a+b;</body>
return a*b;</body>
</ownedBehavior>
<ownedBehavior xmi:type="uml:StateMachine" xmi:id="_5Vd9UDclEeKAhIrFXfR8zQ" name="ServerStateMachine">
- <region xmi:type="uml:Region" xmi:id="_57WRkDclEeKAhIrFXfR8zQ" name="Region1">
- <transition xmi:type="uml:Transition" xmi:id="_8ZB08DclEeKAhIrFXfR8zQ" name="Transition0" source="_66D8kDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/>
- <transition xmi:type="uml:Transition" xmi:id="_-v4XkDclEeKAhIrFXfR8zQ" name="Transition1" source="_9f6kgDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/>
+ <region xmi:id="_57WRkDclEeKAhIrFXfR8zQ" name="Region1">
+ <transition xmi:id="_8ZB08DclEeKAhIrFXfR8zQ" name="Transition0" source="_66D8kDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/>
+ <transition xmi:id="_-v4XkDclEeKAhIrFXfR8zQ" name="Transition1" source="_9f6kgDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/>
<subvertex xmi:type="uml:State" xmi:id="_66D8kDclEeKAhIrFXfR8zQ" name="State0"/>
<subvertex xmi:type="uml:Pseudostate" xmi:id="_9f6kgDclEeKAhIrFXfR8zQ" name="Initial0"/>
</region>
</ownedBehavior>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_4ZEZwHecEd6r18stFZxmFQ" name="mult" method="_I1R3YAcDEeGnrLqQ0OQeAg">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_nvpKUDVdEeKoYLVLZgpRiw" name="a">
+ <ownedOperation xmi:id="_4ZEZwHecEd6r18stFZxmFQ" name="mult" method="_I1R3YAcDEeGnrLqQ0OQeAg">
+ <ownedParameter xmi:id="_nvpKUDVdEeKoYLVLZgpRiw" name="a">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvup4DVdEeKoYLVLZgpRiw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvvQ8DVdEeKoYLVLZgpRiw" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_nvwfEDVdEeKoYLVLZgpRiw" name="b">
+ <ownedParameter xmi:id="_nvwfEDVdEeKoYLVLZgpRiw" name="b">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvy7UDVdEeKoYLVLZgpRiw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvziYDVdEeKoYLVLZgpRiw" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_nv1XkDVdEeKoYLVLZgpRiw" name="res" direction="return">
+ <ownedParameter xmi:id="_nv1XkDVdEeKoYLVLZgpRiw" name="res" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nv3z0DVdEeKoYLVLZgpRiw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nv4a4DVdEeKoYLVLZgpRiw" value="1"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_TbIjUJYlEd6G9q9hwr11bw" name="add" method="_ML-4AKI5Ed6FqJCjEUrkqQ">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbZCAJYlEd6G9q9hwr11bw" name="a">
+ <ownedOperation xmi:id="_TbIjUJYlEd6G9q9hwr11bw" name="add" method="_ML-4AKI5Ed6FqJCjEUrkqQ">
+ <ownedParameter xmi:id="_TbZCAJYlEd6G9q9hwr11bw" name="a">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbdTcJYlEd6G9q9hwr11bw" name="b">
+ <ownedParameter xmi:id="_TbdTcJYlEd6G9q9hwr11bw" name="b">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbkoMJYlEd6G9q9hwr11bw" name="res" direction="return">
+ <ownedParameter xmi:id="_TbkoMJYlEd6G9q9hwr11bw" name="res" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_rrf74DVdEeKoYLVLZgpRiw" name="check">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_4UNv4DVdEeKoYLVLZgpRiw" name="write">
+ <ownedOperation xmi:id="_rrf74DVdEeKoYLVLZgpRiw" name="check">
+ <ownedParameter xmi:id="_4UNv4DVdEeKoYLVLZgpRiw" name="write">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4UO-ADVdEeKoYLVLZgpRiw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4UPlEDVdEeKoYLVLZgpRiw" value="1"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_9OJPEDVkEeKoYLVLZgpRiw" name="testOp">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_Br-FQDVlEeKoYLVLZgpRiw" name="testPar">
+ <ownedOperation xmi:id="_9OJPEDVkEeKoYLVLZgpRiw" name="testOp">
+ <ownedParameter xmi:id="_Br-FQDVlEeKoYLVLZgpRiw" name="testPar">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_6ERa0DW2EeKyT6LlKoWJIA" name="length">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_FfLX4DW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA">
+ <ownedOperation xmi:id="_6ERa0DW2EeKyT6LlKoWJIA" name="length">
+ <ownedParameter xmi:id="_FfLX4DW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FfN0IDW3EeKyT6LlKoWJIA" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FfObMDW3EeKyT6LlKoWJIA" value="1"/>
</ownedParameter>
@@ -118,55 +118,55 @@ return a*b;</body>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_Tp4n8DLaEd2qeKRLMdIx_A" name="Interfaces">
- <ownedComment xmi:type="uml:Comment" xmi:id="_TDDBoDeEEeGPyrZ5I3hMlA" annotatedElement="_cn-H0DLbEd2qeKRLMdIx_A">
+ <ownedComment xmi:id="_TDDBoDeEEeGPyrZ5I3hMlA" annotatedElement="_cn-H0DLbEd2qeKRLMdIx_A">
<body>This interface contains services that are used by the client and provided by the server component</body>
</ownedComment>
<packagedElement xmi:type="uml:Interface" xmi:id="_cn-H0DLbEd2qeKRLMdIx_A" name="ICompute">
- <ownedOperation xmi:type="uml:Operation" xmi:id="_DGs6wDLgEd28fJKJJnUaeQ" name="add">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6wTLgEd28fJKJJnUaeQ" name="a">
+ <ownedOperation xmi:id="_DGs6wDLgEd28fJKJJnUaeQ" name="add">
+ <ownedParameter xmi:id="_DGs6wTLgEd28fJKJJnUaeQ" name="a">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6wzLgEd28fJKJJnUaeQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6wjLgEd28fJKJJnUaeQ" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b">
+ <ownedParameter xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6xzLgEd28fJKJJnUaeQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6xjLgEd28fJKJJnUaeQ" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return">
+ <ownedParameter xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6yzLgEd28fJKJJnUaeQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6yjLgEd28fJKJJnUaeQ" value="1"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY8TLgEd28fJKJJnUaeQ" name="a">
+ <ownedOperation xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true">
+ <ownedParameter xmi:id="_L8EY8TLgEd28fJKJJnUaeQ" name="a">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY8zLgEd28fJKJJnUaeQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY8jLgEd28fJKJJnUaeQ" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b">
+ <ownedParameter xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY9zLgEd28fJKJJnUaeQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY9jLgEd28fJKJJnUaeQ" value="1"/>
</ownedParameter>
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return">
+ <ownedParameter xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY-zLgEd28fJKJJnUaeQ" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY-jLgEd28fJKJJnUaeQ" value="1"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_rrbqcDVdEeKoYLVLZgpRiw" name="check" isAbstract="true">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_0xTp0DVdEeKoYLVLZgpRiw" name="write">
+ <ownedOperation xmi:id="_rrbqcDVdEeKoYLVLZgpRiw" name="check" isAbstract="true">
+ <ownedParameter xmi:id="_0xTp0DVdEeKoYLVLZgpRiw" name="write">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
</ownedParameter>
</ownedOperation>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_6DewoDW2EeKyT6LlKoWJIA" name="length">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_AP4BcDW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"/>
+ <ownedOperation xmi:id="_6DewoDW2EeKyT6LlKoWJIA" name="length">
+ <ownedParameter xmi:id="_AP4BcDW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"/>
</ownedOperation>
</packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_krMkcDW2EeKyT6LlKoWJIA" name="Point">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_m0WCQDW2EeKyT6LlKoWJIA" name="x" visibility="public">
+ <ownedAttribute xmi:id="_m0WCQDW2EeKyT6LlKoWJIA" name="x" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pOAoUDW2EeKyT6LlKoWJIA" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pOB2cDW2EeKyT6LlKoWJIA" value="1"/>
@@ -174,7 +174,7 @@ return a*b;</body>
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_yJIJMDW2EeKyT6LlKoWJIA" name="y" visibility="public">
+ <ownedAttribute xmi:id="_yJIJMDW2EeKyT6LlKoWJIA" name="y" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yd44QDW2EeKyT6LlKoWJIA" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yd6GYDW2EeKyT6LlKoWJIA" value="1"/>
@@ -185,28 +185,28 @@ return a*b;</body>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_etOZkDLaEd2qeKRLMdIx_A" name="Client">
- <ownedComment xmi:type="uml:Comment" xmi:id="_b5cakDeEEeGPyrZ5I3hMlA" annotatedElement="_34FjAPx3Ed6O2oOTPfeAMA">
+ <ownedComment xmi:id="_b5cakDeEEeGPyrZ5I3hMlA" annotatedElement="_34FjAPx3Ed6O2oOTPfeAMA">
<body>The client component inherits a specific port from the Cstart componen type: the port &quot;start&quot; which provides interface IRunnable containing a single operation &quot;run&quot;. By implementing this operation, the client gets initial control, comparable to a function &quot;main&quot; in classificla programming languages. </body>
</ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_H2U_oDeGEeGPyrZ5I3hMlA">
+ <ownedComment xmi:id="_H2U_oDeGEeGPyrZ5I3hMlA">
<body>This realization relationship has been added automatically by Qompass, it is derived from the fact that class CClient_impl implements the port &quot;start&quot; which provides the interface &quot;IStart&quot;</body>
</ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_fBRcQDeGEeGPyrZ5I3hMlA" annotatedElement="_IfjoETLbEd2qeKRLMdIx_A">
+ <ownedComment xmi:id="_fBRcQDeGEeGPyrZ5I3hMlA" annotatedElement="_IfjoETLbEd2qeKRLMdIx_A">
<body>The operation &quot;run&quot; (not the associated behavior) has been added automatically by Qompass in order to implement the operations of interfaces provided by ports, in this case of the operations of the &quot;IStart&quot; interface. It would be tedious to manually copy operations from an interface, as it would imply copying the complete signature with all parameters. The component developper has to provide a suitable behavior. A validation rule verifies if operations without behavior exist.</body>
</ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_kStEMDeHEeGPyrZ5I3hMlA">
+ <ownedComment xmi:id="_kStEMDeHEeGPyrZ5I3hMlA">
<annotatedElement xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
<annotatedElement xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_BHFPQJsqEd61Eo3nmu3JhQ"/>
<body>These two interface are part of the &quot;BasicCalls&quot; Qompass model library. The IStart interface is &quot;special&quot;, since the Qompass model transformations check for it existance in order to pass the &quot;main&quot; control to this component. A validation rule checks, if exactly one component instance provides this interface via the &quot;start&quot; port.</body>
</ownedComment>
- <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_ZmdDkEdDEeGxo4rn9hBAOQ" name="CClient_impl">
- <generalization xmi:type="uml:Generalization" xmi:id="_34FjAPx3Ed6O2oOTPfeAMA">
+ <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" name="CClient_impl">
+ <generalization xmi:id="_34FjAPx3Ed6O2oOTPfeAMA">
<general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/>
</generalization>
<ownedAttribute xmi:type="uml:Port" xmi:id="_DtWn4DLcEd2qeKRLMdIx_A" name="q" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/>
- <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_ZmdDkEdDEeGxo4rn9hBAOQ" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A">
+ <interfaceRealization xmi:id="_ZmdDkEdDEeGxo4rn9hBAOQ" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A">
<supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
- <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
+ <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
</interfaceRealization>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_ZnGj0EdDEeGxo4rn9hBAOQ">
<language>C/C++</language>
@@ -224,31 +224,31 @@ for (int i=0; i&lt;20; i++) {
<language>C/C++</language>
<body>cout &lt;&lt; &quot;This is a test operation&quot; &lt;&lt; endl;</body>
</ownedBehavior>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_ZnGj0EdDEeGxo4rn9hBAOQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/>
- <ownedOperation xmi:type="uml:Operation" xmi:id="_Qzp7gDclEeKAhIrFXfR8zQ" name="testOp" method="_yVALQDclEeKAhIrFXfR8zQ">
- <ownedParameter xmi:type="uml:Parameter" xmi:id="_rXu4UDc_EeKPle9CbXIcpQ" name="j">
+ <ownedOperation xmi:id="_ZnGj0EdDEeGxo4rn9hBAOQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/>
+ <ownedOperation xmi:id="_Qzp7gDclEeKAhIrFXfR8zQ" name="testOp" method="_yVALQDclEeKAhIrFXfR8zQ">
+ <ownedParameter xmi:id="_rXu4UDc_EeKPle9CbXIcpQ" name="j">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
</ownedParameter>
</ownedOperation>
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_XLQjUDLiEd2RVeNawwNNzg" name="System">
- <ownedComment xmi:type="uml:Comment" xmi:id="_s5iFMDeJEeGPyrZ5I3hMlA" annotatedElement="_bYJagDLiEd2RVeNawwNNzg">
+ <ownedComment xmi:id="_s5iFMDeJEeGPyrZ5I3hMlA" annotatedElement="_bYJagDLiEd2RVeNawwNNzg">
<body>A composite class in which two attributes represent the component instances client and server, respectively. The assembly between ports is done on this level.
A single class represents the complete application, typically called &quot;System&quot; or &quot;System_impl&quot;. Such a class provides the information to calculate a tree of instance specifications, a so-called deployment plan. Check out the context menu. can be generated from the </body>
</ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_Vcf9kDeKEeGPyrZ5I3hMlA" annotatedElement="_QO2s0E2rEeGl8qrc8BM7vA">
+ <ownedComment xmi:id="_Vcf9kDeKEeGPyrZ5I3hMlA" annotatedElement="_QO2s0E2rEeGl8qrc8BM7vA">
<body>This connection between ports is stereotyped. The &quot;connector&quot; provides information which specific interaction component is responsible for realising this connection. The interaction component is part of an Qompass model library. Select the connection and check out the Qompass pop &quot;Show/choose connector type or implementation&quot;. In this case an group of implementations has been chosen, which contains a socket connection in case of distribution and a direct connection, if co-localized</body>
</ownedComment>
<packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="System_impl">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="server" type="_oqZNUDLaEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_i-I7gDLiEd2RVeNawwNNzg" name="client" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/>
- <ownedConnector xmi:type="uml:Connector" xmi:id="_QO2s0E2rEeGl8qrc8BM7vA" name="qp_connector">
- <end xmi:type="uml:ConnectorEnd" xmi:id="_QO3T4E2rEeGl8qrc8BM7vA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A">
+ <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="server" type="_oqZNUDLaEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/>
+ <ownedAttribute xmi:id="_i-I7gDLiEd2RVeNawwNNzg" name="client" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/>
+ <ownedConnector xmi:id="_QO2s0E2rEeGl8qrc8BM7vA" name="qp_connector">
+ <end xmi:id="_QO3T4E2rEeGl8qrc8BM7vA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QO3T4k2rEeGl8qrc8BM7vA" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QO3T4U2rEeGl8qrc8BM7vA" value="1"/>
</end>
- <end xmi:type="uml:ConnectorEnd" xmi:id="_QO5wIE2rEeGl8qrc8BM7vA" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_4KiE8DLbEd2qeKRLMdIx_A">
+ <end xmi:id="_QO5wIE2rEeGl8qrc8BM7vA" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_4KiE8DLbEd2qeKRLMdIx_A">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QO5wIk2rEeGl8qrc8BM7vA" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QO5wIU2rEeGl8qrc8BM7vA" value="1"/>
</end>
@@ -257,37 +257,37 @@ A single class represents the complete application, typically called &quot;Syste
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_v3fMgDLiEd2RVeNawwNNzg" name="platform">
- <ownedComment xmi:type="uml:Comment" xmi:id="_ZWJ6QDeLEeGPyrZ5I3hMlA" annotatedElement="__1PHIMnhEeCMCo5Ox2CNmg">
+ <ownedComment xmi:id="_ZWJ6QDeLEeGPyrZ5I3hMlA" annotatedElement="__1PHIMnhEeCMCo5Ox2CNmg">
<body>The hardware architecture is also defined by means of a composite class (comparable to the software architecture). The types (NodeA and NodeB) can be stereotyped with information about the used target platform (FCM stereotype target). As for software architecture, instances specification for nodes are derived from this class. Use &quot;Qompass: create platform definition&quot; in the context menu.</body>
</ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_2vkEQDeLEeGPyrZ5I3hMlA" annotatedElement="_eFh10MniEeCMCo5Ox2CNmg">
+ <ownedComment xmi:id="_2vkEQDeLEeGPyrZ5I3hMlA" annotatedElement="_eFh10MniEeCMCo5Ox2CNmg">
<body>The physical connection between two nodes is represented by a UML connector. Currently, this information is not evaluated by Qompass, but it is planned to analyze for instance whether the throughput (specified by means of MARTE) is sufficient with requirements of the software</body>
</ownedComment>
<packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="MonoNode"/>
<packagedElement xmi:type="uml:Node" xmi:id="_MxayMP_BEd6628OhKk_dpg" name="NodeA"/>
<packagedElement xmi:type="uml:Node" xmi:id="_NF3YMP_BEd6628OhKk_dpg" name="NodeB"/>
<packagedElement xmi:type="uml:Class" xmi:id="__1PHIMnhEeCMCo5Ox2CNmg" name="HWArchitectureDist">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_RbUNAMniEeCMCo5Ox2CNmg" name="nodeA" visibility="public" type="_MxayMP_BEd6628OhKk_dpg" aggregation="composite">
+ <ownedAttribute xmi:id="_RbUNAMniEeCMCo5Ox2CNmg" name="nodeA" visibility="public" type="_MxayMP_BEd6628OhKk_dpg" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UjRccMniEeCMCo5Ox2CNmg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UkfkcMniEeCMCo5Ox2CNmg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Ul-LIMniEeCMCo5Ox2CNmg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:type="uml:Property" xmi:id="_R5FuIMniEeCMCo5Ox2CNmg" name="nodeB" visibility="public" type="_NF3YMP_BEd6628OhKk_dpg" aggregation="composite">
+ <ownedAttribute xmi:id="_R5FuIMniEeCMCo5Ox2CNmg" name="nodeB" visibility="public" type="_NF3YMP_BEd6628OhKk_dpg" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VzfHIMniEeCMCo5Ox2CNmg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V1Is8MniEeCMCo5Ox2CNmg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_V3LUUMniEeCMCo5Ox2CNmg">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedConnector xmi:type="uml:Connector" xmi:id="_eFh10MniEeCMCo5Ox2CNmg" name="Connector0">
- <end xmi:type="uml:ConnectorEnd" xmi:id="_eFic4MniEeCMCo5Ox2CNmg" role="_RbUNAMniEeCMCo5Ox2CNmg"/>
- <end xmi:type="uml:ConnectorEnd" xmi:id="_eFjD8MniEeCMCo5Ox2CNmg" role="_R5FuIMniEeCMCo5Ox2CNmg"/>
+ <ownedConnector xmi:id="_eFh10MniEeCMCo5Ox2CNmg" name="Connector0">
+ <end xmi:id="_eFic4MniEeCMCo5Ox2CNmg" role="_RbUNAMniEeCMCo5Ox2CNmg"/>
+ <end xmi:id="_eFjD8MniEeCMCo5Ox2CNmg" role="_R5FuIMniEeCMCo5Ox2CNmg"/>
</ownedConnector>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_M1a_8MniEeCMCo5Ox2CNmg" name="HWArchitectureMonolithic">
- <ownedAttribute xmi:type="uml:Property" xmi:id="_QgKzYMniEeCMCo5Ox2CNmg" name="monoNode" visibility="public" type="_zY9vMDLiEd2RVeNawwNNzg" aggregation="composite">
+ <ownedAttribute xmi:id="_QgKzYMniEeCMCo5Ox2CNmg" name="monoNode" visibility="public" type="_zY9vMDLiEd2RVeNawwNNzg" aggregation="composite">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XijRAMniEeCMCo5Ox2CNmg" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XkfxwMniEeCMCo5Ox2CNmg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_XlIq8MniEeCMCo5Ox2CNmg">
@@ -304,22 +304,22 @@ A single class represents the complete application, typically called &quot;Syste
</packagedElement>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_234GEDLiEd2RVeNawwNNzg" name="deployment">
- <ownedComment xmi:type="uml:Comment" xmi:id="_ToVjMDeIEeGPyrZ5I3hMlA" annotatedElement="_QT6okKDjEd-rLNbSWf1QuA">
+ <ownedComment xmi:id="_ToVjMDeIEeGPyrZ5I3hMlA" annotatedElement="_QT6okKDjEd-rLNbSWf1QuA">
<body>A deployment configuration that activates the tracing container rule which will provide OTF tracing. The deployment configuration is linked with the &quot;monolithic&quot; deployment plan</body>
</ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_f3lHQDeIEeGPyrZ5I3hMlA" annotatedElement="_5Z7MEDLiEd2RVeNawwNNzg">
+ <ownedComment xmi:id="_f3lHQDeIEeGPyrZ5I3hMlA" annotatedElement="_5Z7MEDLiEd2RVeNawwNNzg">
<body> deployment plan (= set of instances along with their configuration and allocation) &quot;monolithic&quot;. All instances are allocated to node instance &quot;monoNode&quot;. Check out the node allocation with the pop-up &quot;Qompass: allocate to node&quot;.
Initiate the deployment and code generation with the pop-up &quot;Qompass: generate deployment model and code from plan&quot;.</body>
</ownedComment>
- <ownedComment xmi:type="uml:Comment" xmi:id="_L01VMDeJEeGPyrZ5I3hMlA" annotatedElement="_bBSxQP_BEd6628OhKk_dpg">
+ <ownedComment xmi:id="_L01VMDeJEeGPyrZ5I3hMlA" annotatedElement="_bBSxQP_BEd6628OhKk_dpg">
<body> In this case, the deployment plan forsees allocating the client to nodeA and the server to nodeB. Note that the deployment transformations will automatically detect that a distributed connector is required, in this case a socket (see composite diagram System)</body>
</ownedComment>
<packagedElement xmi:type="uml:Package" xmi:id="_5Z7MEDLiEd2RVeNawwNNzg" name="monolithic">
- <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_L9xhwDLjEd2RVeNawwNNzg" clientDependency="_1Lv7AE0qEeGl_syZE5iOXA" name="mySystem" classifier="_bYJagDLiEd2RVeNawwNNzg">
- <slot xmi:type="uml:Slot" xmi:id="_TdCvsDLjEd2RVeNawwNNzg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg">
+ <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_L9xhwDLjEd2RVeNawwNNzg" name="mySystem" classifier="_bYJagDLiEd2RVeNawwNNzg">
+ <slot xmi:id="_TdCvsDLjEd2RVeNawwNNzg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg">
<value xmi:type="uml:InstanceValue" xmi:id="_fw8xUDLjEd2RVeNawwNNzg" name="" instance="_MyQ5wDLjEd2RVeNawwNNzg"/>
</slot>
- <slot xmi:type="uml:Slot" xmi:id="_YhikUDLjEd2RVeNawwNNzg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg">
+ <slot xmi:id="_YhikUDLjEd2RVeNawwNNzg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg">
<value xmi:type="uml:InstanceValue" xmi:id="_lAoiQDLjEd2RVeNawwNNzg" instance="_P3ovQDLjEd2RVeNawwNNzg"/>
</slot>
</packagedElement>
@@ -329,43 +329,43 @@ Initiate the deployment and code generation with the pop-up &quot;Qompass: gener
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_bBSxQP_BEd6628OhKk_dpg" name="distributed">
<packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_bBdwYP_BEd6628OhKk_dpg" name="mainInstance" classifier="_bYJagDLiEd2RVeNawwNNzg">
- <slot xmi:type="uml:Slot" xmi:id="_bBpWkP_BEd6628OhKk_dpg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg">
+ <slot xmi:id="_bBpWkP_BEd6628OhKk_dpg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg">
<value xmi:type="uml:InstanceValue" xmi:id="_bBqksP_BEd6628OhKk_dpg" instance="_bBnhYP_BEd6628OhKk_dpg"/>
</slot>
- <slot xmi:type="uml:Slot" xmi:id="_bBuPEP_BEd6628OhKk_dpg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg">
+ <slot xmi:id="_bBuPEP_BEd6628OhKk_dpg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg">
<value xmi:type="uml:InstanceValue" xmi:id="_bBxSYP_BEd6628OhKk_dpg" instance="_bBry0P_BEd6628OhKk_dpg"/>
</slot>
</packagedElement>
- <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_bBnhYP_BEd6628OhKk_dpg" clientDependency="_zjuk8DeMEeGPyrZ5I3hMlA" name="mainInstance.server" classifier="_oqZNUDLaEd2qeKRLMdIx_A"/>
- <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_bBry0P_BEd6628OhKk_dpg" clientDependency="_zMKZgDeMEeGPyrZ5I3hMlA" name="mainInstance.client" classifier="_IfjoETLbEd2qeKRLMdIx_A"/>
+ <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_bBnhYP_BEd6628OhKk_dpg" name="mainInstance.server" classifier="_oqZNUDLaEd2qeKRLMdIx_A"/>
+ <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_bBry0P_BEd6628OhKk_dpg" name="mainInstance.client" classifier="_IfjoETLbEd2qeKRLMdIx_A"/>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_zMKZgDeMEeGPyrZ5I3hMlA" name="allocate to nodeA" client="_bBry0P_BEd6628OhKk_dpg" supplier="_fKEkMDeMEeGPyrZ5I3hMlA"/>
<packagedElement xmi:type="uml:Abstraction" xmi:id="_zjuk8DeMEeGPyrZ5I3hMlA" name="allocate to nodeB" client="_bBnhYP_BEd6628OhKk_dpg" supplier="_fKFyUDeMEeGPyrZ5I3hMlA"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_QT6okKDjEd-rLNbSWf1QuA" name="ConfigTraceMono"/>
</packagedElement>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_O6TiIjLUEd26WNosUASSSw">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O6TiIzLUEd26WNosUASSSw" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
+ <profileApplication xmi:id="_O6TiIjLUEd26WNosUASSSw">
+ <eAnnotations xmi:id="_O6TiIzLUEd26WNosUASSSw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/>
</eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
+ <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>
</profileApplication>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_GcC0cAHtEd6HSdiss9GQ0A">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Gd1kMAHtEd6HSdiss9GQ0A" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:id="_GcC0cAHtEd6HSdiss9GQ0A">
+ <eAnnotations xmi:id="_Gd1kMAHtEd6HSdiss9GQ0A" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
</eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
+ <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
</profileApplication>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_z1TwgFW3Ed63BrxiKsw-0Q">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z2GasFW3Ed63BrxiKsw-0Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:id="_z1TwgFW3Ed63BrxiKsw-0Q">
+ <eAnnotations xmi:id="_z2GasFW3Ed63BrxiKsw-0Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/>
</eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
+ <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
</profileApplication>
- <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_1GtD8E0fEeG_H4ME7SR4KA">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1RA2gE0fEeG_H4ME7SR4KA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:id="_1GtD8E0fEeG_H4ME7SR4KA">
+ <eAnnotations xmi:id="_1RA2gE0fEeG_H4ME7SR4KA" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/>
</eAnnotations>
- <appliedProfile xmi:type="uml:Profile" href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/>
+ <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/>
</profileApplication>
</uml:Model>
<FCM:DerivedElement xmi:id="_B9o7sP6yEd6Ie_kieu_3CQ">
@@ -374,13 +374,13 @@ Initiate the deployment and code generation with the pop-up &quot;Qompass: gener
<FCM:DerivedElement xmi:id="_DWb6oP6yEd6Ie_kieu_3CQ" base_Element="_TbIjUJYlEd6G9q9hwr11bw" source="_DGs6wDLgEd28fJKJJnUaeQ"/>
<FCM:DerivedElement xmi:id="_DXK6cP6yEd6Ie_kieu_3CQ" base_Element="_4ZEZwHecEd6r18stFZxmFQ" source="_L8EY8DLgEd28fJKJJnUaeQ"/>
<FCM:RuleApplication xmi:id="_DWIYoP6yEd6Ie_kieu_3CQ" base_Class="_oqZNUDLaEd2qeKRLMdIx_A">
- <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_RWQC8PwkEeGWn-a9PUOYcA"/>
- <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/>
+ <containerRule href="pathmap://QML_TRACE/tracing.uml#_RWQC8PwkEeGWn-a9PUOYcA"/>
+ <containerRule href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/>
<propagateRule>false</propagateRule>
<interceptor href="pathmap://QML_TRACE/tracing.uml#_35od4DKrEd-z5o2wSoJ16A"/>
</FCM:RuleApplication>
<FCM:Port xmi:id="_GofhQP6yEd6Ie_kieu_3CQ" base_Port="_4KiE8DLbEd2qeKRLMdIx_A">
- <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/>
+ <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/>
</FCM:Port>
<FCM:Connector xmi:id="_K2_iAP6yEd6Ie_kieu_3CQ"/>
<FCM:DeploymentPlan xmi:id="_6dGQgP6zEd6Ie_kieu_3CQ" mainInstance="_L9xhwDLjEd2RVeNawwNNzg" base_Package="_5Z7MEDLiEd2RVeNawwNNzg"/>
@@ -394,27 +394,27 @@ Initiate the deployment and code generation with the pop-up &quot;Qompass: gener
<FCM:DeploymentPlan xmi:id="_u_ACgGSuEd-dQdK1-7wIFg"/>
<FCM:DeploymentPlan xmi:id="_YK67AGTgEd-rCOWJcspHOA"/>
<FCM:Port xmi:id="_IWQqoP6yEd6Ie_kieu_3CQ" base_Port="_DtWn4DLcEd2qeKRLMdIx_A">
- <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
+ <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
</FCM:Port>
<FCM:ContainerRule xmi:id="_lNrDwH4HEd-rD-b0gnx-AQ"/>
<FCM:Configuration xmi:id="_RM9kQH8UEd-7Bsdl4VhuEw" deploymentPlan="_6dGQgP6zEd6Ie_kieu_3CQ" base_Package="_BJc50H8TEd-7Bsdl4VhuEw">
- <configOptions xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
+ <configOptions href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
</FCM:Configuration>
<FCM:Configuration xmi:id="_Y10_QKDjEd-rLNbSWf1QuA" base_Class="_QT6okKDjEd-rLNbSWf1QuA" deploymentPlan="_6dGQgP6zEd6Ie_kieu_3CQ">
- <configOptions xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
+ <configOptions href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
</FCM:Configuration>
<FCM:DerivedElement xmi:id="_1E0nUKFhEd-AoOVE_odazw"/>
<FCM:Target xmi:id="_Et5N4LqQEd-BObGGoBbehA" base_Node="_MxayMP_BEd6628OhKk_dpg">
- <targetArch xmi:type="FCM:TargetArchitecture" href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
- <usedOS xmi:type="FCM:OperatingSystem" href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
+ <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
+ <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
</FCM:Target>
<FCM:Target xmi:id="_HvbFMLqQEd-BObGGoBbehA" base_Node="_zY9vMDLiEd2RVeNawwNNzg">
- <targetArch xmi:type="FCM:TargetArchitecture" href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
- <usedOS xmi:type="FCM:OperatingSystem" href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
+ <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
+ <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
</FCM:Target>
<FCM:Target xmi:id="_J6gcsLqQEd-BObGGoBbehA" base_Node="_NF3YMP_BEd6628OhKk_dpg">
- <targetArch xmi:type="FCM:TargetArchitecture" href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
- <usedOS xmi:type="FCM:OperatingSystem" href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
+ <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
+ <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
</FCM:Target>
<FCM:Connector xmi:id="_cAkqIMKnEd-LE5cHpAvxBg">
<connector xmi:type="FCM:ConnectorImplGroup" href="pathmap://QML_DISTRIBUTION/distribution.uml#_DBP7QMKmEd-hj59jYY3RZQ"/>
@@ -426,12 +426,12 @@ Initiate the deployment and code generation with the pop-up &quot;Qompass: gener
<Alloc:Allocate xmi:id="_iwbZwE0rEeGl_syZE5iOXA" base_Abstraction="_zMKZgDeMEeGPyrZ5I3hMlA"/>
<Alloc:Allocate xmi:id="_juiAwE0rEeGl_syZE5iOXA" base_Abstraction="_zjuk8DeMEeGPyrZ5I3hMlA"/>
<FCM:Connector xmi:id="_UKqbEE2rEeGl8qrc8BM7vA" base_Connector="_QO2s0E2rEeGl8qrc8BM7vA">
- <ic xmi:type="FCM:InteractionComponent" href="pathmap://QML_DISTRIBUTION/distribution.uml#_lpYxME2qEeGl8qrc8BM7vA"/>
+ <ic href="pathmap://QML_DISTRIBUTION/distribution.uml#_lpYxME2qEeGl8qrc8BM7vA"/>
</FCM:Connector>
<FCM:DerivedElement xmi:id="_rrmpkDVdEeKoYLVLZgpRiw" base_Element="_rrf74DVdEeKoYLVLZgpRiw" source="_rrbqcDVdEeKoYLVLZgpRiw"/>
<FCM:DerivedElement xmi:id="_6EbL0DW2EeKyT6LlKoWJIA" base_Element="_6ERa0DW2EeKyT6LlKoWJIA" source="_6DewoDW2EeKyT6LlKoWJIA"/>
<FCM:RuleApplication xmi:id="__bC_ADcmEeKAhIrFXfR8zQ" base_Class="_IfjoETLbEd2qeKRLMdIx_A">
- <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/>
+ <containerRule href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/>
<propagateRule>false</propagateRule>
</FCM:RuleApplication>
</xmi:XMI>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation
index 4044845b3f3..554914373b7 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
<notation:Diagram xmi:id="_U-SDoIKfEd-xPu-WdpUyIQ" type="CompositeStructure" name="OTF composition" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_jKzMsIKfEd-xPu-WdpUyIQ" type="2073" fontName="Sans Serif" fontHeight="10" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jKzzwIKfEd-xPu-WdpUyIQ" source="ShadowFigure">
@@ -1309,22 +1309,22 @@
<children xmi:type="notation:BasicCompartment" xmi:id="_P4g8tSmiEeKp-eCvZDLsaw" type="7018">
<children xmi:type="notation:Shape" xmi:id="_UxxxsCmiEeKp-eCvZDLsaw" type="3013" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_X21eICmiEeKp-eCvZDLsaw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_X21eISmiEeKp-eCvZDLsaw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_X21eIimiEeKp-eCvZDLsaw" key="StereotypeList" value="StandardProfileL2::Create"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_X21eIymiEeKp-eCvZDLsaw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_X21eJCmiEeKp-eCvZDLsaw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_X21eJSmiEeKp-eCvZDLsaw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwE6sLjdEeOmnIHZGVkncQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwE6sbjdEeOmnIHZGVkncQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwFhwLjdEeOmnIHZGVkncQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwFhwbjdEeOmnIHZGVkncQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwFhwrjdEeOmnIHZGVkncQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<element xmi:type="uml:Operation" href="tracing.uml#_UvQpMCmiEeKp-eCvZDLsaw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_UxxxsSmiEeKp-eCvZDLsaw"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_VUiggCmiEeKp-eCvZDLsaw" type="3013" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZJzh4CmiEeKp-eCvZDLsaw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZJ0I8CmiEeKp-eCvZDLsaw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZJ0I8SmiEeKp-eCvZDLsaw" key="StereotypeList" value="StandardProfileL2::Destroy"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZJ0I8imiEeKp-eCvZDLsaw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZJ0I8ymiEeKp-eCvZDLsaw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZJ0I9CmiEeKp-eCvZDLsaw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwLoYLjdEeOmnIHZGVkncQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwLoYbjdEeOmnIHZGVkncQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwMPcLjdEeOmnIHZGVkncQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwMPcbjdEeOmnIHZGVkncQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uwMPcrjdEeOmnIHZGVkncQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<element xmi:type="uml:Operation" href="tracing.uml#_VUW6UCmiEeKp-eCvZDLsaw"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_VUiggSmiEeKp-eCvZDLsaw"/>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml
index 2a7232c407c..e07901c928c 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
<uml:Model xmi:id="_H-ZqYDKeEd-WprEKTCaiMA" name="Tracing">
<packageImport xmi:type="uml:PackageImport" xmi:id="_H-ZqYTKeEd-WprEKTCaiMA">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
@@ -28,7 +28,7 @@
<ownedComment xmi:type="uml:Comment" xmi:id="_bb4kQLniEeCxXoyQxQ47PQ" annotatedElement="_aF1w4DKeEd-WprEKTCaiMA">
<body>Trace implementation based on OTF trace library. Aggregates singleton TraceInit</body>
</ownedComment>
- <packagedElement xmi:type="uml:Class" xmi:id="_aF1w4DKeEd-WprEKTCaiMA" clientDependency="_BuqlQDOcEd-1k-POY2IaLg" name="OTFTrace_impl">
+ <packagedElement xmi:type="uml:Class" xmi:id="_aF1w4DKeEd-WprEKTCaiMA" name="OTFTrace_impl">
<generalization xmi:type="uml:Generalization" xmi:id="_WdRuUDaUEeKkY-29HX5sMQ" general="_MM6RwDaUEeKkY-29HX5sMQ"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_aF1w5TKeEd-WprEKTCaiMA" name="timestamp" isUnique="false">
<type xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_FuKEEDj8Edy0Rd6V_tf1-Q"/>
@@ -242,7 +242,7 @@ OTF_Writer_writeDefFunction (writer, streamNr, &lt;%enumSvcPrefix%>::id_&lt;%own
</ownedParameter>
</ownedTemplateSignature>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_aoSDwKAdEeCF0uoVQbVQRg" clientDependency="_Mgn2cKKXEeCdIOXlyrCmKQ" name="OTFTrace_vc">
+ <packagedElement xmi:type="uml:Class" xmi:id="_aoSDwKAdEeCF0uoVQbVQRg" name="OTFTrace_vc">
<generalization xmi:type="uml:Generalization" xmi:id="_nQ6YMKAdEeCF0uoVQbVQRg" general="_aF1w4DKeEd-WprEKTCaiMA"/>
<ownedAttribute xmi:type="uml:Property" xmi:id="_EWKx4KD0EeCFDJJCA2W5wg" name="m_first">
<type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/>
@@ -389,7 +389,7 @@ if (doTrace) {
</defaultValue>
</ownedAttribute>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_If04ACqLEeKGrchWittz_g" clientDependency="_riv0oC5vEeKMZ5P9cEChlg" name="LTTngLWRule">
+ <packagedElement xmi:type="uml:Class" xmi:id="_If04ACqLEeKGrchWittz_g" name="LTTngLWRule">
<ownedAttribute xmi:type="uml:Property" xmi:id="_Avfe8C8PEeKVAPO2lpiVnA" name="instanceName" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BuA8sC8PEeKVAPO2lpiVnA" value="1"/>
@@ -423,7 +423,7 @@ if (doTrace) {
<packagedElement xmi:type="uml:Usage" xmi:id="_7uQr8D4OEeC-VMxjm_qUAg" name="TraceInit => Thread (for ThreadId)" client="_apuYoDNwEd-1k-POY2IaLg">
<supplier xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_-HeCsDj_Edy0Rd6V_tf1-Q"/>
</packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_apuYoDNwEd-1k-POY2IaLg" clientDependency="_UcPagD1nEd-Bk-AHd6yyoA _7uQr8D4OEeC-VMxjm_qUAg" name="TraceInit">
+ <packagedElement xmi:type="uml:Class" xmi:id="_apuYoDNwEd-1k-POY2IaLg" name="TraceInit">
<generalization xmi:type="uml:Generalization" xmi:id="_9zJj0DguEd-9wq2wHPy3lw">
<general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
</generalization>
@@ -594,7 +594,7 @@ return processID;</body>
<body>Trace Provider
</body>
</ownedComment>
- <packagedElement xmi:type="uml:Class" xmi:id="_pwl_MPxWEeGOK9t90vpALA" clientDependency="_BV2G4PzTEeGKDvxFM1SZ_g _9ygUUDHKEeKt1a2SZnJmwg _c0nqkDWGEeKGAYOVxzQeAg" name="LTTngInterceptor">
+ <packagedElement xmi:type="uml:Class" xmi:id="_pwl_MPxWEeGOK9t90vpALA" name="LTTngInterceptor">
<generalization xmi:type="uml:Generalization" xmi:id="_1963sPxWEeGOK9t90vpALA" general="_dcP9gDaSEeKxVvAop17bHw"/>
<ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_qLhLMPxXEeGOK9t90vpALA" name="[name/]" specification="_YU5H4PxXEeGOK9t90vpALA">
<language>C/C++</language>
@@ -634,7 +634,7 @@ return processID;</body>
</packagedElement>
<profileApplication xmi:type="uml:ProfileApplication" xmi:id="_H_B8gDKeEd-WprEKTCaiMA">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_H_DxsDKeEd-WprEKTCaiMA" source="http://www.eclipse.org/uml2/2.0.0/UML">
- <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard#/"/>
</eAnnotations>
<appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
</profileApplication>
@@ -651,7 +651,7 @@ return processID;</body>
<appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
</profileApplication>
</uml:Model>
- <l2:ModelLibrary xmi:id="_ICaAoDKeEd-WprEKTCaiMA" base_Package="_H-ZqYDKeEd-WprEKTCaiMA"/>
+ <standard:ModelLibrary xmi:id="_ICaAoDKeEd-WprEKTCaiMA" base_Package="_H-ZqYDKeEd-WprEKTCaiMA"/>
<FCM:Template xmi:id="_bKc-kDNZEd-0bO2vHbUkEA" base_Element="_aF1w7zKeEd-WprEKTCaiMA" kind="LoopOperations">
<helper xmi:type="FCM:BindingHelper" href="pathmap://QML_CORE/core.uml#_nLe_sHJDEeOMF7YEvnQt5g"/>
<formalParam xmi:type="uml:Interface" href="pathmap://QML_CORE/core.uml#_ZzlzMPfBEd2TbIfwytOyPA"/>
@@ -744,7 +744,9 @@ return processID;</body>
</FCM:ContainerRule>
<FCM:InterceptionRule xmi:id="_m-L0sPwkEeGWn-a9PUOYcA" interceptionKind="InterceptAll" base_Property="_d7If0PwkEeGWn-a9PUOYcA"/>
<C_Cpp:Include xmi:id="__rP4oPxWEeGOK9t90vpALA" preBody="#define TRACEPOINT_CREATE_PROBES&#xA;#define TRACEPOINT_DEFINE" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]&#xA;&#xA;[template public LTTngTP(clazz : Class)]&#xA;[clazz.declareTP()/]&#xA;[/template]" base_class="_rGPjgPxWEeGOK9t90vpALA"/>
- <FCM:Template xmi:id="_bKW5IPxXEeGOK9t90vpALA" base_Element="_YU5H4PxXEeGOK9t90vpALA" kind="LoopOperations"/>
+ <FCM:Template xmi:id="_bKW5IPxXEeGOK9t90vpALA" base_Element="_YU5H4PxXEeGOK9t90vpALA" kind="LoopOperations">
+ <helper xmi:type="FCM:BindingHelper" href="pathmap://QML_CORE/core.uml#_nLe_sHJDEeOMF7YEvnQt5g"/>
+ </FCM:Template>
<C_Cpp:ExternLibrary xmi:id="_t_sHUPzOEeGKDvxFM1SZ_g" base_Package="_nAkZEPzOEeGKDvxFM1SZ_g">
<libs>lttng-ust</libs>
<libs>dl</libs>
@@ -754,8 +756,8 @@ return processID;</body>
<FCM:InteractionComponent xmi:id="__yL98PzhEeGe5LUTfvP5hQ" base_Class="_pwl_MPxWEeGOK9t90vpALA"/>
<C_Cpp:ManualGeneration xmi:id="_KSTlgCdaEeKGdt7FoegMYA" extensionBody="c" base_Class="_rGPjgPxWEeGOK9t90vpALA"/>
<FCM:InterceptionRule xmi:id="_vt_HYSdbEeKGdt7FoegMYA" interceptionKind="InterceptAllIn" base_Property="_vt7dASdbEeKGdt7FoegMYA"/>
- <l2:Create xmi:id="_X1okQCmiEeKp-eCvZDLsaw" base_BehavioralFeature="_UvQpMCmiEeKp-eCvZDLsaw"/>
- <l2:Destroy xmi:id="_ZJYEECmiEeKp-eCvZDLsaw" base_BehavioralFeature="_VUW6UCmiEeKp-eCvZDLsaw"/>
+ <standard:Create xmi:id="_X1okQCmiEeKp-eCvZDLsaw" base_BehavioralFeature="_UvQpMCmiEeKp-eCvZDLsaw"/>
+ <standard:Destroy xmi:id="_ZJYEECmiEeKp-eCvZDLsaw" base_BehavioralFeature="_VUW6UCmiEeKp-eCvZDLsaw"/>
<FCM:ContainerRule xmi:id="_NtAukCqLEeKGrchWittz_g" base_Class="_If04ACqLEeKGrchWittz_g" kind="LightWeightOORule">
<forConfig xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
</FCM:ContainerRule>
@@ -766,7 +768,9 @@ return processID;</body>
<FCM:UseInstanceConfigurator xmi:id="_gH1RQC8DEeKwPrQVP28AQw" base_Class="_If04ACqLEeKGrchWittz_g" configurator="_nTMOYKbnEeC0_qP7CUZIiQ"/>
<FCM:InstanceConfigurator xmi:id="_nUB1YC8HEeKwPrQVP28AQw" base_Class="_nUAnQC8HEeKwPrQVP28AQw"/>
<C_Cpp:Include xmi:id="_gvf4IDHKEeKt1a2SZnJmwg" preBody="#define TRACEPOINT_CREATE_PROBES&#xA;#define TRACEPOINT_DEFINE" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]&#xA;&#xA;[template public LTTngTP(intf : Interface)]&#xA;[intf.declareTP()/]&#xA;[/template]" base_class="_gveqADHKEeKt1a2SZnJmwg"/>
- <FCM:Template xmi:id="_gvnM4DHKEeKt1a2SZnJmwg" base_Element="_gveqADHKEeKt1a2SZnJmwg"/>
+ <FCM:Template xmi:id="_gvnM4DHKEeKt1a2SZnJmwg" base_Element="_gveqADHKEeKt1a2SZnJmwg">
+ <helper xmi:type="FCM:BindingHelper" href="pathmap://QML_CORE/core.uml#_mFUQALsMEeO0n5elMxN1LQ"/>
+ </FCM:Template>
<C_Cpp:ManualGeneration xmi:id="_gvnz8DHKEeKt1a2SZnJmwg" extensionBody="c" base_Class="_gveqADHKEeKt1a2SZnJmwg"/>
<C_Cpp:ManualGeneration xmi:id="_WUbVADV7EeKGAYOVxzQeAg" extensionBody="c" base_Class="_C4FREDV7EeKGAYOVxzQeAg"/>
<C_Cpp:Include xmi:id="_ZdHkQDV7EeKGAYOVxzQeAg" header="[import org::eclipse::papyrus::qompass::designer::core::acceleo::UMLTool/]&#xA;[import org::eclipse::papyrus::qompass::designer::core::acceleo::TransformationContext/]&#xA;&#xA;[template public LTTngTP(cl : Classifier)]&#xA;#include &lt;lttng/tracepoint.h>&#xA;&#xA;TRACEPOINT_MODEL_EMF_URI(UMLmodel, starting, &quot;[getSourceRoot().getURI()/]&quot;)&#xA;[/template]&#xA;" base_class="_C4FREDV7EeKGAYOVxzQeAg"/>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/utils/RobotmlSelectionTester.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/utils/RobotmlSelectionTester.java
index 2036ba9f8e1..46906183b07 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/utils/RobotmlSelectionTester.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/src/org/eclipse/papyrus/robotml/diagram/common/utils/RobotmlSelectionTester.java
@@ -20,13 +20,9 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.resource.ModelsReader;
-import org.eclipse.papyrus.infra.core.resource.NotFoundException;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForSelection;
-import org.eclipse.papyrus.robotml.diagram.common.Activator;
import org.eclipse.papyrus.uml.tools.model.UmlModel;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
@@ -138,13 +134,9 @@ public class RobotmlSelectionTester extends PropertyTester {
}
}
- } catch (ServiceException e) {
- //Ignored: The selection cannot be used to retrieve the ServicesRegistry
- } catch (NotFoundException e) {
- Activator.log.error(e);
- } catch (ModelMultiException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ } catch (Exception e) {
+ //Ignored: The selection cannot be used to retrieve the ServicesRegistry.
+ //Do not log exceptions: this is just not a Papyrus/RobotML model
}
}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/.classpath b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.classpath
index f6e5811e42c..f6e5811e42c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.core.queries.configuration.tests/.classpath
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.classpath
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.project b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
index 149c81a950e..149c81a950e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.project
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.project
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
index bcaa1b4d07e..bcaa1b4d07e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
index 27761ab2403..a49de7681be 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.help
-Bundle-Vendor: %providerName
-Bundle-Version: 1.0.0.qualifier
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.doc;singleto
- n:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.help
+Bundle-Vendor: %providerName
+Bundle-Version: 1.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.doc;singleto
+ n:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: plugin
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/about.html b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/about.html
index dd02e0be168..dd02e0be168 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/about.html
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/about.html
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/build.properties b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
index 655978a2bc6..655978a2bc6 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/build.properties
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties
index 1ffd68f5ccb..1ffd68f5ccb 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.properties
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
index 2fba0cfd74f..2fba0cfd74f 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/plugin.xml
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png
index bb9214c7737..bb9214c7737 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/config_sample.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png
index b0ff70d7be2..b0ff70d7be2 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_filtered.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png
index 6a2ab29f149..6a2ab29f149 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/menu_normal.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png
index a37393eb942..a37393eb942 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/preferences.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png
index 1912f7f2f9e..1912f7f2f9e 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/captures/properties.png
Binary files differ
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml
index ae66f735f36..ae66f735f36 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints-toc.xml
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html
index dacce45f8f6..dacce45f8f6 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.html
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
index ed0d4705d75..ed0d4705d75 100755..100644
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.viewpoints.doc/resources/viewpoints.mediawiki
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
index f7f18c4dede..ae4e19e6f0a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/handlers/AbstractCreateNattableEditorHandler.java
@@ -21,6 +21,7 @@ import java.util.List;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.util.URI;
@@ -36,6 +37,7 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.core.editor.BackboneException;
import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.resource.NotFoundException;
import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
import org.eclipse.papyrus.infra.core.services.ServiceException;
@@ -184,12 +186,13 @@ public abstract class AbstractCreateNattableEditorHandler extends AbstractHandle
* The model where to save the TableInstance is not found.
*/
protected Table createEditorModel(final ServicesRegistry serviceRegistry, String name, String description) throws ServiceException, NotFoundException {
- final TableConfiguration configuration = getDefaultTableEditorConfiguration();
- assert configuration != null;
+ final ModelSet modelSet = ServiceUtils.getInstance().getModelSet(serviceRegistry);
+ final TableConfiguration configuration = getDefaultTableEditorConfiguration(modelSet);
+ Assert.isNotNull(configuration);
final Table table = TableHelper.createTable(configuration, null, name, description); //context null here, see bug 410357
// Save the model in the associated resource
- final PapyrusNattableModel model = (PapyrusNattableModel)ServiceUtils.getInstance().getModelSet(serviceRegistry).getModelChecked(PapyrusNattableModel.MODEL_ID);
+ final PapyrusNattableModel model = (PapyrusNattableModel)modelSet.getModelChecked(PapyrusNattableModel.MODEL_ID);
model.addPapyrusTable(table);
table.setContext(getTableContext());
return table;
@@ -198,12 +201,11 @@ public abstract class AbstractCreateNattableEditorHandler extends AbstractHandle
/**
*
+ * @param resourceSet TODO
* @return
* the configuration to use for the new table
*/
- protected TableConfiguration getDefaultTableEditorConfiguration() {
- final EObject current = getSelection().get(0);
- final ResourceSet resourceSet = current.eResource().getResourceSet();
+ protected TableConfiguration getDefaultTableEditorConfiguration(ResourceSet resourceSet) {
final Resource resource = resourceSet.getResource(getTableEditorConfigurationURI(), true);
TableConfiguration tableConfiguration = null;
if(resource.getContents().get(0) instanceof TableConfiguration) {
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
index e0d79fd6859..72cc048b816 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext.ui,
org.eclipse.papyrus.uml.alf;bundle-version="1.0.0",
org.apache.log4j;bundle-version="1.2.15",
org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-Version: 1.0.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java
index 0b3cae704cf..d829f2afb80 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/src/org/eclipse/papyrus/uml/alf/ui/contentassist/AlfProposalProvider.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2011 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,7 +19,6 @@ import java.util.Map;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.contentassist.CompletionProposalUtils;
import org.eclipse.papyrus.uml.alf.alf.SuffixExpression;
import org.eclipse.papyrus.uml.alf.scoping.AlfPartialScope;
import org.eclipse.papyrus.uml.alf.scoping.AlfScopeProvider;
@@ -28,144 +27,137 @@ import org.eclipse.papyrus.uml.alf.validation.typing.SignatureFacadeFactory;
import org.eclipse.papyrus.uml.alf.validation.typing.TypeExpression;
import org.eclipse.papyrus.uml.alf.validation.typing.TypeFacade;
import org.eclipse.papyrus.uml.alf.validation.typing.TypeUtils;
+import org.eclipse.papyrus.uml.xtext.integration.CompletionProposalUtils;
import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.Property;
import org.eclipse.xtext.Assignment;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor;
+
/**
* see http://www.eclipse.org/Xtext/documentation/latest/xtext.html#contentAssist on how to customize content assistant
*/
public class AlfProposalProvider extends AbstractAlfProposalProvider {
-
-
+
+
@Override
- public void completeLocalNameDeclarationStatement_Type(EObject model,
- Assignment assignment, ContentAssistContext context,
- ICompletionProposalAcceptor acceptor) {
+ public void completeLocalNameDeclarationStatement_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// TODO Auto-generated method stub
- AlfPartialScope scope = AlfScopeProvider.scopingTool.getVisibleClassifiers(model) ;
- new AlfCompletionProposalUtils().classifierProposals(scope, context, acceptor) ;
- super.completeLocalNameDeclarationStatement_Type(model, assignment, context,
- acceptor);
+ AlfPartialScope scope = AlfScopeProvider.scopingTool.getVisibleClassifiers(model);
+ new AlfCompletionProposalUtils().classifierProposals(scope, context, acceptor);
+ super.completeLocalNameDeclarationStatement_Type(model, assignment, context, acceptor);
}
@Override
- public void completeOperationCallExpression_OperationName(EObject model,
- Assignment assignment, ContentAssistContext context,
- ICompletionProposalAcceptor acceptor) {
- TypeExpression typeOfModel = null ;
- if (model instanceof SuffixExpression) {
- if (context.getPrefix().equals(""))
- typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model) ;
- else
- typeOfModel = new TypeUtils((SuffixExpression)model).getTypeOfCandidateExpression(model.eContainer()) ;
- }
- else {
- typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model) ;
+ public void completeOperationCallExpression_OperationName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+ TypeExpression typeOfModel = null;
+ if(model instanceof SuffixExpression) {
+ if(context.getPrefix().equals("")) {
+ typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model);
+ } else {
+ typeOfModel = new TypeUtils((SuffixExpression)model).getTypeOfCandidateExpression(model.eContainer());
+ }
+ } else {
+ typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model);
}
- if (typeOfModel == null || typeOfModel.getTypeFacade() instanceof ErrorTypeFacade)
- super.completeOperationCallExpression_OperationName(model, assignment, context,
- acceptor);
- else {
- new AlfCompletionProposalUtils().operationProposals(typeOfModel.getTypeFacade(), context, acceptor) ;
- super.completeOperationCallExpression_OperationName(model, assignment, context, acceptor);
+ if(typeOfModel == null || typeOfModel.getTypeFacade() instanceof ErrorTypeFacade) {
+ super.completeOperationCallExpression_OperationName(model, assignment, context, acceptor);
+ } else {
+ new AlfCompletionProposalUtils().operationProposals(typeOfModel.getTypeFacade(), context, acceptor);
+ super.completeOperationCallExpression_OperationName(model, assignment, context, acceptor);
}
}
-
+
@Override
- public void completePropertyCallExpression_PropertyName(EObject model,
- Assignment assignment, ContentAssistContext context,
- ICompletionProposalAcceptor acceptor) {
- TypeExpression typeOfModel = null ;
- if (model instanceof SuffixExpression) {
- if (context.getPrefix().equals(""))
- typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model) ;
- else
- typeOfModel = new TypeUtils((SuffixExpression)model).getTypeOfCandidateExpression(model.eContainer()) ;
- }
- else {
- typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model) ;
+ public void completePropertyCallExpression_PropertyName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+ TypeExpression typeOfModel = null;
+ if(model instanceof SuffixExpression) {
+ if(context.getPrefix().equals("")) {
+ typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model);
+ } else {
+ typeOfModel = new TypeUtils((SuffixExpression)model).getTypeOfCandidateExpression(model.eContainer());
+ }
+ } else {
+ typeOfModel = new TypeUtils().getTypeOfCandidateExpression(model);
}
- if (typeOfModel == null || typeOfModel.getTypeFacade() instanceof ErrorTypeFacade)
- super.completePropertyCallExpression_PropertyName(model, assignment, context,
- acceptor);
- else {
- new AlfCompletionProposalUtils().propertyProposals(typeOfModel.getTypeFacade(), context, acceptor) ;
+ if(typeOfModel == null || typeOfModel.getTypeFacade() instanceof ErrorTypeFacade) {
+ super.completePropertyCallExpression_PropertyName(model, assignment, context, acceptor);
+ } else {
+ new AlfCompletionProposalUtils().propertyProposals(typeOfModel.getTypeFacade(), context, acceptor);
super.completePropertyCallExpression_PropertyName(model, assignment, context, acceptor);
}
}
-
+
/**************************
- *
+ *
* Completion proposal utils
*
*/
private class AlfCompletionProposalUtils {
-
+
public void classifierProposals(AlfPartialScope scope, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- for (List<EObject> scopingLevel : scope.getScopeDetails()) {
- String completionString = "" ;
- String displayString = "" ;
- Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>() ;
- ICompletionProposal proposal = null ;
- for (EObject visibleClassifier : scopingLevel) {
- completionString = scope.getElementName(visibleClassifier) ;
- displayString = "" + completionString ;
- if (completionString.startsWith(context.getPrefix())) {
- completionString = completionString.substring(context.getPrefix().length()) ;
- if (completionProposals.get(displayString)==null) {
- completionProposals.put(displayString, proposal) ;
- proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ;
- acceptor.accept(proposal) ;
+ for(List<EObject> scopingLevel : scope.getScopeDetails()) {
+ String completionString = "";
+ String displayString = "";
+ Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>();
+ ICompletionProposal proposal = null;
+ for(EObject visibleClassifier : scopingLevel) {
+ completionString = scope.getElementName(visibleClassifier);
+ displayString = "" + completionString;
+ if(completionString.startsWith(context.getPrefix())) {
+ completionString = completionString.substring(context.getPrefix().length());
+ if(completionProposals.get(displayString) == null) {
+ completionProposals.put(displayString, proposal);
+ proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context);
+ acceptor.accept(proposal);
}
}
}
}
}
-
+
public void operationProposals(TypeFacade f, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- Classifier c = f.extractActualType() ;
- String completionString = "" ;
- String displayString = "" ;
- Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>() ;
- ICompletionProposal proposal = null ;
- for (Operation o : c.getAllOperations()) {
- completionString = SignatureFacadeFactory.eInstance.createSignatureFacade(o).getLabel() ;
- displayString = "" + completionString ;
- if (completionString.startsWith(context.getPrefix())) {
- completionString = completionString.substring(context.getPrefix().length()) ;
- if (completionProposals.get(displayString)==null) {
- completionProposals.put(displayString, proposal) ;
- proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ;
- acceptor.accept(proposal) ;
+ Classifier c = f.extractActualType();
+ String completionString = "";
+ String displayString = "";
+ Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>();
+ ICompletionProposal proposal = null;
+ for(Operation o : c.getAllOperations()) {
+ completionString = SignatureFacadeFactory.eInstance.createSignatureFacade(o).getLabel();
+ displayString = "" + completionString;
+ if(completionString.startsWith(context.getPrefix())) {
+ completionString = completionString.substring(context.getPrefix().length());
+ if(completionProposals.get(displayString) == null) {
+ completionProposals.put(displayString, proposal);
+ proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context);
+ acceptor.accept(proposal);
}
}
}
}
-
+
public void propertyProposals(TypeFacade f, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
- Classifier c = f.extractActualType() ;
- String completionString = "" ;
- String displayString = "" ;
- Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>() ;
- ICompletionProposal proposal = null ;
- for (Property p : c.getAllAttributes()) {
- displayString = p.getName() + " : " + (p.getType() == null ? "any" : p.getType().getName()) ;
- completionString = p.getName() ;
- if (completionString.startsWith(context.getPrefix())) {
- completionString = completionString.substring(context.getPrefix().length()) ;
- if (completionProposals.get(displayString)==null) {
- completionProposals.put(displayString, proposal) ;
- proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ;
- acceptor.accept(proposal) ;
+ Classifier c = f.extractActualType();
+ String completionString = "";
+ String displayString = "";
+ Map<String, ICompletionProposal> completionProposals = new HashMap<String, ICompletionProposal>();
+ ICompletionProposal proposal = null;
+ for(Property p : c.getAllAttributes()) {
+ displayString = p.getName() + " : " + (p.getType() == null ? "any" : p.getType().getName());
+ completionString = p.getName();
+ if(completionString.startsWith(context.getPrefix())) {
+ completionString = completionString.substring(context.getPrefix().length());
+ if(completionProposals.get(displayString) == null) {
+ completionProposals.put(displayString, proposal);
+ proposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context);
+ acceptor.accept(proposal);
}
}
}
}
}
-
+
}
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
index cfdd6563180..e0c30586722 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.common,
org.antlr.runtime,
org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0",
org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
org.apache.log4j;bundle-version="1.2.15",
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap
index a708b5fabfb..94444d19846 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap
@@ -185,14 +185,6 @@
<rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201403101212">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
- </rm:provider>
-
- <!-- EMF Facet -->
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
- <!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201402271523/">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
</rm:provider>
<!-- MoDisco -->
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
index 2b3ed9a479f..ef343ade1e5 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
@@ -306,14 +306,6 @@
<rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201403101212">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
- </rm:provider>
-
- <!-- EMF Facet -->
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
- <!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201402271523/">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
</rm:provider>
<!-- MoDisco -->
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
index 176080f61ff..5d6f13dc58a 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
@@ -257,14 +257,6 @@
<rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201403101212">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
- </rm:provider>
-
- <!-- EMF Facet -->
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
- <!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201402271523/">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
</rm:provider>
<!-- MoDisco -->
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
index 656d1bcde99..b3a7c55c245 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
@@ -460,14 +460,6 @@
<rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201403101212">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
- </rm:provider>
-
- <!-- EMF Facet -->
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
- <!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201402271523/">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
</rm:provider>
<!-- MoDisco -->
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/META-INF/MANIFEST.MF
index 976e9a377d9..7858ba8866b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.paletteconfiguration.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,5 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.core.queries.test;bundle-version="1.0.0",
- org.junit;bundle-version="4.10.0"
+Require-Bundle: org.junit;bundle-version="4.10.0"
Bundle-Vendor: Eclipse Modeling Project
Fragment-Host: org.eclipse.papyrus.uml.diagram.paletteconfiguration;bu
ndle-version="0.10.0"
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties
index 1433bd0b1cf..1528529ef3e 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties
@@ -8,5 +8,5 @@
# Contributors:
# CEA LIST - initial API and implementation
###############################################################################
-pluginName=Requirement diagram tests (Incubation)
+pluginName=Requirement diagram tests (Incubation)
providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
index 52651ab4549..82fab5036b5 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.0.0",
org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.uml.appearance
+ org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.diagram.stereotypeproperty
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy

Back to the top