# HG changeset patch # User Jaroslav Tulach # Date 1484683727 -3600 # Node ID 947ce11568338a9d30dd8ef0ec3c9a360f6bf6ef # Parent 2c326fbd80f20e658842e8b1cec235c0820713dc Renaming setName to setDesignName and setSize to setDesignSize to avoid clash with added methods of java.awt.Component that return void diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/XelfiDesignComponent.java --- a/src/main/java/xelfi/design/components/XelfiDesignComponent.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/XelfiDesignComponent.java Tue Jan 17 21:08:47 2017 +0100 @@ -180,7 +180,7 @@ /** * Method to get component's name * @return Component name - * @see #setName + * @see #setDesignName */ public String getName(); @@ -190,7 +190,7 @@ * @return one of RSP_??? constants defined in XFDesignConstants. * @see #getName */ - public int setName(String aName); + public int setDesignName(String aName); /** * Method to get number of event properties in component. diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/XelfiVisualComponent.java --- a/src/main/java/xelfi/design/components/XelfiVisualComponent.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/XelfiVisualComponent.java Tue Jan 17 21:08:47 2017 +0100 @@ -37,7 +37,7 @@ * @return Component position * @see #setPosition * @see #getSize - * @see #setSize + * @see #setDesignSize */ public Point getPosition(); @@ -48,7 +48,7 @@ * @return one of RSP_??? constants defined in XFDesignConstants. * @see #getPosition * @see #getSize - * @see #setSize + * @see #setDesignSize */ public int setPosition(int x, int y); @@ -61,7 +61,7 @@ * This ensures that real component implementation has something to * say to component's size. * @return Component size - * @see #setSize + * @see #setDesignSize * @see #getPosition * @see #setPosition */ @@ -72,7 +72,7 @@ * design things painted around the real component (selection frame, XAWTPanel's * catch border). This is used by layouts that allow dragging only. * @return Component size including selection frame, etc. - * @see #setSize + * @see #setDesignSize */ public Dimension getDesignSize(); @@ -85,7 +85,7 @@ * @see #getPosition * @see #setPosition */ - public int setSize(int w, int h); + public int setDesignSize(int w, int h); /** * Method for eventHandling during design time. diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XAWTPanel.java --- a/src/main/java/xelfi/design/components/xawt/XAWTPanel.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XAWTPanel.java Tue Jan 17 21:08:47 2017 +0100 @@ -139,7 +139,7 @@ return new Dimension(size); } - public int setSize(int w, int h) { + public int setDesignSize(int w, int h) { if (autoSize == true) { size = component.preferredSize(); } @@ -236,7 +236,7 @@ return name; } - public int setName(String aName) { + public int setDesignName(String aName) { name = aName; //[IAN 20 Feb] regenForm(XFDesignConstants.GEN_ALL); return XFDesignConstants.RSP_OK; @@ -263,7 +263,7 @@ return false; autoSize = aAutoSize; if (autoSize) - setSize(0,0); + setDesignSize(0,0); repaintComponent(); return autoSize; } @@ -317,7 +317,7 @@ } if (changePos) setPosition(p.x, p.y); - setSize(d.width, d.height); + setDesignSize(d.width, d.height); TopLevel.getInspector().selectionChanged(); dragMode = DM_NONE; } @@ -410,7 +410,7 @@ int w = stream.readInt(); int h = stream.readInt(); - setSize(w,h); + setDesignSize(w,h); } public void saveToStream(DataOutput stream) throws IOException { diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XBevel.java --- a/src/main/java/xelfi/design/components/xawt/XBevel.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XBevel.java Tue Jan 17 21:08:47 2017 +0100 @@ -41,7 +41,7 @@ icon = loadIcon("bevel.gif"); } - public int setSize(int w, int h) { + public int setDesignSize(int w, int h) { Dimension d = bevel.size(); if (d == null) d = new Dimension(w,h); @@ -225,7 +225,7 @@ case 1: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); bevel.setDirection(((Boolean)value).booleanValue()); ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP; - setSize(0,0); + setDesignSize(0,0); break; case 2: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); bevel.enable(((Boolean)value).booleanValue()); @@ -250,17 +250,17 @@ case 6:if (!(value instanceof Color)) throw new XFPropertyBadValueTypeException(); bevel.setBorderColor((Color)value); ret = ret | XFDesignConstants.RSP_REPAINT_COMP; - setSize(0,0); + setDesignSize(0,0); break; case 7:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); bevel.setBorderWidth(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP; - setSize(0,0); + setDesignSize(0,0); break; case 8:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); bevel.setBevelWidth(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP; - setSize(0,0); + setDesignSize(0,0); break; default: throw new XFPropertyIndexOutOfBoundsException(); } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XButton.java --- a/src/main/java/xelfi/design/components/xawt/XButton.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XButton.java Tue Jan 17 21:08:47 2017 +0100 @@ -47,13 +47,13 @@ parentForm.regenerateCode(this, what); } - public int setName(String aName) { + public int setDesignName(String aName) { if (!labeled) { button.setLabel(aName); if (autoSize) - setSize(0,0); + setDesignSize(0,0); } - super.setName(aName); + super.setDesignName(aName); if (!labeled) return XFDesignConstants.RSP_OTHER_PROP; else return XFDesignConstants.RSP_OK; } @@ -223,7 +223,7 @@ ret = ret | XFDesignConstants.RSP_REPAINT_COMP | XFDesignConstants.RSP_OTHER_PROP; if (parentFont) { parentFont = false; - if (autoSize) setSize(0,0); + if (autoSize) setDesignSize(0,0); } repaintComponent(); break; @@ -232,7 +232,7 @@ labeled = true; // so that caption of a button does not change with its name no more regen = regen | XFDesignConstants.GEN_INIT; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_REPAINT_COMP; ret = ret | XFDesignConstants.RSP_OTHER_PROP; } @@ -242,7 +242,7 @@ setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { repaintComponent(); - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } else regen = regen | XFDesignConstants.GEN_RESHAPE; diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XCheckbox.java --- a/src/main/java/xelfi/design/components/xawt/XCheckbox.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XCheckbox.java Tue Jan 17 21:08:47 2017 +0100 @@ -46,13 +46,13 @@ parentForm.regenerateCode(this, what); } - public int setName(String aName) { + public int setDesignName(String aName) { if (!labeled) { check.setLabel(aName); if (autoSize) - setSize(0,0); + setDesignSize(0,0); } - super.setName(aName); + super.setDesignName(aName); if (!labeled) return XFDesignConstants.RSP_OTHER_PROP; else return XFDesignConstants.RSP_OK; } @@ -228,7 +228,7 @@ if (parentFont) { parentFont = false; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; } } @@ -239,7 +239,7 @@ labeled = true; // so that caption of a check does not change with its name no more regen = regen | XFDesignConstants.GEN_INIT; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; ret = ret | XFDesignConstants.RSP_REPAINT_COMP; ret = ret | XFDesignConstants.RSP_OTHER_PROP; @@ -250,7 +250,7 @@ setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { repaintComponent(); - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } regen = regen | XFDesignConstants.GEN_RESHAPE; diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XCheckboxMenuItem.java --- a/src/main/java/xelfi/design/components/xawt/XCheckboxMenuItem.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XCheckboxMenuItem.java Tue Jan 17 21:08:47 2017 +0100 @@ -213,7 +213,7 @@ return name; } - public int setName (String aName) { + public int setDesignName (String aName) { name = aName; return XFDesignConstants.RSP_OK; } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XChoice.java --- a/src/main/java/xelfi/design/components/xawt/XChoice.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XChoice.java Tue Jan 17 21:08:47 2017 +0100 @@ -218,7 +218,7 @@ if (parentFont) { parentFont = false; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; } } @@ -228,7 +228,7 @@ setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { repaintComponent(); - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } regen = regen | XFDesignConstants.GEN_RESHAPE; @@ -273,7 +273,7 @@ choice.addItem(((String [])value)[i]); repaintComponent(); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } break; diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XColorGrid.java --- a/src/main/java/xelfi/design/components/xawt/XColorGrid.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XColorGrid.java Tue Jan 17 21:08:47 2017 +0100 @@ -204,7 +204,7 @@ colGrid.setGridOrdering(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_REPAINT_COMP; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } colGrid.repaint(); @@ -219,7 +219,7 @@ colGrid.setBorderColor((Color)value); ret = ret | XFDesignConstants.RSP_REPAINT_COMP; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } colGrid.repaint(); @@ -228,7 +228,7 @@ colGrid.setBorderWidth(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_REPAINT_COMP; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } colGrid.repaint(); @@ -258,7 +258,7 @@ case 9: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; colGrid.repaint(); } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XGauge.java --- a/src/main/java/xelfi/design/components/xawt/XGauge.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XGauge.java Tue Jan 17 21:08:47 2017 +0100 @@ -278,7 +278,7 @@ if (parentFont) { parentFont = false; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; gauge.repaint(); } @@ -287,7 +287,7 @@ case 5: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; gauge.repaint(); } @@ -314,7 +314,7 @@ gauge.setKind(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_REPAINT_COMP; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } repaintComponent(); @@ -329,7 +329,7 @@ case 12:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); gauge.setBorderWidth(((Integer)value).intValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } repaintComponent(); @@ -337,7 +337,7 @@ case 13:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); gauge.setBorderStyle(((Integer)value).intValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } repaintComponent(); diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XImageButton.java --- a/src/main/java/xelfi/design/components/xawt/XImageButton.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XImageButton.java Tue Jan 17 21:08:47 2017 +0100 @@ -94,10 +94,10 @@ imBut.show(); component = imBut; if (autoSize) - setSize(0,0); + setDesignSize(0,0); else { Dimension dd = getSize(); - setSize(dd.width, dd.height); + setDesignSize(dd.width, dd.height); } repaintComponent(); imBut.repaint(); @@ -245,7 +245,7 @@ case 2: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; imBut.repaint(); } @@ -259,7 +259,7 @@ case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); imBut.setStretch(((Boolean)value).booleanValue()); if (autoSize) - setSize(0,0); + setDesignSize(0,0); repaintComponent(); ret = ret | XFDesignConstants.RSP_REPAINT_COMP; break; @@ -274,7 +274,7 @@ imBut.setBorderWidth(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP; if (autoSize) - setSize(0,0); + setDesignSize(0,0); repaintComponent(); break; case 7: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XImageLabel.java --- a/src/main/java/xelfi/design/components/xawt/XImageLabel.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XImageLabel.java Tue Jan 17 21:08:47 2017 +0100 @@ -88,10 +88,10 @@ imLab.show(); component = imLab; if (autoSize) - setSize(0,0); + setDesignSize(0,0); else { Dimension dd = getSize(); - setSize(dd.width, dd.height); + setDesignSize(dd.width, dd.height); } repaintComponent(); imLab.repaint(); @@ -233,7 +233,7 @@ case 2: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; imLab.repaint(); } @@ -247,7 +247,7 @@ case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); imLab.setStretch(((Boolean)value).booleanValue()); if (autoSize) - setSize(0,0); + setDesignSize(0,0); repaintComponent(); ret = ret | XFDesignConstants.RSP_REPAINT_COMP; break; @@ -262,7 +262,7 @@ imLab.setBorderWidth(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_OTHER_PROP | XFDesignConstants.RSP_REPAINT_COMP; if (autoSize) - setSize(0,0); + setDesignSize(0,0); repaintComponent(); break; case 7: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XLabel.java --- a/src/main/java/xelfi/design/components/xawt/XLabel.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XLabel.java Tue Jan 17 21:08:47 2017 +0100 @@ -46,13 +46,13 @@ parentForm.regenerateCode(this, what); } - public int setName(String aName) { + public int setDesignName(String aName) { if (!labeled) { label.setText(aName); if (autoSize) - setSize(0,0); + setDesignSize(0,0); } - super.setName(aName); + super.setDesignName(aName); if (!labeled) return XFDesignConstants.RSP_OTHER_PROP; else return XFDesignConstants.RSP_OK; } @@ -238,7 +238,7 @@ if (parentFont) { parentFont = false; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; } } @@ -249,7 +249,7 @@ labeled = true; // so that caption of a button does not change with its name no more regen = regen | XFDesignConstants.GEN_INIT; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; ret = ret | XFDesignConstants.RSP_REPAINT_COMP; ret = ret | XFDesignConstants.RSP_OTHER_PROP; @@ -260,7 +260,7 @@ setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { repaintComponent(); - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } regen = regen | XFDesignConstants.GEN_RESHAPE; diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XList.java --- a/src/main/java/xelfi/design/components/xawt/XList.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XList.java Tue Jan 17 21:08:47 2017 +0100 @@ -219,7 +219,7 @@ if (parentFont) { parentFont = false; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; } } @@ -229,7 +229,7 @@ setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { repaintComponent(); - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } regen = regen | XFDesignConstants.GEN_RESHAPE; diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XMenuBar.java --- a/src/main/java/xelfi/design/components/xawt/XMenuBar.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XMenuBar.java Tue Jan 17 21:08:47 2017 +0100 @@ -199,7 +199,7 @@ return name; } - public int setName (String aName) { + public int setDesignName (String aName) { name = aName; return XFDesignConstants.RSP_OK; } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XMenuFolder.java --- a/src/main/java/xelfi/design/components/xawt/XMenuFolder.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XMenuFolder.java Tue Jan 17 21:08:47 2017 +0100 @@ -208,7 +208,7 @@ * Sets the name of the component. * Refreshes menu editor if needed. */ - public int setName (String name) { + public int setDesignName (String name) { this.name = name; return XFDesignConstants.RSP_OK; } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XMenuItem.java --- a/src/main/java/xelfi/design/components/xawt/XMenuItem.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XMenuItem.java Tue Jan 17 21:08:47 2017 +0100 @@ -201,7 +201,7 @@ return name; } - public int setName (String aName) { + public int setDesignName (String aName) { name = aName; return XFDesignConstants.RSP_OK; } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XPanel.java --- a/src/main/java/xelfi/design/components/xawt/XPanel.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XPanel.java Tue Jan 17 21:08:47 2017 +0100 @@ -148,7 +148,7 @@ public String getName() { return name; } - public int setName(String aName) { + public int setDesignName(String aName) { name = aName; // regenForm(XFDesignConstants.GEN_ALL); return XFDesignConstants.RSP_OK; @@ -214,7 +214,7 @@ } if (changePos) setPosition(p.x, p.y); - setSize(d.width, d.height); + setDesignSize(d.width, d.height); TopLevel.getInspector().selectionChanged(); dragMode = DM_NONE; } @@ -301,7 +301,7 @@ return new Dimension(size); } - public int setSize(int w, int h) { + public int setDesignSize(int w, int h) { if (size == null) size = new Dimension(w,h); else { @@ -760,7 +760,7 @@ int w = stream.readInt(); int h = stream.readInt(); - setSize(w,h); + setDesignSize(w,h); Debug.debug(Debug.FORMIO_LOAD, "loaded panel: "+name+"["+x+", "+y+", "+w+", "+h+"]"); for (int i = 0; i < propertyCount; i++) { diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XPanel3D.java --- a/src/main/java/xelfi/design/components/xawt/XPanel3D.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XPanel3D.java Tue Jan 17 21:08:47 2017 +0100 @@ -159,7 +159,7 @@ public String getName() { return name; } - public int setName(String aName) { + public int setDesignName(String aName) { name = aName; return XFDesignConstants.RSP_OK; } @@ -222,7 +222,7 @@ } if (changePos) setPosition(p.x, p.y); - setSize(d.width, d.height); + setDesignSize(d.width, d.height); TopLevel.getInspector().selectionChanged(); dragMode = DM_NONE; } @@ -314,7 +314,7 @@ return new Dimension(size); } - public int setSize(int w, int h) { + public int setDesignSize(int w, int h) { if (size == null) size = new Dimension(w,h); else { @@ -845,7 +845,7 @@ int w = stream.readInt(); int h = stream.readInt(); - setSize(w,h); + setDesignSize(w,h); Debug.debug(Debug.FORMIO_LOAD, "loaded panel3d: "+name+"["+x+", "+y+", "+w+", "+h+"]"); for (int i = 0; i < propertyCount; i++) { diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XScrollbar.java --- a/src/main/java/xelfi/design/components/xawt/XScrollbar.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XScrollbar.java Tue Jan 17 21:08:47 2017 +0100 @@ -227,7 +227,7 @@ setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { repaintComponent(); - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } regen = regen | XFDesignConstants.GEN_RESHAPE; diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XSpinButton.java --- a/src/main/java/xelfi/design/components/xawt/XSpinButton.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XSpinButton.java Tue Jan 17 21:08:47 2017 +0100 @@ -259,7 +259,7 @@ case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; spin.repaint(); } @@ -300,7 +300,7 @@ case 13:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); spin.setBorderWidth(((Integer)value).intValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; spin.repaint(); } @@ -308,7 +308,7 @@ case 14:if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); spin.setOrientation(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; spin.repaint(); } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XSpinEdit.java --- a/src/main/java/xelfi/design/components/xawt/XSpinEdit.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XSpinEdit.java Tue Jan 17 21:08:47 2017 +0100 @@ -248,7 +248,7 @@ case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; spin.repaint(); } @@ -287,7 +287,7 @@ ret = ret | XFDesignConstants.RSP_REPAINT_COMP | XFDesignConstants.RSP_OTHER_PROP; if (parentFont) { parentFont = false; - if (autoSize) setSize(0,0); + if (autoSize) setDesignSize(0,0); } repaintComponent(); break; diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XTabControl.java --- a/src/main/java/xelfi/design/components/xawt/XTabControl.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XTabControl.java Tue Jan 17 21:08:47 2017 +0100 @@ -265,7 +265,7 @@ if (parentFont) { parentFont = false; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; repaintComponent(); } @@ -274,7 +274,7 @@ case 5: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; tabcontrol.repaint(); } @@ -298,7 +298,7 @@ for (int i = 0; i < ((String [])value).length; i++) tabcontrol.addTab(((String [])value)[i]); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; repaintComponent(); } @@ -317,7 +317,7 @@ case 10:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); tabcontrol.setMinWidth(((Integer)value).intValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; repaintComponent(); } @@ -329,7 +329,7 @@ case 12:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); tabcontrol.setBorderWidth(((Integer)value).intValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; repaintComponent(); } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XTextArea.java --- a/src/main/java/xelfi/design/components/xawt/XTextArea.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XTextArea.java Tue Jan 17 21:08:47 2017 +0100 @@ -234,7 +234,7 @@ if (parentFont) { parentFont = false; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; } } @@ -243,7 +243,7 @@ case 5: if (!(value instanceof String)) throw new XFPropertyBadValueTypeException(); text.setText((String)value); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; ret = ret | XFDesignConstants.RSP_REPAINT_COMP; ret = ret | XFDesignConstants.RSP_OTHER_PROP; @@ -254,7 +254,7 @@ setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { repaintComponent(); - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } regen = regen | XFDesignConstants.GEN_RESHAPE; diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XTextField.java --- a/src/main/java/xelfi/design/components/xawt/XTextField.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XTextField.java Tue Jan 17 21:08:47 2017 +0100 @@ -240,7 +240,7 @@ if (parentFont) { parentFont = false; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; } } @@ -249,7 +249,7 @@ case 5: if (!(value instanceof String)) throw new XFPropertyBadValueTypeException(); text.setText((String)value); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); regen = regen | XFDesignConstants.GEN_RESHAPE; ret = ret | XFDesignConstants.RSP_REPAINT_COMP; ret = ret | XFDesignConstants.RSP_OTHER_PROP; @@ -260,7 +260,7 @@ setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { repaintComponent(); - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; } regen = regen | XFDesignConstants.GEN_RESHAPE; diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XTimer.java --- a/src/main/java/xelfi/design/components/xawt/XTimer.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XTimer.java Tue Jan 17 21:08:47 2017 +0100 @@ -55,7 +55,7 @@ public String getName() { return name; } - public int setName(String aName) { name = aName; return XFDesignConstants.RSP_OK; } + public int setDesignName(String aName) { name = aName; return XFDesignConstants.RSP_OK; } public int getPropertyCount() { return propertyCount; } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/components/xawt/XTrackBar.java --- a/src/main/java/xelfi/design/components/xawt/XTrackBar.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/components/xawt/XTrackBar.java Tue Jan 17 21:08:47 2017 +0100 @@ -289,7 +289,7 @@ case 4: if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); setAutoSize(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; tbar.repaint(); } @@ -309,7 +309,7 @@ tbar.setMinimum(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_OTHER_PROP; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; tbar.repaint(); } @@ -318,7 +318,7 @@ tbar.setMaximum(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_OTHER_PROP; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; tbar.repaint(); } @@ -334,7 +334,7 @@ case 11:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); tbar.setLathWidth(((Integer)value).intValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; tbar.repaint(); } @@ -350,7 +350,7 @@ case 14:if (!(value instanceof Boolean)) throw new XFPropertyBadValueTypeException(); tbar.setOrientation(((Boolean)value).booleanValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; tbar.repaint(); } @@ -358,7 +358,7 @@ case 15:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); tbar.setTickMarks(((Integer)value).intValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; tbar.repaint(); } @@ -366,7 +366,7 @@ case 16:if (!(value instanceof Integer)) throw new XFPropertyBadValueTypeException(); tbar.setTickLenght(((Integer)value).intValue()); if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; tbar.repaint(); } @@ -375,7 +375,7 @@ tbar.setFrequency(((Integer)value).intValue()); ret = ret | XFDesignConstants.RSP_REPAINT_COMP; if (autoSize) { - setSize(0,0); + setDesignSize(0,0); ret = ret | XFDesignConstants.RSP_OTHER_PROP; tbar.repaint(); } diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/forms/XFFormApplet.java --- a/src/main/java/xelfi/design/forms/XFFormApplet.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/forms/XFFormApplet.java Tue Jan 17 21:08:47 2017 +0100 @@ -397,7 +397,7 @@ else addPos = new Point(x-parentPos.x,y-parentPos.y); } else { // NON-VISUAL COMPONENT - xdc.setName(nameManager.getNewName(xdc)); + xdc.setDesignName(nameManager.getNewName(xdc)); nonVisualComps.addElement(xdc); deselectAll(); select(xdc); @@ -467,7 +467,7 @@ dragMode = DM_NONE; formDocument.redrawLock(); - dragComp.setName(nameManager.getNewName(dragComp)); + dragComp.setDesignName(nameManager.getNewName(dragComp)); addPos.x = (addPos.x / grid.gridX()) * grid.gridX(); addPos.y = (addPos.y / grid.gridY()) * grid.gridY(); dragComp.setPosition(addPos.x, addPos.y); @@ -480,7 +480,7 @@ if ((newW>XFDesignOptions.minDragSize) || (newH>XFDesignOptions.minDragSize)) - dragComp.setSize(newW, newH); + dragComp.setDesignSize(newW, newH); xvcParent.getDesignLayout().layoutAdd((Container)xvcParent, dragComp); @@ -521,7 +521,7 @@ public XelfiDesignForm getParentForm() { return this; } public String getName() { return formName; } - public int setName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; } + public int setDesignName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; } public Point getPosition() { return position; } @@ -539,7 +539,7 @@ return preferredSize(); } - public int setSize(int w, int h) { + public int setDesignSize(int w, int h) { if (size == null) size = new Dimension(w,h); else { @@ -952,7 +952,7 @@ xdl.renameComponent((XelfiVisualComponent)comp, newName); } nameManager.releaseName(comp); // free the name for future use - comp.setName(newName); + comp.setDesignName(newName); nameManager.allocName(comp); evPool.componentRenamed(comp); regenerateCode(comp, XFDesignConstants.GEN_ALL); @@ -1042,7 +1042,7 @@ int w=0; int h=0; w = stream.readInt(); h = stream.readInt(); - setSize(w,h); + setDesignSize(w,h); Debug.debug(Debug.FORMIO_LOAD, "AppletLoad: (2) loading form properties..."); if ("FormProperties".equalsIgnoreCase(stream.readUTF())) { diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/forms/XFFormDialog.java --- a/src/main/java/xelfi/design/forms/XFFormDialog.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/forms/XFFormDialog.java Tue Jan 17 21:08:47 2017 +0100 @@ -411,7 +411,7 @@ else addPos = new Point(x-parentPos.x,y-parentPos.y); } else { // NON-VISUAL COMPONENT - xdc.setName(nameManager.getNewName(xdc)); + xdc.setDesignName(nameManager.getNewName(xdc)); nonVisualComps.addElement(xdc); deselectAll(); select(xdc); @@ -481,7 +481,7 @@ dragMode = DM_NONE; formDocument.redrawLock(); - dragComp.setName(nameManager.getNewName(dragComp)); + dragComp.setDesignName(nameManager.getNewName(dragComp)); addPos.x = (addPos.x / grid.gridX()) * grid.gridX(); addPos.y = (addPos.y / grid.gridY()) * grid.gridY(); dragComp.setPosition(addPos.x, addPos.y); @@ -494,7 +494,7 @@ if ((newW>XFDesignOptions.minDragSize) || (newH>XFDesignOptions.minDragSize)) - dragComp.setSize(newW, newH); + dragComp.setDesignSize(newW, newH); xvcParent.getDesignLayout().layoutAdd((Container)xvcParent, dragComp); @@ -535,7 +535,7 @@ public XelfiDesignForm getParentForm() { return this; } public String getName() { return formName; } - public int setName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; } + public int setDesignName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; } public Point getPosition() { return position; } @@ -556,7 +556,7 @@ return preferredSize(); } - public int setSize(int w, int h) { + public int setDesignSize(int w, int h) { if (size == null) size = new Dimension(w,h); else { @@ -1035,7 +1035,7 @@ xdl.renameComponent((XelfiVisualComponent)comp, newName); } nameManager.releaseName(comp); // free the name for future use - comp.setName(newName); + comp.setDesignName(newName); nameManager.allocName(comp); evPool.componentRenamed(comp); regenerateCode(comp, XFDesignConstants.GEN_ALL); @@ -1125,7 +1125,7 @@ int w=0; int h=0; w = stream.readInt(); h = stream.readInt(); - setSize(w,h); + setDesignSize(w,h); if ("FormProperties".equalsIgnoreCase(stream.readUTF())) { try { diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/forms/XFFormFrame.java --- a/src/main/java/xelfi/design/forms/XFFormFrame.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/forms/XFFormFrame.java Tue Jan 17 21:08:47 2017 +0100 @@ -442,7 +442,7 @@ xdc = (XelfiDesignComponent) xx.newInstance(); xdc.setParentForm(this); if (xdc instanceof XMenuBar) { // MENU COMPONENT - xdc.setName(nameManager.getNewName(xdc)); + xdc.setDesignName(nameManager.getNewName(xdc)); menuComps.addElement(xdc); deselectAll(); select(xdc); @@ -466,7 +466,7 @@ else addPos = new Point(x-parentPos.x,y-parentPos.y); } else { // NON-VISUAL COMPONENT - xdc.setName(nameManager.getNewName(xdc)); + xdc.setDesignName(nameManager.getNewName(xdc)); nonVisualComps.addElement(xdc); deselectAll(); select(xdc); @@ -536,7 +536,7 @@ dragMode = DM_NONE; formDocument.redrawLock(); - dragComp.setName(nameManager.getNewName(dragComp)); + dragComp.setDesignName(nameManager.getNewName(dragComp)); addPos.x = (addPos.x / grid.gridX()) * grid.gridX(); addPos.y = (addPos.y / grid.gridY()) * grid.gridY(); dragComp.setPosition(addPos.x, addPos.y); @@ -549,7 +549,7 @@ if ((newW>XFDesignOptions.minDragSize) || (newH>XFDesignOptions.minDragSize)) - dragComp.setSize(newW, newH); + dragComp.setDesignSize(newW, newH); xvcParent.getDesignLayout().layoutAdd((Container)xvcParent, dragComp); @@ -601,9 +601,9 @@ public String getName() { return formName; } /** - * @see XelfiDesignComponent#setName + * @see XelfiDesignComponent#setDesignName */ - public int setName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; } + public int setDesignName(String aName) { formName = aName; return XFDesignConstants.RSP_OK; } /** * @see XelfiVisualComponent#getPosition @@ -637,9 +637,9 @@ } /** - * @see XelfiVisualComponent#setSize + * @see XelfiVisualComponent#setDesignSize */ - public int setSize(int w, int h) { + public int setDesignSize(int w, int h) { if (size == null) size = new Dimension(w,h); else { @@ -1215,10 +1215,10 @@ nameManager.releaseName(comp); else if ("".equals(newName)) // we are creating menu component and we need default name - comp.setName(nameManager.getNewName(comp)); + comp.setDesignName(nameManager.getNewName(comp)); else { nameManager.releaseName(comp); // free the name for future use - comp.setName(newName); + comp.setDesignName(newName); nameManager.allocName(comp); evPool.componentRenamed(comp); } @@ -1236,7 +1236,7 @@ xdl.renameComponent((XelfiVisualComponent)comp, newName); } nameManager.releaseName(comp); // free the name for future use - comp.setName(newName); + comp.setDesignName(newName); nameManager.allocName(comp); evPool.componentRenamed(comp); regenerateCode(comp, XFDesignConstants.GEN_ALL); @@ -1332,7 +1332,7 @@ int w=0; int h=0; w = stream.readInt(); h = stream.readInt(); - setSize(w,h); + setDesignSize(w,h); Debug.debug(Debug.FORMIO_LOAD, "FrameLoad: (2) loading form properties..."); if ("FormProperties".equalsIgnoreCase(stream.readUTF())) { diff -r 2c326fbd80f2 -r 947ce1156833 src/main/java/xelfi/design/inspector/XFCommonProperties.java --- a/src/main/java/xelfi/design/inspector/XFCommonProperties.java Tue Jan 17 21:08:28 2017 +0100 +++ b/src/main/java/xelfi/design/inspector/XFCommonProperties.java Tue Jan 17 21:08:47 2017 +0100 @@ -288,12 +288,12 @@ ((Integer)value).intValue()); break; case WIDTH_INDEX: - ((XelfiVisualComponent)comp).setSize( + ((XelfiVisualComponent)comp).setDesignSize( ((Integer)value).intValue(), ((XelfiVisualComponent)comp).getSize().height); break; case HEIGHT_INDEX: - ((XelfiVisualComponent)comp).setSize( + ((XelfiVisualComponent)comp).setDesignSize( ((XelfiVisualComponent)comp).getSize().width, ((Integer)value).intValue()); break; @@ -301,7 +301,7 @@ // transfers the work of setting the name to parent form // parent form will decide, whether this name is allowed or not if (comp instanceof XelfiDesignForm) { - comp.setName((String)value); + comp.setDesignName((String)value); } else { XelfiDesignForm parentForm = comp.getParentForm(); if (parentForm==null) {