Renaming setName to setDesignName and setSize to setDesignSize to avoid clash with added methods of java.awt.Component that return void
1.1 --- a/src/main/java/xelfi/design/components/XelfiDesignComponent.java Tue Jan 17 21:08:28 2017 +0100
1.2 +++ b/src/main/java/xelfi/design/components/XelfiDesignComponent.java Tue Jan 17 21:08:47 2017 +0100
1.3 @@ -180,7 +180,7 @@
1.4 /**
1.5 * Method to get component's name
1.6 * @return Component name
1.7 - * @see #setName
1.8 + * @see #setDesignName
1.9 */
1.10 public String getName();
1.11
1.12 @@ -190,7 +190,7 @@
1.13 * @return one of RSP_??? constants defined in XFDesignConstants.
1.14 * @see #getName
1.15 */
1.16 - public int setName(String aName);
1.17 + public int setDesignName(String aName);
1.18
1.19 /**
1.20 * Method to get number of event properties in component.
2.1 --- a/src/main/java/xelfi/design/components/XelfiVisualComponent.java Tue Jan 17 21:08:28 2017 +0100
2.2 +++ b/src/main/java/xelfi/design/components/XelfiVisualComponent.java Tue Jan 17 21:08:47 2017 +0100
2.3 @@ -37,7 +37,7 @@
2.4 * @return Component position
2.5 * @see #setPosition
2.6 * @see #getSize
2.7 - * @see #setSize
2.8 + * @see #setDesignSize
2.9 */
2.10 public Point getPosition();
2.11
2.12 @@ -48,7 +48,7 @@
2.13 * @return one of RSP_??? constants defined in XFDesignConstants.
2.14 * @see #getPosition
2.15 * @see #getSize
2.16 - * @see #setSize
2.17 + * @see #setDesignSize
2.18 */
2.19 public int setPosition(int x, int y);
2.20
2.21 @@ -61,7 +61,7 @@
2.22 * This ensures that real component implementation has something to
2.23 * say to component's size.
2.24 * @return Component size
2.25 - * @see #setSize
2.26 + * @see #setDesignSize
2.27 * @see #getPosition
2.28 * @see #setPosition
2.29 */
2.30 @@ -72,7 +72,7 @@
2.31 * design things painted around the real component (selection frame, XAWTPanel's
2.32 * catch border). This is used by layouts that allow dragging only.
2.33 * @return Component size including selection frame, etc.
2.34 - * @see #setSize
2.35 + * @see #setDesignSize
2.36 */
2.37 public Dimension getDesignSize();
2.38
2.39 @@ -85,7 +85,7 @@
2.40 * @see #getPosition
2.41 * @see #setPosition
2.42 */
2.43 - public int setSize(int w, int h);
2.44 + public int setDesignSize(int w, int h);
2.45
2.46 /**
2.47 * Method for eventHandling during design time.
3.1 --- a/src/main/java/xelfi/design/components/xawt/XAWTPanel.java Tue Jan 17 21:08:28 2017 +0100
3.2 +++ b/src/main/java/xelfi/design/components/xawt/XAWTPanel.java Tue Jan 17 21:08:47 2017 +0100
3.3 @@ -139,7 +139,7 @@
3.4 return new Dimension(size);
3.5 }
3.6
3.7 - public int setSize(int w, int h) {
3.8 + public int setDesignSize(int w, int h) {
3.9 if (autoSize == true) {
3.10 size = component.preferredSize();
3.11 }
3.12 @@ -236,7 +236,7 @@
3.13 return name;
3.14 }
3.15
3.16 - public int setName(String aName) {
3.17 + public int setDesignName(String aName) {
3.18 name = aName;
3.19 //[IAN 20 Feb] regenForm(XFDesignConstants.GEN_ALL);
3.20 return XFDesignConstants.RSP_OK;
3.21 @@ -263,7 +263,7 @@
3.22 return false;
3.23 autoSize = aAutoSize;
3.24 if (autoSize)
3.25 - setSize(0,0);
3.26 + setDesignSize(0,0);
3.27 repaintComponent();
3.28 return autoSize;
3.29 }
3.30 @@ -317,7 +317,7 @@
3.31 }
3.32 if (changePos)
3.33 setPosition(p.x, p.y);
3.34 - setSize(d.width, d.height);
3.35 + setDesignSize(d.width, d.height);
3.36 TopLevel.getInspector().selectionChanged();
3.37 dragMode = DM_NONE;
3.38 }
3.39 @@ -410,7 +410,7 @@
3.40
3.41 int w = stream.readInt();
3.42 int h = stream.readInt();
3.43 - setSize(w,h);
3.44 + setDesignSize(w,h);
3.45 }
3.46
3.47 public void saveToStream(DataOutput stream) throws IOException {
4.1 --- a/src/main/java/xelfi/design/components/xawt/XBevel.java Tue Jan 17 21:08:28 2017 +0100
4.2 +++ b/src/main/java/xelfi/design/components/xawt/XBevel.java Tue Jan 17 21:08:47 2017 +0100
4.3 @@ -41,7 +41,7 @@
4.4 icon = loadIcon("bevel.gif");
4.5 }
4.6
4.7 - public int setSize(int w, int h) {
4.8 + public int setDesignSize(int w, int h) {
4.9 Dimension d = bevel.size();
4.10 if (d == null)
4.11 d = new Dimension(w,h);
4.12 @@ -225,7 +225,7 @@
4.13 case 1: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
4.14 bevel.setDirection(((Boolean)value).booleanValue());
4.15 ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP;
4.16 - setSize(0,0);
4.17 + setDesignSize(0,0);
4.18 break;
4.19 case 2: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
4.20 bevel.enable(((Boolean)value).booleanValue());
4.21 @@ -250,17 +250,17 @@
4.22 case 6:if (!(value instanceof Color)) throw new XFPropertyBadValueTypeException();
4.23 bevel.setBorderColor((Color)value);
4.24 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
4.25 - setSize(0,0);
4.26 + setDesignSize(0,0);
4.27 break;
4.28 case 7:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
4.29 bevel.setBorderWidth(((Integer)value).intValue());
4.30 ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP;
4.31 - setSize(0,0);
4.32 + setDesignSize(0,0);
4.33 break;
4.34 case 8:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
4.35 bevel.setBevelWidth(((Integer)value).intValue());
4.36 ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP;
4.37 - setSize(0,0);
4.38 + setDesignSize(0,0);
4.39 break;
4.40 default: throw new XFPropertyIndexOutOfBoundsException();
4.41 }
5.1 --- a/src/main/java/xelfi/design/components/xawt/XButton.java Tue Jan 17 21:08:28 2017 +0100
5.2 +++ b/src/main/java/xelfi/design/components/xawt/XButton.java Tue Jan 17 21:08:47 2017 +0100
5.3 @@ -47,13 +47,13 @@
5.4 parentForm.regenerateCode(this, what);
5.5 }
5.6
5.7 - public int setName(String aName) {
5.8 + public int setDesignName(String aName) {
5.9 if (!labeled) {
5.10 button.setLabel(aName);
5.11 if (autoSize)
5.12 - setSize(0,0);
5.13 + setDesignSize(0,0);
5.14 }
5.15 - super.setName(aName);
5.16 + super.setDesignName(aName);
5.17 if (!labeled) return XFDesignConstants.RSP_OTHER_PROP;
5.18 else return XFDesignConstants.RSP_OK;
5.19 }
5.20 @@ -223,7 +223,7 @@
5.21 ret = ret | XFDesignConstants.RSP_REPAINT_COMP | XFDesignConstants.RSP_OTHER_PROP;
5.22 if (parentFont) {
5.23 parentFont = false;
5.24 - if (autoSize) setSize(0,0);
5.25 + if (autoSize) setDesignSize(0,0);
5.26 }
5.27 repaintComponent();
5.28 break;
5.29 @@ -232,7 +232,7 @@
5.30 labeled = true; // so that caption of a button does not change with its name no more
5.31 regen = regen | XFDesignConstants.GEN_INIT;
5.32 if (autoSize) {
5.33 - setSize(0,0);
5.34 + setDesignSize(0,0);
5.35 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
5.36 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
5.37 }
5.38 @@ -242,7 +242,7 @@
5.39 setAutoSize(((Boolean)value).booleanValue());
5.40 if (autoSize) {
5.41 repaintComponent();
5.42 - setSize(0,0);
5.43 + setDesignSize(0,0);
5.44 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
5.45 }
5.46 else regen = regen | XFDesignConstants.GEN_RESHAPE;
6.1 --- a/src/main/java/xelfi/design/components/xawt/XCheckbox.java Tue Jan 17 21:08:28 2017 +0100
6.2 +++ b/src/main/java/xelfi/design/components/xawt/XCheckbox.java Tue Jan 17 21:08:47 2017 +0100
6.3 @@ -46,13 +46,13 @@
6.4 parentForm.regenerateCode(this, what);
6.5 }
6.6
6.7 - public int setName(String aName) {
6.8 + public int setDesignName(String aName) {
6.9 if (!labeled) {
6.10 check.setLabel(aName);
6.11 if (autoSize)
6.12 - setSize(0,0);
6.13 + setDesignSize(0,0);
6.14 }
6.15 - super.setName(aName);
6.16 + super.setDesignName(aName);
6.17 if (!labeled) return XFDesignConstants.RSP_OTHER_PROP;
6.18 else return XFDesignConstants.RSP_OK;
6.19 }
6.20 @@ -228,7 +228,7 @@
6.21 if (parentFont) {
6.22 parentFont = false;
6.23 if (autoSize) {
6.24 - setSize(0,0);
6.25 + setDesignSize(0,0);
6.26 regen = regen | XFDesignConstants.GEN_RESHAPE;
6.27 }
6.28 }
6.29 @@ -239,7 +239,7 @@
6.30 labeled = true; // so that caption of a check does not change with its name no more
6.31 regen = regen | XFDesignConstants.GEN_INIT;
6.32 if (autoSize) {
6.33 - setSize(0,0);
6.34 + setDesignSize(0,0);
6.35 regen = regen | XFDesignConstants.GEN_RESHAPE;
6.36 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
6.37 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
6.38 @@ -250,7 +250,7 @@
6.39 setAutoSize(((Boolean)value).booleanValue());
6.40 if (autoSize) {
6.41 repaintComponent();
6.42 - setSize(0,0);
6.43 + setDesignSize(0,0);
6.44 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
6.45 }
6.46 regen = regen | XFDesignConstants.GEN_RESHAPE;
7.1 --- a/src/main/java/xelfi/design/components/xawt/XCheckboxMenuItem.java Tue Jan 17 21:08:28 2017 +0100
7.2 +++ b/src/main/java/xelfi/design/components/xawt/XCheckboxMenuItem.java Tue Jan 17 21:08:47 2017 +0100
7.3 @@ -213,7 +213,7 @@
7.4 return name;
7.5 }
7.6
7.7 - public int setName (String aName) {
7.8 + public int setDesignName (String aName) {
7.9 name = aName;
7.10 return XFDesignConstants.RSP_OK;
7.11 }
8.1 --- a/src/main/java/xelfi/design/components/xawt/XChoice.java Tue Jan 17 21:08:28 2017 +0100
8.2 +++ b/src/main/java/xelfi/design/components/xawt/XChoice.java Tue Jan 17 21:08:47 2017 +0100
8.3 @@ -218,7 +218,7 @@
8.4 if (parentFont) {
8.5 parentFont = false;
8.6 if (autoSize) {
8.7 - setSize(0,0);
8.8 + setDesignSize(0,0);
8.9 regen = regen | XFDesignConstants.GEN_RESHAPE;
8.10 }
8.11 }
8.12 @@ -228,7 +228,7 @@
8.13 setAutoSize(((Boolean)value).booleanValue());
8.14 if (autoSize) {
8.15 repaintComponent();
8.16 - setSize(0,0);
8.17 + setDesignSize(0,0);
8.18 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
8.19 }
8.20 regen = regen | XFDesignConstants.GEN_RESHAPE;
8.21 @@ -273,7 +273,7 @@
8.22 choice.addItem(((String [])value)[i]);
8.23 repaintComponent();
8.24 if (autoSize) {
8.25 - setSize(0,0);
8.26 + setDesignSize(0,0);
8.27 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
8.28 }
8.29 break;
9.1 --- a/src/main/java/xelfi/design/components/xawt/XColorGrid.java Tue Jan 17 21:08:28 2017 +0100
9.2 +++ b/src/main/java/xelfi/design/components/xawt/XColorGrid.java Tue Jan 17 21:08:47 2017 +0100
9.3 @@ -204,7 +204,7 @@
9.4 colGrid.setGridOrdering(((Integer)value).intValue());
9.5 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
9.6 if (autoSize) {
9.7 - setSize(0,0);
9.8 + setDesignSize(0,0);
9.9 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
9.10 }
9.11 colGrid.repaint();
9.12 @@ -219,7 +219,7 @@
9.13 colGrid.setBorderColor((Color)value);
9.14 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
9.15 if (autoSize) {
9.16 - setSize(0,0);
9.17 + setDesignSize(0,0);
9.18 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
9.19 }
9.20 colGrid.repaint();
9.21 @@ -228,7 +228,7 @@
9.22 colGrid.setBorderWidth(((Integer)value).intValue());
9.23 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
9.24 if (autoSize) {
9.25 - setSize(0,0);
9.26 + setDesignSize(0,0);
9.27 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
9.28 }
9.29 colGrid.repaint();
9.30 @@ -258,7 +258,7 @@
9.31 case 9: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
9.32 setAutoSize(((Boolean)value).booleanValue());
9.33 if (autoSize) {
9.34 - setSize(0,0);
9.35 + setDesignSize(0,0);
9.36 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
9.37 colGrid.repaint();
9.38 }
10.1 --- a/src/main/java/xelfi/design/components/xawt/XGauge.java Tue Jan 17 21:08:28 2017 +0100
10.2 +++ b/src/main/java/xelfi/design/components/xawt/XGauge.java Tue Jan 17 21:08:47 2017 +0100
10.3 @@ -278,7 +278,7 @@
10.4 if (parentFont) {
10.5 parentFont = false;
10.6 if (autoSize) {
10.7 - setSize(0,0);
10.8 + setDesignSize(0,0);
10.9 regen = regen | XFDesignConstants.GEN_RESHAPE;
10.10 gauge.repaint();
10.11 }
10.12 @@ -287,7 +287,7 @@
10.13 case 5: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
10.14 setAutoSize(((Boolean)value).booleanValue());
10.15 if (autoSize) {
10.16 - setSize(0,0);
10.17 + setDesignSize(0,0);
10.18 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
10.19 gauge.repaint();
10.20 }
10.21 @@ -314,7 +314,7 @@
10.22 gauge.setKind(((Integer)value).intValue());
10.23 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
10.24 if (autoSize) {
10.25 - setSize(0,0);
10.26 + setDesignSize(0,0);
10.27 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
10.28 }
10.29 repaintComponent();
10.30 @@ -329,7 +329,7 @@
10.31 case 12:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
10.32 gauge.setBorderWidth(((Integer)value).intValue());
10.33 if (autoSize) {
10.34 - setSize(0,0);
10.35 + setDesignSize(0,0);
10.36 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
10.37 }
10.38 repaintComponent();
10.39 @@ -337,7 +337,7 @@
10.40 case 13:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
10.41 gauge.setBorderStyle(((Integer)value).intValue());
10.42 if (autoSize) {
10.43 - setSize(0,0);
10.44 + setDesignSize(0,0);
10.45 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
10.46 }
10.47 repaintComponent();
11.1 --- a/src/main/java/xelfi/design/components/xawt/XImageButton.java Tue Jan 17 21:08:28 2017 +0100
11.2 +++ b/src/main/java/xelfi/design/components/xawt/XImageButton.java Tue Jan 17 21:08:47 2017 +0100
11.3 @@ -94,10 +94,10 @@
11.4 imBut.show();
11.5 component = imBut;
11.6 if (autoSize)
11.7 - setSize(0,0);
11.8 + setDesignSize(0,0);
11.9 else {
11.10 Dimension dd = getSize();
11.11 - setSize(dd.width, dd.height);
11.12 + setDesignSize(dd.width, dd.height);
11.13 }
11.14 repaintComponent();
11.15 imBut.repaint();
11.16 @@ -245,7 +245,7 @@
11.17 case 2: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
11.18 setAutoSize(((Boolean)value).booleanValue());
11.19 if (autoSize) {
11.20 - setSize(0,0);
11.21 + setDesignSize(0,0);
11.22 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
11.23 imBut.repaint();
11.24 }
11.25 @@ -259,7 +259,7 @@
11.26 case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
11.27 imBut.setStretch(((Boolean)value).booleanValue());
11.28 if (autoSize)
11.29 - setSize(0,0);
11.30 + setDesignSize(0,0);
11.31 repaintComponent();
11.32 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
11.33 break;
11.34 @@ -274,7 +274,7 @@
11.35 imBut.setBorderWidth(((Integer)value).intValue());
11.36 ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP;
11.37 if (autoSize)
11.38 - setSize(0,0);
11.39 + setDesignSize(0,0);
11.40 repaintComponent();
11.41 break;
11.42 case 7: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
12.1 --- a/src/main/java/xelfi/design/components/xawt/XImageLabel.java Tue Jan 17 21:08:28 2017 +0100
12.2 +++ b/src/main/java/xelfi/design/components/xawt/XImageLabel.java Tue Jan 17 21:08:47 2017 +0100
12.3 @@ -88,10 +88,10 @@
12.4 imLab.show();
12.5 component = imLab;
12.6 if (autoSize)
12.7 - setSize(0,0);
12.8 + setDesignSize(0,0);
12.9 else {
12.10 Dimension dd = getSize();
12.11 - setSize(dd.width, dd.height);
12.12 + setDesignSize(dd.width, dd.height);
12.13 }
12.14 repaintComponent();
12.15 imLab.repaint();
12.16 @@ -233,7 +233,7 @@
12.17 case 2: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
12.18 setAutoSize(((Boolean)value).booleanValue());
12.19 if (autoSize) {
12.20 - setSize(0,0);
12.21 + setDesignSize(0,0);
12.22 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
12.23 imLab.repaint();
12.24 }
12.25 @@ -247,7 +247,7 @@
12.26 case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
12.27 imLab.setStretch(((Boolean)value).booleanValue());
12.28 if (autoSize)
12.29 - setSize(0,0);
12.30 + setDesignSize(0,0);
12.31 repaintComponent();
12.32 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
12.33 break;
12.34 @@ -262,7 +262,7 @@
12.35 imLab.setBorderWidth(((Integer)value).intValue());
12.36 ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP;
12.37 if (autoSize)
12.38 - setSize(0,0);
12.39 + setDesignSize(0,0);
12.40 repaintComponent();
12.41 break;
12.42 case 7: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
13.1 --- a/src/main/java/xelfi/design/components/xawt/XLabel.java Tue Jan 17 21:08:28 2017 +0100
13.2 +++ b/src/main/java/xelfi/design/components/xawt/XLabel.java Tue Jan 17 21:08:47 2017 +0100
13.3 @@ -46,13 +46,13 @@
13.4 parentForm.regenerateCode(this, what);
13.5 }
13.6
13.7 - public int setName(String aName) {
13.8 + public int setDesignName(String aName) {
13.9 if (!labeled) {
13.10 label.setText(aName);
13.11 if (autoSize)
13.12 - setSize(0,0);
13.13 + setDesignSize(0,0);
13.14 }
13.15 - super.setName(aName);
13.16 + super.setDesignName(aName);
13.17 if (!labeled) return XFDesignConstants.RSP_OTHER_PROP;
13.18 else return XFDesignConstants.RSP_OK;
13.19 }
13.20 @@ -238,7 +238,7 @@
13.21 if (parentFont) {
13.22 parentFont = false;
13.23 if (autoSize) {
13.24 - setSize(0,0);
13.25 + setDesignSize(0,0);
13.26 regen = regen | XFDesignConstants.GEN_RESHAPE;
13.27 }
13.28 }
13.29 @@ -249,7 +249,7 @@
13.30 labeled = true; // so that caption of a button does not change with its name no more
13.31 regen = regen | XFDesignConstants.GEN_INIT;
13.32 if (autoSize) {
13.33 - setSize(0,0);
13.34 + setDesignSize(0,0);
13.35 regen = regen | XFDesignConstants.GEN_RESHAPE;
13.36 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
13.37 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
13.38 @@ -260,7 +260,7 @@
13.39 setAutoSize(((Boolean)value).booleanValue());
13.40 if (autoSize) {
13.41 repaintComponent();
13.42 - setSize(0,0);
13.43 + setDesignSize(0,0);
13.44 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
13.45 }
13.46 regen = regen | XFDesignConstants.GEN_RESHAPE;
14.1 --- a/src/main/java/xelfi/design/components/xawt/XList.java Tue Jan 17 21:08:28 2017 +0100
14.2 +++ b/src/main/java/xelfi/design/components/xawt/XList.java Tue Jan 17 21:08:47 2017 +0100
14.3 @@ -219,7 +219,7 @@
14.4 if (parentFont) {
14.5 parentFont = false;
14.6 if (autoSize) {
14.7 - setSize(0,0);
14.8 + setDesignSize(0,0);
14.9 regen = regen | XFDesignConstants.GEN_RESHAPE;
14.10 }
14.11 }
14.12 @@ -229,7 +229,7 @@
14.13 setAutoSize(((Boolean)value).booleanValue());
14.14 if (autoSize) {
14.15 repaintComponent();
14.16 - setSize(0,0);
14.17 + setDesignSize(0,0);
14.18 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
14.19 }
14.20 regen = regen | XFDesignConstants.GEN_RESHAPE;
15.1 --- a/src/main/java/xelfi/design/components/xawt/XMenuBar.java Tue Jan 17 21:08:28 2017 +0100
15.2 +++ b/src/main/java/xelfi/design/components/xawt/XMenuBar.java Tue Jan 17 21:08:47 2017 +0100
15.3 @@ -199,7 +199,7 @@
15.4 return name;
15.5 }
15.6
15.7 - public int setName (String aName) {
15.8 + public int setDesignName (String aName) {
15.9 name = aName;
15.10 return XFDesignConstants.RSP_OK;
15.11 }
16.1 --- a/src/main/java/xelfi/design/components/xawt/XMenuFolder.java Tue Jan 17 21:08:28 2017 +0100
16.2 +++ b/src/main/java/xelfi/design/components/xawt/XMenuFolder.java Tue Jan 17 21:08:47 2017 +0100
16.3 @@ -208,7 +208,7 @@
16.4 * Sets the name of the component.
16.5 * Refreshes menu editor if needed.
16.6 */
16.7 - public int setName (String name) {
16.8 + public int setDesignName (String name) {
16.9 this.name = name;
16.10 return XFDesignConstants.RSP_OK;
16.11 }
17.1 --- a/src/main/java/xelfi/design/components/xawt/XMenuItem.java Tue Jan 17 21:08:28 2017 +0100
17.2 +++ b/src/main/java/xelfi/design/components/xawt/XMenuItem.java Tue Jan 17 21:08:47 2017 +0100
17.3 @@ -201,7 +201,7 @@
17.4 return name;
17.5 }
17.6
17.7 - public int setName (String aName) {
17.8 + public int setDesignName (String aName) {
17.9 name = aName;
17.10 return XFDesignConstants.RSP_OK;
17.11 }
18.1 --- a/src/main/java/xelfi/design/components/xawt/XPanel.java Tue Jan 17 21:08:28 2017 +0100
18.2 +++ b/src/main/java/xelfi/design/components/xawt/XPanel.java Tue Jan 17 21:08:47 2017 +0100
18.3 @@ -148,7 +148,7 @@
18.4
18.5 public String getName() { return name; }
18.6
18.7 - public int setName(String aName) {
18.8 + public int setDesignName(String aName) {
18.9 name = aName;
18.10 // regenForm(XFDesignConstants.GEN_ALL);
18.11 return XFDesignConstants.RSP_OK;
18.12 @@ -214,7 +214,7 @@
18.13 }
18.14 if (changePos)
18.15 setPosition(p.x, p.y);
18.16 - setSize(d.width, d.height);
18.17 + setDesignSize(d.width, d.height);
18.18 TopLevel.getInspector().selectionChanged();
18.19 dragMode = DM_NONE;
18.20 }
18.21 @@ -301,7 +301,7 @@
18.22 return new Dimension(size);
18.23 }
18.24
18.25 - public int setSize(int w, int h) {
18.26 + public int setDesignSize(int w, int h) {
18.27 if (size == null)
18.28 size = new Dimension(w,h);
18.29 else {
18.30 @@ -760,7 +760,7 @@
18.31
18.32 int w = stream.readInt();
18.33 int h = stream.readInt();
18.34 - setSize(w,h);
18.35 + setDesignSize(w,h);
18.36 Debug.debug(Debug.FORMIO_LOAD, "loaded panel: "+name+"["+x+", "+y+", "+w+", "+h+"]");
18.37
18.38 for (int i = 0; i < propertyCount; i++) {
19.1 --- a/src/main/java/xelfi/design/components/xawt/XPanel3D.java Tue Jan 17 21:08:28 2017 +0100
19.2 +++ b/src/main/java/xelfi/design/components/xawt/XPanel3D.java Tue Jan 17 21:08:47 2017 +0100
19.3 @@ -159,7 +159,7 @@
19.4
19.5 public String getName() { return name; }
19.6
19.7 - public int setName(String aName) {
19.8 + public int setDesignName(String aName) {
19.9 name = aName;
19.10 return XFDesignConstants.RSP_OK;
19.11 }
19.12 @@ -222,7 +222,7 @@
19.13 }
19.14 if (changePos)
19.15 setPosition(p.x, p.y);
19.16 - setSize(d.width, d.height);
19.17 + setDesignSize(d.width, d.height);
19.18 TopLevel.getInspector().selectionChanged();
19.19 dragMode = DM_NONE;
19.20 }
19.21 @@ -314,7 +314,7 @@
19.22 return new Dimension(size);
19.23 }
19.24
19.25 - public int setSize(int w, int h) {
19.26 + public int setDesignSize(int w, int h) {
19.27 if (size == null)
19.28 size = new Dimension(w,h);
19.29 else {
19.30 @@ -845,7 +845,7 @@
19.31
19.32 int w = stream.readInt();
19.33 int h = stream.readInt();
19.34 - setSize(w,h);
19.35 + setDesignSize(w,h);
19.36 Debug.debug(Debug.FORMIO_LOAD, "loaded panel3d: "+name+"["+x+", "+y+", "+w+", "+h+"]");
19.37
19.38 for (int i = 0; i < propertyCount; i++) {
20.1 --- a/src/main/java/xelfi/design/components/xawt/XScrollbar.java Tue Jan 17 21:08:28 2017 +0100
20.2 +++ b/src/main/java/xelfi/design/components/xawt/XScrollbar.java Tue Jan 17 21:08:47 2017 +0100
20.3 @@ -227,7 +227,7 @@
20.4 setAutoSize(((Boolean)value).booleanValue());
20.5 if (autoSize) {
20.6 repaintComponent();
20.7 - setSize(0,0);
20.8 + setDesignSize(0,0);
20.9 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
20.10 }
20.11 regen = regen | XFDesignConstants.GEN_RESHAPE;
21.1 --- a/src/main/java/xelfi/design/components/xawt/XSpinButton.java Tue Jan 17 21:08:28 2017 +0100
21.2 +++ b/src/main/java/xelfi/design/components/xawt/XSpinButton.java Tue Jan 17 21:08:47 2017 +0100
21.3 @@ -259,7 +259,7 @@
21.4 case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
21.5 setAutoSize(((Boolean)value).booleanValue());
21.6 if (autoSize) {
21.7 - setSize(0,0);
21.8 + setDesignSize(0,0);
21.9 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
21.10 spin.repaint();
21.11 }
21.12 @@ -300,7 +300,7 @@
21.13 case 13:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
21.14 spin.setBorderWidth(((Integer)value).intValue());
21.15 if (autoSize) {
21.16 - setSize(0,0);
21.17 + setDesignSize(0,0);
21.18 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
21.19 spin.repaint();
21.20 }
21.21 @@ -308,7 +308,7 @@
21.22 case 14:if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
21.23 spin.setOrientation(((Boolean)value).booleanValue());
21.24 if (autoSize) {
21.25 - setSize(0,0);
21.26 + setDesignSize(0,0);
21.27 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
21.28 spin.repaint();
21.29 }
22.1 --- a/src/main/java/xelfi/design/components/xawt/XSpinEdit.java Tue Jan 17 21:08:28 2017 +0100
22.2 +++ b/src/main/java/xelfi/design/components/xawt/XSpinEdit.java Tue Jan 17 21:08:47 2017 +0100
22.3 @@ -248,7 +248,7 @@
22.4 case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
22.5 setAutoSize(((Boolean)value).booleanValue());
22.6 if (autoSize) {
22.7 - setSize(0,0);
22.8 + setDesignSize(0,0);
22.9 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
22.10 spin.repaint();
22.11 }
22.12 @@ -287,7 +287,7 @@
22.13 ret = ret | XFDesignConstants.RSP_REPAINT_COMP | XFDesignConstants.RSP_OTHER_PROP;
22.14 if (parentFont) {
22.15 parentFont = false;
22.16 - if (autoSize) setSize(0,0);
22.17 + if (autoSize) setDesignSize(0,0);
22.18 }
22.19 repaintComponent();
22.20 break;
23.1 --- a/src/main/java/xelfi/design/components/xawt/XTabControl.java Tue Jan 17 21:08:28 2017 +0100
23.2 +++ b/src/main/java/xelfi/design/components/xawt/XTabControl.java Tue Jan 17 21:08:47 2017 +0100
23.3 @@ -265,7 +265,7 @@
23.4 if (parentFont) {
23.5 parentFont = false;
23.6 if (autoSize) {
23.7 - setSize(0,0);
23.8 + setDesignSize(0,0);
23.9 regen = regen | XFDesignConstants.GEN_RESHAPE;
23.10 repaintComponent();
23.11 }
23.12 @@ -274,7 +274,7 @@
23.13 case 5: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
23.14 setAutoSize(((Boolean)value).booleanValue());
23.15 if (autoSize) {
23.16 - setSize(0,0);
23.17 + setDesignSize(0,0);
23.18 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
23.19 tabcontrol.repaint();
23.20 }
23.21 @@ -298,7 +298,7 @@
23.22 for (int i = 0; i < ((String [])value).length; i++)
23.23 tabcontrol.addTab(((String [])value)[i]);
23.24 if (autoSize) {
23.25 - setSize(0,0);
23.26 + setDesignSize(0,0);
23.27 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
23.28 repaintComponent();
23.29 }
23.30 @@ -317,7 +317,7 @@
23.31 case 10:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
23.32 tabcontrol.setMinWidth(((Integer)value).intValue());
23.33 if (autoSize) {
23.34 - setSize(0,0);
23.35 + setDesignSize(0,0);
23.36 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
23.37 repaintComponent();
23.38 }
23.39 @@ -329,7 +329,7 @@
23.40 case 12:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
23.41 tabcontrol.setBorderWidth(((Integer)value).intValue());
23.42 if (autoSize) {
23.43 - setSize(0,0);
23.44 + setDesignSize(0,0);
23.45 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
23.46 repaintComponent();
23.47 }
24.1 --- a/src/main/java/xelfi/design/components/xawt/XTextArea.java Tue Jan 17 21:08:28 2017 +0100
24.2 +++ b/src/main/java/xelfi/design/components/xawt/XTextArea.java Tue Jan 17 21:08:47 2017 +0100
24.3 @@ -234,7 +234,7 @@
24.4 if (parentFont) {
24.5 parentFont = false;
24.6 if (autoSize) {
24.7 - setSize(0,0);
24.8 + setDesignSize(0,0);
24.9 regen = regen | XFDesignConstants.GEN_RESHAPE;
24.10 }
24.11 }
24.12 @@ -243,7 +243,7 @@
24.13 case 5: if (!(value instanceof String)) throw new XFPropertyBadValueTypeException();
24.14 text.setText((String)value);
24.15 if (autoSize) {
24.16 - setSize(0,0);
24.17 + setDesignSize(0,0);
24.18 regen = regen | XFDesignConstants.GEN_RESHAPE;
24.19 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
24.20 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
24.21 @@ -254,7 +254,7 @@
24.22 setAutoSize(((Boolean)value).booleanValue());
24.23 if (autoSize) {
24.24 repaintComponent();
24.25 - setSize(0,0);
24.26 + setDesignSize(0,0);
24.27 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
24.28 }
24.29 regen = regen | XFDesignConstants.GEN_RESHAPE;
25.1 --- a/src/main/java/xelfi/design/components/xawt/XTextField.java Tue Jan 17 21:08:28 2017 +0100
25.2 +++ b/src/main/java/xelfi/design/components/xawt/XTextField.java Tue Jan 17 21:08:47 2017 +0100
25.3 @@ -240,7 +240,7 @@
25.4 if (parentFont) {
25.5 parentFont = false;
25.6 if (autoSize) {
25.7 - setSize(0,0);
25.8 + setDesignSize(0,0);
25.9 regen = regen | XFDesignConstants.GEN_RESHAPE;
25.10 }
25.11 }
25.12 @@ -249,7 +249,7 @@
25.13 case 5: if (!(value instanceof String)) throw new XFPropertyBadValueTypeException();
25.14 text.setText((String)value);
25.15 if (autoSize) {
25.16 - setSize(0,0);
25.17 + setDesignSize(0,0);
25.18 regen = regen | XFDesignConstants.GEN_RESHAPE;
25.19 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
25.20 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
25.21 @@ -260,7 +260,7 @@
25.22 setAutoSize(((Boolean)value).booleanValue());
25.23 if (autoSize) {
25.24 repaintComponent();
25.25 - setSize(0,0);
25.26 + setDesignSize(0,0);
25.27 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
25.28 }
25.29 regen = regen | XFDesignConstants.GEN_RESHAPE;
26.1 --- a/src/main/java/xelfi/design/components/xawt/XTimer.java Tue Jan 17 21:08:28 2017 +0100
26.2 +++ b/src/main/java/xelfi/design/components/xawt/XTimer.java Tue Jan 17 21:08:47 2017 +0100
26.3 @@ -55,7 +55,7 @@
26.4
26.5 public String getName() { return name; }
26.6
26.7 - public int setName(String aName) { name = aName; return XFDesignConstants.RSP_OK; }
26.8 + public int setDesignName(String aName) { name = aName; return XFDesignConstants.RSP_OK; }
26.9
26.10 public int getPropertyCount() { return propertyCount; }
26.11
27.1 --- a/src/main/java/xelfi/design/components/xawt/XTrackBar.java Tue Jan 17 21:08:28 2017 +0100
27.2 +++ b/src/main/java/xelfi/design/components/xawt/XTrackBar.java Tue Jan 17 21:08:47 2017 +0100
27.3 @@ -289,7 +289,7 @@
27.4 case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
27.5 setAutoSize(((Boolean)value).booleanValue());
27.6 if (autoSize) {
27.7 - setSize(0,0);
27.8 + setDesignSize(0,0);
27.9 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.10 tbar.repaint();
27.11 }
27.12 @@ -309,7 +309,7 @@
27.13 tbar.setMinimum(((Integer)value).intValue());
27.14 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.15 if (autoSize) {
27.16 - setSize(0,0);
27.17 + setDesignSize(0,0);
27.18 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.19 tbar.repaint();
27.20 }
27.21 @@ -318,7 +318,7 @@
27.22 tbar.setMaximum(((Integer)value).intValue());
27.23 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.24 if (autoSize) {
27.25 - setSize(0,0);
27.26 + setDesignSize(0,0);
27.27 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.28 tbar.repaint();
27.29 }
27.30 @@ -334,7 +334,7 @@
27.31 case 11:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
27.32 tbar.setLathWidth(((Integer)value).intValue());
27.33 if (autoSize) {
27.34 - setSize(0,0);
27.35 + setDesignSize(0,0);
27.36 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.37 tbar.repaint();
27.38 }
27.39 @@ -350,7 +350,7 @@
27.40 case 14:if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException();
27.41 tbar.setOrientation(((Boolean)value).booleanValue());
27.42 if (autoSize) {
27.43 - setSize(0,0);
27.44 + setDesignSize(0,0);
27.45 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.46 tbar.repaint();
27.47 }
27.48 @@ -358,7 +358,7 @@
27.49 case 15:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
27.50 tbar.setTickMarks(((Integer)value).intValue());
27.51 if (autoSize) {
27.52 - setSize(0,0);
27.53 + setDesignSize(0,0);
27.54 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.55 tbar.repaint();
27.56 }
27.57 @@ -366,7 +366,7 @@
27.58 case 16:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException();
27.59 tbar.setTickLenght(((Integer)value).intValue());
27.60 if (autoSize) {
27.61 - setSize(0,0);
27.62 + setDesignSize(0,0);
27.63 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.64 tbar.repaint();
27.65 }
27.66 @@ -375,7 +375,7 @@
27.67 tbar.setFrequency(((Integer)value).intValue());
27.68 ret = ret | XFDesignConstants.RSP_REPAINT_COMP;
27.69 if (autoSize) {
27.70 - setSize(0,0);
27.71 + setDesignSize(0,0);
27.72 ret = ret | XFDesignConstants.RSP_OTHER_PROP;
27.73 tbar.repaint();
27.74 }
28.1 --- a/src/main/java/xelfi/design/forms/XFFormApplet.java Tue Jan 17 21:08:28 2017 +0100
28.2 +++ b/src/main/java/xelfi/design/forms/XFFormApplet.java Tue Jan 17 21:08:47 2017 +0100
28.3 @@ -397,7 +397,7 @@
28.4 else
28.5 addPos = new Point(x-parentPos.x,y-parentPos.y);
28.6 } else { // NON-VISUAL COMPONENT
28.7 - xdc.setName(nameManager.getNewName(xdc));
28.8 + xdc.setDesignName(nameManager.getNewName(xdc));
28.9 nonVisualComps.addElement(xdc);
28.10 deselectAll();
28.11 select(xdc);
28.12 @@ -467,7 +467,7 @@
28.13 dragMode = DM_NONE;
28.14
28.15 formDocument.redrawLock();
28.16 - dragComp.setName(nameManager.getNewName(dragComp));
28.17 + dragComp.setDesignName(nameManager.getNewName(dragComp));
28.18 addPos.x = (addPos.x / grid.gridX()) * grid.gridX();
28.19 addPos.y = (addPos.y / grid.gridY()) * grid.gridY();
28.20 dragComp.setPosition(addPos.x, addPos.y);
28.21 @@ -480,7 +480,7 @@
28.22
28.23 if ((newW>XFDesignOptions.minDragSize) ||
28.24 (newH>XFDesignOptions.minDragSize))
28.25 - dragComp.setSize(newW, newH);
28.26 + dragComp.setDesignSize(newW, newH);
28.27
28.28 xvcParent.getDesignLayout().layoutAdd((Container)xvcParent, dragComp);
28.29
28.30 @@ -521,7 +521,7 @@
28.31 public XelfiDesignForm getParentForm() { return this; }
28.32
28.33 public String getName() { return formName; }
28.34 - public int setName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; }
28.35 + public int setDesignName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; }
28.36
28.37 public Point getPosition() { return position; }
28.38
28.39 @@ -539,7 +539,7 @@
28.40 return preferredSize();
28.41 }
28.42
28.43 - public int setSize(int w, int h) {
28.44 + public int setDesignSize(int w, int h) {
28.45 if (size == null)
28.46 size = new Dimension(w,h);
28.47 else {
28.48 @@ -952,7 +952,7 @@
28.49 xdl.renameComponent((XelfiVisualComponent)comp, newName);
28.50 }
28.51 nameManager.releaseName(comp); // free the name for future use
28.52 - comp.setName(newName);
28.53 + comp.setDesignName(newName);
28.54 nameManager.allocName(comp);
28.55 evPool.componentRenamed(comp);
28.56 regenerateCode(comp, XFDesignConstants.GEN_ALL);
28.57 @@ -1042,7 +1042,7 @@
28.58
28.59 int w=0; int h=0;
28.60 w = stream.readInt(); h = stream.readInt();
28.61 - setSize(w,h);
28.62 + setDesignSize(w,h);
28.63
28.64 Debug.debug(Debug.FORMIO_LOAD, "AppletLoad: (2) loading form properties...");
28.65 if ("FormProperties".equalsIgnoreCase(stream.readUTF())) {
29.1 --- a/src/main/java/xelfi/design/forms/XFFormDialog.java Tue Jan 17 21:08:28 2017 +0100
29.2 +++ b/src/main/java/xelfi/design/forms/XFFormDialog.java Tue Jan 17 21:08:47 2017 +0100
29.3 @@ -411,7 +411,7 @@
29.4 else
29.5 addPos = new Point(x-parentPos.x,y-parentPos.y);
29.6 } else { // NON-VISUAL COMPONENT
29.7 - xdc.setName(nameManager.getNewName(xdc));
29.8 + xdc.setDesignName(nameManager.getNewName(xdc));
29.9 nonVisualComps.addElement(xdc);
29.10 deselectAll();
29.11 select(xdc);
29.12 @@ -481,7 +481,7 @@
29.13 dragMode = DM_NONE;
29.14
29.15 formDocument.redrawLock();
29.16 - dragComp.setName(nameManager.getNewName(dragComp));
29.17 + dragComp.setDesignName(nameManager.getNewName(dragComp));
29.18 addPos.x = (addPos.x / grid.gridX()) * grid.gridX();
29.19 addPos.y = (addPos.y / grid.gridY()) * grid.gridY();
29.20 dragComp.setPosition(addPos.x, addPos.y);
29.21 @@ -494,7 +494,7 @@
29.22
29.23 if ((newW>XFDesignOptions.minDragSize) ||
29.24 (newH>XFDesignOptions.minDragSize))
29.25 - dragComp.setSize(newW, newH);
29.26 + dragComp.setDesignSize(newW, newH);
29.27
29.28 xvcParent.getDesignLayout().layoutAdd((Container)xvcParent, dragComp);
29.29
29.30 @@ -535,7 +535,7 @@
29.31 public XelfiDesignForm getParentForm() { return this; }
29.32
29.33 public String getName() { return formName; }
29.34 - public int setName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; }
29.35 + public int setDesignName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; }
29.36
29.37 public Point getPosition() { return position; }
29.38
29.39 @@ -556,7 +556,7 @@
29.40 return preferredSize();
29.41 }
29.42
29.43 - public int setSize(int w, int h) {
29.44 + public int setDesignSize(int w, int h) {
29.45 if (size == null)
29.46 size = new Dimension(w,h);
29.47 else {
29.48 @@ -1035,7 +1035,7 @@
29.49 xdl.renameComponent((XelfiVisualComponent)comp, newName);
29.50 }
29.51 nameManager.releaseName(comp); // free the name for future use
29.52 - comp.setName(newName);
29.53 + comp.setDesignName(newName);
29.54 nameManager.allocName(comp);
29.55 evPool.componentRenamed(comp);
29.56 regenerateCode(comp, XFDesignConstants.GEN_ALL);
29.57 @@ -1125,7 +1125,7 @@
29.58
29.59 int w=0; int h=0;
29.60 w = stream.readInt(); h = stream.readInt();
29.61 - setSize(w,h);
29.62 + setDesignSize(w,h);
29.63
29.64 if ("FormProperties".equalsIgnoreCase(stream.readUTF())) {
29.65 try {
30.1 --- a/src/main/java/xelfi/design/forms/XFFormFrame.java Tue Jan 17 21:08:28 2017 +0100
30.2 +++ b/src/main/java/xelfi/design/forms/XFFormFrame.java Tue Jan 17 21:08:47 2017 +0100
30.3 @@ -442,7 +442,7 @@
30.4 xdc = (XelfiDesignComponent) xx.newInstance();
30.5 xdc.setParentForm(this);
30.6 if (xdc instanceof XMenuBar) { // MENU COMPONENT
30.7 - xdc.setName(nameManager.getNewName(xdc));
30.8 + xdc.setDesignName(nameManager.getNewName(xdc));
30.9 menuComps.addElement(xdc);
30.10 deselectAll();
30.11 select(xdc);
30.12 @@ -466,7 +466,7 @@
30.13 else
30.14 addPos = new Point(x-parentPos.x,y-parentPos.y);
30.15 } else { // NON-VISUAL COMPONENT
30.16 - xdc.setName(nameManager.getNewName(xdc));
30.17 + xdc.setDesignName(nameManager.getNewName(xdc));
30.18 nonVisualComps.addElement(xdc);
30.19 deselectAll();
30.20 select(xdc);
30.21 @@ -536,7 +536,7 @@
30.22 dragMode = DM_NONE;
30.23
30.24 formDocument.redrawLock();
30.25 - dragComp.setName(nameManager.getNewName(dragComp));
30.26 + dragComp.setDesignName(nameManager.getNewName(dragComp));
30.27 addPos.x = (addPos.x / grid.gridX()) * grid.gridX();
30.28 addPos.y = (addPos.y / grid.gridY()) * grid.gridY();
30.29 dragComp.setPosition(addPos.x, addPos.y);
30.30 @@ -549,7 +549,7 @@
30.31
30.32 if ((newW>XFDesignOptions.minDragSize) ||
30.33 (newH>XFDesignOptions.minDragSize))
30.34 - dragComp.setSize(newW, newH);
30.35 + dragComp.setDesignSize(newW, newH);
30.36
30.37 xvcParent.getDesignLayout().layoutAdd((Container)xvcParent, dragComp);
30.38
30.39 @@ -601,9 +601,9 @@
30.40 public String getName() { return formName; }
30.41
30.42 /**
30.43 - * @see XelfiDesignComponent#setName
30.44 + * @see XelfiDesignComponent#setDesignName
30.45 */
30.46 - public int setName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; }
30.47 + public int setDesignName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; }
30.48
30.49 /**
30.50 * @see XelfiVisualComponent#getPosition
30.51 @@ -637,9 +637,9 @@
30.52 }
30.53
30.54 /**
30.55 - * @see XelfiVisualComponent#setSize
30.56 + * @see XelfiVisualComponent#setDesignSize
30.57 */
30.58 - public int setSize(int w, int h) {
30.59 + public int setDesignSize(int w, int h) {
30.60 if (size == null)
30.61 size = new Dimension(w,h);
30.62 else {
30.63 @@ -1215,10 +1215,10 @@
30.64 nameManager.releaseName(comp);
30.65 else
30.66 if ("".equals(newName)) // we are creating menu component and we need default name
30.67 - comp.setName(nameManager.getNewName(comp));
30.68 + comp.setDesignName(nameManager.getNewName(comp));
30.69 else {
30.70 nameManager.releaseName(comp); // free the name for future use
30.71 - comp.setName(newName);
30.72 + comp.setDesignName(newName);
30.73 nameManager.allocName(comp);
30.74 evPool.componentRenamed(comp);
30.75 }
30.76 @@ -1236,7 +1236,7 @@
30.77 xdl.renameComponent((XelfiVisualComponent)comp, newName);
30.78 }
30.79 nameManager.releaseName(comp); // free the name for future use
30.80 - comp.setName(newName);
30.81 + comp.setDesignName(newName);
30.82 nameManager.allocName(comp);
30.83 evPool.componentRenamed(comp);
30.84 regenerateCode(comp, XFDesignConstants.GEN_ALL);
30.85 @@ -1332,7 +1332,7 @@
30.86
30.87 int w=0; int h=0;
30.88 w = stream.readInt(); h = stream.readInt();
30.89 - setSize(w,h);
30.90 + setDesignSize(w,h);
30.91
30.92 Debug.debug(Debug.FORMIO_LOAD, "FrameLoad: (2) loading form properties...");
30.93 if ("FormProperties".equalsIgnoreCase(stream.readUTF())) {
31.1 --- a/src/main/java/xelfi/design/inspector/XFCommonProperties.java Tue Jan 17 21:08:28 2017 +0100
31.2 +++ b/src/main/java/xelfi/design/inspector/XFCommonProperties.java Tue Jan 17 21:08:47 2017 +0100
31.3 @@ -288,12 +288,12 @@
31.4 ((Integer)value).intValue());
31.5 break;
31.6 case WIDTH_INDEX:
31.7 - ((XelfiVisualComponent)comp).setSize(
31.8 + ((XelfiVisualComponent)comp).setDesignSize(
31.9 ((Integer)value).intValue(),
31.10 ((XelfiVisualComponent)comp).getSize().height);
31.11 break;
31.12 case HEIGHT_INDEX:
31.13 - ((XelfiVisualComponent)comp).setSize(
31.14 + ((XelfiVisualComponent)comp).setDesignSize(
31.15 ((XelfiVisualComponent)comp).getSize().width,
31.16 ((Integer)value).intValue());
31.17 break;
31.18 @@ -301,7 +301,7 @@
31.19 // transfers the work of setting the name to parent form
31.20 // parent form will decide, whether this name is allowed or not
31.21 if (comp instanceof XelfiDesignForm) {
31.22 - comp.setName((String)value);
31.23 + comp.setDesignName((String)value);
31.24 } else {
31.25 XelfiDesignForm parentForm = comp.getParentForm();
31.26 if (parentForm==null) {