From 7b0acd2385d2636b9e3759ed70ac789eb48b2537 Mon Sep 17 00:00:00 2001
From: Lukas Ladenberger <lukas.ladenberger@googlemail.com>
Date: Mon, 23 Jul 2012 16:16:01 +0200
Subject: [PATCH] removed canister part/figure + corresponding attributes
(moved to industry plugin)
---
.../icons/icon_canister.gif | Bin 1044 -> 0 bytes
.../gef/editor/AttributeConstants.java | 5 -
.../editor/attribute/BAttributeFillColor.java | 47 -----
.../attribute/BAttributeFillHeight.java | 27 ---
.../attribute/BAttributeMeasureInterval.java | 27 ---
.../attribute/BAttributeMeasureMaxPos.java | 27 ---
.../attribute/BAttributeShowMeasure.java | 44 ----
.../gef/editor/figure/CanisterFigure.java | 190 ------------------
.../gef/editor/part/BCanisterPart.java | 60 ------
9 files changed, 427 deletions(-)
delete mode 100644 de.bmotionstudio.gef.editor/icons/icon_canister.gif
delete mode 100644 de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeFillColor.java
delete mode 100644 de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeFillHeight.java
delete mode 100644 de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeMeasureInterval.java
delete mode 100644 de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeMeasureMaxPos.java
delete mode 100644 de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeShowMeasure.java
delete mode 100644 de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/CanisterFigure.java
delete mode 100644 de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BCanisterPart.java
diff --git a/de.bmotionstudio.gef.editor/icons/icon_canister.gif b/de.bmotionstudio.gef.editor/icons/icon_canister.gif
deleted file mode 100644
index f5a20232c661c5afea954c41cb11a8d839e407b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1044
zcmZ?wbhEHb6krfw_`aKgfq~)w|Nm1tICp1P?#L|Pn_FEiXSgn@cuPj*hP1Lt4k6RL
z5?7>DG?)dP-EeB<lx;KHH*8vXcK);@g}Dowo3_@~u3Nn5)Xp6b%F0$ZHg0Kc-Pzf>
zx4V0PSJ&Rw*6ke~yCzIH(%*lmxA(yG>1QTRJksBPaO%_(lO`RRFyYX&X(uO7K01H?
zm6<coEL?bX!GbH(r=OTI<;dd2*H*5)yL|cWWy@|ZU3z25lIsf>UY<Mm+^SV~SFE_b
zeEF@VORukA|9I`%2P;<G+Ogy9{Q0N1ZF|0E&F!N{f9~4#di(b0t5@GRb?V>#{U7%2
zd%tMWnKNhpA3pr$<jLO$4}RRU=heoIca9zVx@F7#Q>T8OI`!k+xj&~)eZO?+|HX^{
zmM=ej`SSlgd!B6He)r6ouLll1TfY3n#fv}Bp8az4=&Q45Kb<)7=Iq&zJ9pl?diB@k
z%ik|t_;Tvh+jHkWT)X!3)~!G1&%eKO=hvl6Zy!GVb@l4oTesdnfBx&;yFYjCJpcUp
z@25|H9zA;V;>E|WU;ljn{`cFrKR<u|`|;!NhYw%BfB!vy!L@~pt}R}2ZOz&TTerR5
zwfn>Noo}{of3<ht=Yxm7pE~{j#L2(Mj{n%a<=W#Xf9EZ{HgU?K{fEA;-|~9q{3{!`
zz1pzt`JRJccOCe+|Hzl~7oV2bZCbVQ@zy<W4xRY1e&@$cd%jGXcWv3G*ULA*S+nEg
zhTWeJ9DB5Q!>a{rpDx+(<WGU$n=p&786ICUJU*v+e$Dpzmh1m5Kj3R#&}}J(i&o0_
zD>6>=GVJnl-^&O}FvAHe{$ycfVA#!|1M(CoPcU$NWGH{z^`z~TsD9Fk4VA*_e6o#9
z7a!bgI^wD3<vUA7(1_*HI+OYh29-|~oRoN_Q~rEd!4@#hZ9#^p0IO0fznt9JFB>0a
zOkTsdJYd3!!o!cH>_a;;X1OYaa0pu#ROlRb=UVK)QD6p_V-h=efAS}r$d;3#O+hk#
z7b+fp?3PvSu-R+n(ACT#tz}cRGMMFrRs>H_;EM~3T8?uU^@LO%&=OzhY+F|I!Gg6<
ziF13@)u;tt?mYZ*i?{4#IVh$V%j<TwVB*2Y6Aju_GzAh84lNK>HmG>RwA4+}Thz*z
dYm*DNME~w{2R1NpiY~XV`o<!pVxYia4FDB?`wsvB
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/AttributeConstants.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/AttributeConstants.java
index 49a11fee..30a8655e 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/AttributeConstants.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/AttributeConstants.java
@@ -23,11 +23,6 @@ public final class AttributeConstants {
public static final String ATTRIBUTE_IMAGE = "de.bmotionstudio.gef.editor.attribute.BAttributeImage";
public static final String ATTRIBUTE_TEXT = "de.bmotionstudio.gef.editor.attribute.BAttributeText";
public static final String ATTRIBUTE_TEXT_COLOR = "de.bmotionstudio.gef.editor.attribute.BAttributeTextColor";
- public static final String ATTRIBUTE_FILL_HEIGHT = "de.bmotionstudio.gef.editor.attribute.BAttributeFillHeight";
- public static final String ATTRIBUTE_FILL_COLOR = "de.bmotionstudio.gef.editor.attribute.BAttributeFillColor";
- public static final String ATTRIBUTE_SHOWS_MEASURE = "de.bmotionstudio.gef.editor.attribute.BAttributeShowMeasure";
- public static final String ATTRIBUTE_MEASURE_MAXPOS = "de.bmotionstudio.gef.editor.attribute.BAttributeMeasureMaxPos";
- public static final String ATTRIBUTE_MEASURE_INTERVAL = "de.bmotionstudio.gef.editor.attribute.BAttributeMeasureInterval";
public static final String ATTRIBUTE_ALPHA = "de.bmotionstudio.gef.editor.attribute.BAttributeAlpha";
public static final String ATTRIBUTE_OUTLINEALPHA = "de.bmotionstudio.gef.editor.attribute.BAttributeOutlineAlpha";
public static final String ATTRIBUTE_FONT = "de.bmotionstudio.gef.editor.attribute.BAttributeFont";
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeFillColor.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeFillColor.java
deleted file mode 100644
index 22686e0e..00000000
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeFillColor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen,
- * Heinrich Heine Universitaet Duesseldorf
- * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
- * */
-
-package de.bmotionstudio.gef.editor.attribute;
-
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.ui.views.properties.ColorPropertyDescriptor;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-public class BAttributeFillColor extends AbstractAttribute {
-
- public BAttributeFillColor(Object value) {
- super(value);
- }
-
- public PropertyDescriptor preparePropertyDescriptor() {
- return new ColorPropertyDescriptor(getID(), getName());
- }
-
- @Override
- public String getName() {
- return "Fill-Color";
- }
-
- @Override
- public Object unmarshal(String s) {
-
- String colorStr = s.toLowerCase().replace(" ", "");
- colorStr = colorStr.replace("rgb", "");
- colorStr = colorStr.replace("}", "");
- colorStr = colorStr.replace("{", "");
- String[] str = String.valueOf(colorStr).split("\\,");
- if (str.length == 3) {
- int red = Integer.valueOf(str[0]);
- int green = Integer.valueOf(str[1]);
- int blue = Integer.valueOf(str[2]);
- return new RGB(red, green, blue);
- } else {
- return new RGB(192, 192, 192);
- }
-
- }
-
-}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeFillHeight.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeFillHeight.java
deleted file mode 100644
index a413e887..00000000
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeFillHeight.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen,
- * Heinrich Heine Universitaet Duesseldorf
- * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
- * */
-
-package de.bmotionstudio.gef.editor.attribute;
-
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-public class BAttributeFillHeight extends AbstractAttribute {
-
- public BAttributeFillHeight(Object value) {
- super(value);
- }
-
- public PropertyDescriptor preparePropertyDescriptor() {
- return new TextPropertyDescriptor(getID(), getName());
- }
-
- @Override
- public String getName() {
- return "Fill-Height";
- }
-
-}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeMeasureInterval.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeMeasureInterval.java
deleted file mode 100644
index 8e36529d..00000000
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeMeasureInterval.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen,
- * Heinrich Heine Universitaet Duesseldorf
- * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
- * */
-
-package de.bmotionstudio.gef.editor.attribute;
-
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-public class BAttributeMeasureInterval extends AbstractAttribute {
-
- public BAttributeMeasureInterval(Object value) {
- super(value);
- }
-
- public PropertyDescriptor preparePropertyDescriptor() {
- return new TextPropertyDescriptor(getID(), getName());
- }
-
- @Override
- public String getName() {
- return "Measure-Interval";
- }
-
-}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeMeasureMaxPos.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeMeasureMaxPos.java
deleted file mode 100644
index 7adafa66..00000000
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeMeasureMaxPos.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen,
- * Heinrich Heine Universitaet Duesseldorf
- * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
- * */
-
-package de.bmotionstudio.gef.editor.attribute;
-
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-public class BAttributeMeasureMaxPos extends AbstractAttribute {
-
- public BAttributeMeasureMaxPos(Object value) {
- super(value);
- }
-
- public PropertyDescriptor preparePropertyDescriptor() {
- return new TextPropertyDescriptor(getID(), getName());
- }
-
- @Override
- public String getName() {
- return "Measure-Max-Pos";
- }
-
-}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeShowMeasure.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeShowMeasure.java
deleted file mode 100644
index f8777dd5..00000000
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/attribute/BAttributeShowMeasure.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen,
- * Heinrich Heine Universitaet Duesseldorf
- * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
- * */
-
-package de.bmotionstudio.gef.editor.attribute;
-
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-import de.bmotionstudio.gef.editor.model.BControl;
-import de.bmotionstudio.gef.editor.property.CheckboxPropertyDescriptor;
-
-public class BAttributeShowMeasure extends AbstractAttribute {
-
- public BAttributeShowMeasure(Object value) {
- super(value);
- }
-
- public PropertyDescriptor preparePropertyDescriptor() {
- return new CheckboxPropertyDescriptor(getID(), getName());
- }
-
- @Override
- public String validateValue(Object value, BControl control) {
- if ((String.valueOf(value)).trim().equalsIgnoreCase("true")
- || (String.valueOf(value)).trim().equalsIgnoreCase("false")) {
- return null;
- } else {
- return "Value must be a Boolean value (\"true\" or \"false\")";
- }
- }
-
- @Override
- public String getName() {
- return "Show-Measure";
- }
-
- @Override
- public Object unmarshal(String s) {
- return Boolean.valueOf(s);
- }
-
-}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/CanisterFigure.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/CanisterFigure.java
deleted file mode 100644
index f04abbd7..00000000
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/CanisterFigure.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen,
- * Heinrich Heine Universitaet Duesseldorf
- * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
- * */
-
-package de.bmotionstudio.gef.editor.figure;
-
-import org.eclipse.draw2d.BorderLayout;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.PaletteData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-public class CanisterFigure extends AbstractBMotionFigure {
-
- private RectangleFigure axisRect;
- private Figure axisFigure;
- private RectangleFigure fillRect;
- private Figure fillFigure;
-
- private Image layerImage;
- private ImageData imageData;
-
- private int fill_height;
- private double positions;
- private int show_pos;
-
- private Boolean showMeasure;
-
- public CanisterFigure() {
-
- XYLayout layout = new XYLayout();
- setLayoutManager(layout);
-
- PaletteData palette = new PaletteData(
- new RGB[] { ColorConstants.white.getRGB() });
- imageData = new ImageData(1, 1, 8, palette);
- imageData.alpha = 255;
- imageData.setPixel(0, 0, 0);
- layerImage = new Image(null, imageData);
-
- axisFigure = new Figure();
- axisFigure.setLocation(new Point(0, 0));
- axisFigure.setLayoutManager(new XYLayout());
- add(axisFigure);
-
- fillFigure = new Figure();
- fillFigure.setLayoutManager(new BorderLayout());
- add(fillFigure);
-
- fillRect = new RectangleFigure();
- fillRect.setOutline(false);
- fillFigure.add(fillRect);
- fillFigure.setConstraint(fillRect, BorderLayout.BOTTOM);
-
- setOpaque(true);
-
- }
-
- public void setLayout(Rectangle rect) {
-
- getParent().setConstraint(this, rect);
-
- // Set the right size and position of the y-axis
- axisFigure.removeAll();
-
- int fillPos = 0;
-
- double one_pos = Double.valueOf(rect.height) / positions;
-
- if (showMeasure) {
-
- axisFigure.setSize(100, rect.height);
-
- axisRect = new RectangleFigure();
- axisFigure.add(axisRect);
- axisRect.setBackgroundColor(ColorConstants.black);
- axisFigure.setConstraint(axisRect, new Rectangle(14, 0, 1,
- rect.height));
-
- RectangleFigure line;
- Label lb;
-
- for (int i = 0; i <= positions; i = i + show_pos) {
-
- lb = new Label();
- axisFigure.add(lb);
- lb.setText(String.valueOf((int) (positions - i)));
- lb.setBackgroundColor(ColorConstants.red);
- lb.setTextAlignment(PositionConstants.LEFT);
-
- if (i == 0) {
- axisFigure.setConstraint(lb, new Rectangle(18,
- (int) (i * one_pos), 30, 10));
- } else if (i == positions) {
- axisFigure.setConstraint(lb, new Rectangle(18,
- (int) (i * one_pos) - 10, 30, 10));
- } else {
- axisFigure.setConstraint(lb, new Rectangle(18,
- (int) (i * one_pos) - 5, 30, 10));
- }
-
- line = new RectangleFigure();
- line.setBackgroundColor(ColorConstants.black);
- line.setOutline(false);
- axisFigure.add(line);
-
- if (i == positions) {
- axisFigure.setConstraint(line, new Rectangle(10,
- (int) (i * one_pos) - 1, 10, 1));
- } else {
- axisFigure.setConstraint(line, new Rectangle(10,
- (int) (i * one_pos), 10, 1));
- }
-
- }
-
- fillPos = 60;
-
- }
-
- // Set right size of the fill figure
- setConstraint(fillFigure, new Rectangle(fillPos, 0, rect.width
- - fillPos, rect.height));
-
- double tmp = one_pos * (positions - Double.valueOf(fill_height));
- int f_fill_height = (int) tmp;
- fillRect.setSize(rect.width - fillPos, rect.height - f_fill_height);
- fillFigure.setConstraint(fillRect, BorderLayout.BOTTOM);
- fillFigure.repaint();
-
- }
-
- public void setAlpha(int alpha) {
- imageData.alpha = alpha;
- if (layerImage != null && !layerImage.isDisposed()) {
- layerImage.dispose();
- }
- layerImage = new Image(null, imageData);
- repaint();
- }
-
- public void paintFigure(Graphics g) {
- Rectangle rectangle = getClientArea();
- g.drawImage(layerImage, new Rectangle(layerImage.getBounds()),
- rectangle);
- }
-
- public void setFillColor(RGB rgb) {
- fillRect.setBackgroundColor(new Color(Display.getDefault(), rgb));
- }
-
- public void setFillHeight(Integer height) {
- this.fill_height = height;
- }
-
- public void setMaxPos(Integer maxPos) {
- this.positions = maxPos;
- }
-
- public void setInterval(Integer interval) {
- this.show_pos = interval;
- }
-
- public void setMeasure(Boolean bol) {
- this.showMeasure = bol;
- }
-
- public void setBackgroundColor(RGB rgb) {
- imageData.palette.colors[0] = rgb;
- if (layerImage != null && !layerImage.isDisposed()) {
- layerImage.dispose();
- }
- layerImage = new Image(null, imageData);
- repaint();
- }
-
-}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BCanisterPart.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BCanisterPart.java
deleted file mode 100644
index ca67098a..00000000
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BCanisterPart.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * (c) 2009 Lehrstuhl fuer Softwaretechnik und Programmiersprachen,
- * Heinrich Heine Universitaet Duesseldorf
- * This software is licenced under EPL 1.0 (http://www.eclipse.org/org/documents/epl-v10.html)
- * */
-
-package de.bmotionstudio.gef.editor.part;
-
-import java.beans.PropertyChangeEvent;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.swt.graphics.RGB;
-
-import de.bmotionstudio.gef.editor.AttributeConstants;
-import de.bmotionstudio.gef.editor.figure.CanisterFigure;
-import de.bmotionstudio.gef.editor.model.BControl;
-
-public class BCanisterPart extends AppAbstractEditPart {
-
- @Override
- protected IFigure createEditFigure() {
- IFigure figure = new CanisterFigure();
- return figure;
- }
-
- @Override
- public void refreshEditFigure(IFigure figure, BControl model,
- PropertyChangeEvent evt) {
- ((CanisterFigure) figure).setAlpha(Integer.valueOf(model
- .getAttributeValue(AttributeConstants.ATTRIBUTE_ALPHA)
- .toString()));
- ((CanisterFigure) figure).setFillColor((RGB) model
- .getAttributeValue(AttributeConstants.ATTRIBUTE_FILL_COLOR));
- ((CanisterFigure) figure).setFillHeight(Integer.valueOf(model
- .getAttributeValue(AttributeConstants.ATTRIBUTE_FILL_HEIGHT)
- .toString()));
- ((CanisterFigure) figure).setMaxPos(Integer.valueOf(model
- .getAttributeValue(AttributeConstants.ATTRIBUTE_MEASURE_MAXPOS)
- .toString()));
- ((CanisterFigure) figure).setInterval(Integer.valueOf(model
- .getAttributeValue(
- AttributeConstants.ATTRIBUTE_MEASURE_INTERVAL)
- .toString()));
- ((CanisterFigure) figure).setMeasure(Boolean.valueOf(model
- .getAttributeValue(AttributeConstants.ATTRIBUTE_SHOWS_MEASURE)
- .toString()));
- ((CanisterFigure) figure)
- .setBackgroundColor((RGB) model
- .getAttributeValue(AttributeConstants.ATTRIBUTE_BACKGROUND_COLOR));
- }
-
- @Override
- protected void prepareEditPolicies() {
- }
-
- @Override
- protected void prepareRunPolicies() {
- }
-
-}
--
GitLab