mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v2.8.3.1
This commit is contained in:
@@ -30,7 +30,7 @@ public class GfuiBorderEdge {
|
||||
public static final GfuiBorderEdge All = new GfuiBorderEdge(15);
|
||||
}
|
||||
class GfuiBorderEdge_ {
|
||||
public static String XtoStr(GfuiBorderEdge edge) {
|
||||
public static String To_str(GfuiBorderEdge edge) {
|
||||
int val = edge.Val();
|
||||
if (val == GfuiBorderEdge.Left.Val()) return Left_raw;
|
||||
else if (val == GfuiBorderEdge.Right.Val()) return Right_raw;
|
||||
|
||||
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package gplx.gfui; import gplx.*;
|
||||
public class PointAdp implements XtoStrAble {
|
||||
public class PointAdp implements To_str_able {
|
||||
public int X() {return x;} final int x;
|
||||
public int Y() {return y;} final int y;
|
||||
public PointAdp Op_add(PointAdp val) {return new PointAdp(x + val.x, y + val.y);}
|
||||
@@ -27,8 +27,8 @@ public class PointAdp implements XtoStrAble {
|
||||
PointAdp comp = PointAdp_.as_(compObj); if (comp == null) return false;
|
||||
return x == comp.x && y == comp.y;
|
||||
}
|
||||
public String XtoStr() {return String_.Concat_any(x, ",", y);}
|
||||
@Override public String toString() {return XtoStr();}
|
||||
public String To_str() {return String_.Concat_any(x, ",", y);}
|
||||
@Override public String toString() {return To_str();}
|
||||
@Override public boolean equals(Object obj) {return Eq(obj);}
|
||||
@Override public int hashCode() {return super.hashCode();}
|
||||
@gplx.Internal protected PointAdp(int x, int y) {this.x = x; this.y = y;}
|
||||
|
||||
@@ -24,12 +24,12 @@ public class SizeAdp {
|
||||
@gplx.Internal protected SizeAdp Op_add(SizeAdp s) {return SizeAdp_.new_(width + s.width, height + s.height);}
|
||||
@gplx.Internal protected SizeAdp Op_subtract(int val) {return SizeAdp_.new_(width - val, height - val);}
|
||||
@gplx.Internal protected SizeAdp Op_subtract(int w, int h) {return SizeAdp_.new_(width - w, height - h);}
|
||||
public String XtoStr() {return String_.Concat_any(width, ",", height);}
|
||||
public String To_str() {return String_.Concat_any(width, ",", height);}
|
||||
public boolean Eq(Object o) {
|
||||
SizeAdp comp = (SizeAdp)o; if (comp == null) return false;
|
||||
return width == comp.width && height == comp.height;
|
||||
}
|
||||
@Override public String toString() {return XtoStr();}
|
||||
@Override public String toString() {return To_str();}
|
||||
@Override public boolean equals(Object obj) {return Eq(obj);}
|
||||
@Override public int hashCode() {return super.hashCode();}
|
||||
@gplx.Internal protected SizeAdp(int width, int height) {this.width = width; this.height = height;}
|
||||
|
||||
Reference in New Issue
Block a user