You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(54) |
Aug
(33) |
Sep
(27) |
Oct
(10) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(25) |
Aug
(41) |
Sep
(89) |
Oct
(99) |
Nov
(161) |
Dec
(85) |
| 2010 |
Jan
(10) |
Feb
(35) |
Mar
(44) |
Apr
(115) |
May
(98) |
Jun
(87) |
Jul
(23) |
Aug
(27) |
Sep
(63) |
Oct
(57) |
Nov
(97) |
Dec
(62) |
| 2011 |
Jan
(67) |
Feb
(83) |
Mar
(43) |
Apr
(14) |
May
(43) |
Jun
(52) |
Jul
(55) |
Aug
(97) |
Sep
(65) |
Oct
(36) |
Nov
(67) |
Dec
(46) |
| 2012 |
Jan
(29) |
Feb
(24) |
Mar
(10) |
Apr
(2) |
May
(10) |
Jun
(34) |
Jul
(31) |
Aug
(9) |
Sep
(10) |
Oct
(10) |
Nov
(6) |
Dec
(7) |
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
(5) |
Apr
(2) |
May
(17) |
Jun
(10) |
Jul
(8) |
Aug
(17) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(1) |
| 2014 |
Jan
(2) |
Feb
(8) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(5) |
Dec
(8) |
| 2015 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
|
May
(2) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
|
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2019 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(4) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2021 |
Jan
|
Feb
(7) |
Mar
(29) |
Apr
(8) |
May
(7) |
Jun
(45) |
Jul
(66) |
Aug
|
Sep
|
Oct
(2) |
Nov
(37) |
Dec
(34) |
| 2022 |
Jan
(15) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(1) |
Dec
(7) |
| 2023 |
Jan
(23) |
Feb
(18) |
Mar
(18) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
(11) |
Feb
(3) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
(16) |
Oct
(6) |
Nov
(7) |
Dec
(6) |
| 2025 |
Jan
(8) |
Feb
(3) |
Mar
(7) |
Apr
(5) |
May
(21) |
Jun
(10) |
Jul
(16) |
Aug
(5) |
Sep
(19) |
Oct
(19) |
Nov
|
Dec
|
|
From: <yu...@us...> - 2013-12-04 02:19:35
|
Revision: 2300
http://sourceforge.net/p/swingme/code/2300
Author: yuranet
Date: 2013-12-04 02:19:31 +0000 (Wed, 04 Dec 2013)
Log Message:
-----------
even simpler methods
Modified Paths:
--------------
UtilME/src/net/yura/mobile/io/JSONUtil.java
Modified: UtilME/src/net/yura/mobile/io/JSONUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/JSONUtil.java 2013-11-29 23:15:46 UTC (rev 2299)
+++ UtilME/src/net/yura/mobile/io/JSONUtil.java 2013-12-04 02:19:31 UTC (rev 2300)
@@ -67,10 +67,10 @@
serializer.value( ((Float)object).doubleValue() );
}
else if (object instanceof Byte) {
- serializer.value( ((Byte)object).longValue() );
+ serializer.value( (long) ((Byte) object).byteValue() );
}
else if (object instanceof Short) {
- serializer.value( ((Short)object).longValue() );
+ serializer.value( (long) ((Short) object).shortValue() );
}
else if (object instanceof Vector) {
saveVector(serializer, (Vector)object);
@@ -163,19 +163,19 @@
return SystemUtil.asList((Object[])value);
}
else if (XMLUtil.TAG_INTEGER.equals(name)) {
- return new Integer(((Long)value).intValue());
+ return new Integer((int) ((Long) value).longValue());
}
else if (XMLUtil.TAG_FLOAT.equals(name)) {
return new Float(((Double)value).floatValue());
}
else if (XMLUtil.TAG_SHORT.equals(name)) {
- return new Short(((Long)value).shortValue());
+ return new Short((short) ((Long) value).longValue());
}
else if (XMLUtil.TAG_CHARACTER.equals(name)) {
return new Character( ((String)value).charAt(0) );
}
else if (XMLUtil.TAG_BYTE.equals(name)) {
- return new Byte(((Long)value).byteValue());
+ return new Byte((byte) ((Long)value).longValue());
}
// No reason to double encode as these are supported by json.
//else if (XMLUtil.TAG_DOUBLE.equals(name)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-11-29 23:15:50
|
Revision: 2299
http://sourceforge.net/p/swingme/code/2299
Author: yuranet
Date: 2013-11-29 23:15:46 +0000 (Fri, 29 Nov 2013)
Log Message:
-----------
less calls
Modified Paths:
--------------
UtilME/src/net/yura/mobile/io/JSONUtil.java
Modified: UtilME/src/net/yura/mobile/io/JSONUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/JSONUtil.java 2013-11-27 05:42:35 UTC (rev 2298)
+++ UtilME/src/net/yura/mobile/io/JSONUtil.java 2013-11-29 23:15:46 UTC (rev 2299)
@@ -148,52 +148,47 @@
}
protected Object readObject(String name, Hashtable map) {
-
+ Object value = map.get("value");
if (XMLUtil.TAG_HASHTABLE.equals(name)) {
// we can only end up here if we failed to encode the map because of non-string keys.
- Object[] array = (Object[])map.get("value");
+ Object[] array = (Object[])value;
Hashtable object = new Hashtable();
for (int c = 0; c < array.length; c++) {
- Object key = array[c];
- c++;
- Object value = array[c];
- object.put(key, value);
+ Object key = array[c++];
+ object.put(key, array[c]);
}
return object;
}
else if (XMLUtil.TAG_VECTOR.equals(name)) {
- return SystemUtil.asList((Object[])map.get("value"));
+ return SystemUtil.asList((Object[])value);
}
+ else if (XMLUtil.TAG_INTEGER.equals(name)) {
+ return new Integer(((Long)value).intValue());
+ }
+ else if (XMLUtil.TAG_FLOAT.equals(name)) {
+ return new Float(((Double)value).floatValue());
+ }
+ else if (XMLUtil.TAG_SHORT.equals(name)) {
+ return new Short(((Long)value).shortValue());
+ }
+ else if (XMLUtil.TAG_CHARACTER.equals(name)) {
+ return new Character( ((String)value).charAt(0) );
+ }
+ else if (XMLUtil.TAG_BYTE.equals(name)) {
+ return new Byte(((Long)value).byteValue());
+ }
+ // No reason to double encode as these are supported by json.
+ //else if (XMLUtil.TAG_DOUBLE.equals(name)) {
+ // return Double.valueOf( value );
+ //}
+ //else if (XMLUtil.TAG_LONG.equals(name)) {
+ // return new Long( Long.parseLong( value ) );
+ //}
else {
- Object value = map.get("value");
- if (XMLUtil.TAG_INTEGER.equals(name)) {
- return new Integer(((Long)value).intValue());
- }
- else if (XMLUtil.TAG_FLOAT.equals(name)) {
- return new Float(((Double)value).floatValue());
- }
- else if (XMLUtil.TAG_SHORT.equals(name)) {
- return new Short(((Long)value).shortValue());
- }
- else if (XMLUtil.TAG_CHARACTER.equals(name)) {
- return new Character( ((String)value).charAt(0) );
- }
- else if (XMLUtil.TAG_BYTE.equals(name)) {
- return new Byte(((Long)value).byteValue());
- }
- // No reason to double encode as these are supported by json.
- //else if (XMLUtil.TAG_DOUBLE.equals(name)) {
- // return Double.valueOf( value );
- //}
- //else if (XMLUtil.TAG_LONG.equals(name)) {
- // return new Long( Long.parseLong( value ) );
- //}
- else {
- // Failed to find a class, so will return Map.
- System.err.println("dont know how to decode "+name+" "+map);
- map.put("class", name);
- return map;
- }
+ // Failed to find a class, so will return Map.
+ System.err.println("dont know how to decode "+name+" "+map);
+ map.put("class", name);
+ return map;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-11-27 05:42:38
|
Revision: 2298
http://sourceforge.net/p/swingme/code/2298
Author: yuranet
Date: 2013-11-27 05:42:35 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
slightly better xml and json
Modified Paths:
--------------
UtilME/src/net/yura/mobile/io/JSONUtil.java
UtilME/src/net/yura/mobile/io/XMLUtil.java
UtilME/src/net/yura/mobile/io/json/JSONWriter.java
Modified: UtilME/src/net/yura/mobile/io/JSONUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/JSONUtil.java 2013-11-27 05:38:00 UTC (rev 2297)
+++ UtilME/src/net/yura/mobile/io/JSONUtil.java 2013-11-27 05:42:35 UTC (rev 2298)
@@ -10,6 +10,7 @@
import net.yura.mobile.io.json.JSONTokener;
import net.yura.mobile.io.json.JSONWriter;
import net.yura.mobile.logging.Logger;
+import net.yura.mobile.util.SystemUtil;
/**
* @author Yura Mamyrin
@@ -39,9 +40,6 @@
else if (object instanceof Boolean) {
serializer.value( ((Boolean)object).booleanValue() );
}
- else if (object instanceof Vector) {
- saveVector(serializer, (Vector)object);
- }
else if (object instanceof Hashtable) {
saveHashtable(serializer, (Hashtable)object);
}
@@ -74,6 +72,9 @@
else if (object instanceof Short) {
serializer.value( ((Short)object).longValue() );
}
+ else if (object instanceof Vector) {
+ saveVector(serializer, (Vector)object);
+ }
else {
throw new IOException("unknown object "+object);
}
@@ -108,7 +109,7 @@
Object objClass = map.get("class");
if (objClass instanceof String) {
map.remove("class");
- result = readObject(map, (String) objClass);
+ result = readObject((String) objClass, map);
}
else {
result = map;
@@ -121,6 +122,7 @@
result = array;
break;
case '(':
+ // TODO not currently supported as does not recognise close ')'
result = readVector(x);
break;
default:
@@ -145,7 +147,7 @@
return result;
}
- protected Object readObject(Hashtable map, String name) throws IOException {
+ protected Object readObject(String name, Hashtable map) {
if (XMLUtil.TAG_HASHTABLE.equals(name)) {
// we can only end up here if we failed to encode the map because of non-string keys.
@@ -159,6 +161,9 @@
}
return object;
}
+ else if (XMLUtil.TAG_VECTOR.equals(name)) {
+ return SystemUtil.asList((Object[])map.get("value"));
+ }
else {
Object value = map.get("value");
if (XMLUtil.TAG_INTEGER.equals(name)) {
@@ -285,7 +290,9 @@
for (boolean end=false;!end;end = x.endObject()) {
String key = x.nextKey();
Object obj = readObject(x);
- hashtable.put(key, obj);
+ if (obj != null) {
+ hashtable.put(key, obj);
+ }
}
return hashtable;
}
Modified: UtilME/src/net/yura/mobile/io/XMLUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/XMLUtil.java 2013-11-27 05:38:00 UTC (rev 2297)
+++ UtilME/src/net/yura/mobile/io/XMLUtil.java 2013-11-27 05:42:35 UTC (rev 2298)
@@ -109,35 +109,21 @@
}
protected void saveObject(XmlSerializer serializer,Object object) throws IOException {
-
+ String tagName = getObjectType(object);
+ serializer.startTag(null,tagName);
if (object instanceof Hashtable) {
-
- serializer.startTag(null,TAG_HASHTABLE);
saveHashtable(serializer, (Hashtable)object);
- serializer.endTag(null,TAG_HASHTABLE);
}
else if (object instanceof Vector) {
-
- serializer.startTag(null,TAG_VECTOR);
saveVector(serializer, (Vector)object);
- serializer.endTag(null,TAG_VECTOR);
}
else if (object instanceof Object[]) {
-
- serializer.startTag(null,TAG_ARRAY);
saveArray(serializer, (Object[])object);
- serializer.endTag(null,TAG_ARRAY);
}
else {
-
- String tagName = getObjectType(object);
-
- serializer.startTag(null,tagName);
serializer.attribute(null,"value", String.valueOf(object) );
- serializer.endTag(null,tagName);
-
}
-
+ serializer.endTag(null,tagName);
}
protected static String getObjectType(Object object) throws IOException {
@@ -174,6 +160,15 @@
else if (object instanceof Long) {
tagName = TAG_LONG;
}
+ else if (object instanceof Hashtable) {
+ tagName = TAG_HASHTABLE;
+ }
+ else if (object instanceof Vector) {
+ tagName = TAG_VECTOR;
+ }
+ else if (object instanceof Object[]) {
+ tagName = TAG_ARRAY;
+ }
else {
// TODO somehow encode it or do something else??
throw new IOException( "unknown class: "+object.getClass()+" for object: "+object );
Modified: UtilME/src/net/yura/mobile/io/json/JSONWriter.java
===================================================================
--- UtilME/src/net/yura/mobile/io/json/JSONWriter.java 2013-11-27 05:38:00 UTC (rev 2297)
+++ UtilME/src/net/yura/mobile/io/json/JSONWriter.java 2013-11-27 05:42:35 UTC (rev 2298)
@@ -286,15 +286,14 @@
*/
public JSONWriter value(double d) throws IOException {
testValidity(d);
- return this.append(trimNumber( String.valueOf(d) ));
+ return this.append(Double.toString(d));
}
static void testValidity(double d) throws IOException {
- Double o = new Double(d);
//if (o != null) {
// if (o instanceof Double) {
- if (o.isInfinite() || o.isNaN()) {
+ if (Double.isInfinite(d) || Double.isNaN(d)) {
throw new IOException(
"JSON does not allow non-finite numbers");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-11-27 05:38:04
|
Revision: 2297
http://sourceforge.net/p/swingme/code/2297
Author: yuranet
Date: 2013-11-27 05:38:00 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
playing around with jason
Modified Paths:
--------------
ToolsME/lib/UtilME.jar
ToolsME/nbproject/project.properties
ToolsME/src/net/yura/tools/mobilegen/MobileJsonGen.java
ToolsME/test/net/yura/mobile/gen/JSONAccess.java
ToolsME/test/net/yura/tools/mobilegen/test/Test1.java
Modified: ToolsME/lib/UtilME.jar
===================================================================
(Binary files differ)
Modified: ToolsME/nbproject/project.properties
===================================================================
--- ToolsME/nbproject/project.properties 2013-11-24 03:32:03 UTC (rev 2296)
+++ ToolsME/nbproject/project.properties 2013-11-27 05:38:00 UTC (rev 2297)
@@ -1,3 +1,7 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
application.title=ToolsME
application.vendor=Lenin
build.classes.dir=${build.dir}/classes
@@ -25,6 +29,7 @@
file.reference.ant.jar=lib/ant.jar
file.reference.asm-3.2.jar=lib\\asm-3.2.jar
file.reference.asm-commons-3.2.jar=lib\\asm-commons-3.2.jar
+file.reference.bcprov-jdk15on-147.jar=lib/bcprov-jdk15on-147.jar
file.reference.Grasshopper.jar=lib/Grasshopper.jar
file.reference.midletrunner.jar=lib/midletrunner.jar
file.reference.proto.jar=lib/proto.jar
@@ -42,10 +47,13 @@
${file.reference.SwingME.jar}:\
${file.reference.asm-3.2.jar}:\
${file.reference.asm-commons-3.2.jar}:\
- ${file.reference.Grasshopper.jar}
+ ${file.reference.Grasshopper.jar}:\
+ ${file.reference.bcprov-jdk15on-147.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
+javac.processorpath=\
+ ${javac.classpath}
javac.source=1.5
javac.target=1.5
javac.test.classpath=\
@@ -68,6 +76,7 @@
main.class=net.yura.tools.translation.XULTranslationTool
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
Modified: ToolsME/src/net/yura/tools/mobilegen/MobileJsonGen.java
===================================================================
--- ToolsME/src/net/yura/tools/mobilegen/MobileJsonGen.java 2013-11-24 03:32:03 UTC (rev 2296)
+++ ToolsME/src/net/yura/tools/mobilegen/MobileJsonGen.java 2013-11-27 05:38:00 UTC (rev 2297)
@@ -67,7 +67,7 @@
ps.println("import java.io.IOException;");
ps.println("import net.yura.mobile.io.JSONUtil;");
ps.println("import net.yura.mobile.io.json.JSONWriter;");
-ps.println("import net.yura.mobile.io.json.JSONTokener;");
+ps.println("import net.yura.mobile.util.SystemUtil;");
ps.println("/**");
ps.println(" * THIS FILE IS GENERATED, DO NOT EDIT");
@@ -92,11 +92,10 @@
ps.println(" "+ ((n==0)?"":"else ") +"if (object instanceof "+className+") {");
ps.println(" serializer.object();");
-ps.println(" serializer.key(TYPE_"+className.toUpperCase()+");");
-ps.println(" serializer.object();");
+ps.println(" serializer.key(\"class\");");
+ps.println(" serializer.value(TYPE_"+className.toUpperCase()+");");
ps.println(" save"+className+"(serializer,("+className+")object);");
ps.println(" serializer.endObject();");
-ps.println(" serializer.endObject();");
ps.println(" }");
n++;
@@ -113,22 +112,20 @@
printSaveMethod(ps,c);
}
-ps.println(" protected Object readObject(JSONTokener tokener, String name) throws IOException {");
+ps.println(" protected Object readObject(String name, Hashtable map) {");
n=0;
for (Class c:classes) {
String className = c.getSimpleName();
-ps.println(" "+ ((n==0)?"":"else ") +"if (\""+className+"\".equals(name)) {");
-ps.println(" return read"+className+"(tokener);");
+ps.println(" if (\""+className+"\".equals(name)) {");
+ps.println(" return read"+className+"(map, new "+className+"());");
ps.println(" }");
n++;
}
-ps.println(" else {");
-ps.println(" return super.readObject(tokener,name);");
-ps.println(" }");
+ps.println(" return super.readObject(name, map);");
ps.println(" }");
@@ -162,22 +159,13 @@
for (Method m: simpleMethods) {
-ps.println(" serializer.key(\""+MobileXmlGen.paramName(m)+"\");");
+String name = MobileXmlGen.paramName(m);
+ps.println(" serializer.key(\""+name+"\");");
+
Class param = m.getReturnType();
-if (param == String.class) {
-ps.println(" {");
-ps.println(" String string = object."+m.getName()+"();");
-ps.println(" if (string!=null) {");
-ps.println(" serializer.value( string );");
-ps.println(" }");
-ps.println(" else {");
-ps.println(" serializer.nullValue();");
-ps.println(" }");
-ps.println(" }");
-}
-else if (param == int.class) {
+if (param == int.class) {
ps.println(" serializer.value( object."+m.getName()+"() );");
}
else if (param == double.class) {
@@ -201,76 +189,70 @@
else if (param == byte.class) {
ps.println(" serializer.value( object."+m.getName()+"() );");
}
+else if (param == String.class) {
+ps.println(" String "+name+"Value = object."+m.getName()+"();");
+ps.println(" if ("+name+"Value!=null) {");
+ps.println(" serializer.value("+name+"Value);");
+ps.println(" }");
+ps.println(" else {");
+ps.println(" serializer.nullValue();");
+ps.println(" }");
+}
else if (param == Vector.class) {
-ps.println(" {");
-ps.println(" Vector vector = object."+m.getName()+"();");
-ps.println(" if (vector!=null) {");
-ps.println(" saveVector(serializer, vector );");
-ps.println(" }");
-ps.println(" else {");
-ps.println(" serializer.nullValue();");
-ps.println(" }");
+ps.println(" Vector "+name+"Value = object."+m.getName()+"();");
+ps.println(" if ("+name+"Value!=null) {");
+ps.println(" saveVector(serializer, "+name+"Value);");
ps.println(" }");
+ps.println(" else {");
+ps.println(" serializer.nullValue();");
+ps.println(" }");
}
else if (param == Hashtable.class) {
-ps.println(" {");
-ps.println(" Hashtable hashtable = object."+m.getName()+"();");
-ps.println(" if (hashtable!=null) {");
-ps.println(" saveHashtable( serializer, hashtable );");
-ps.println(" }");
-ps.println(" else {");
-ps.println(" serializer.nullValue();");
-ps.println(" }");
+ps.println(" Hashtable "+name+"Value = object."+m.getName()+"();");
+ps.println(" if ("+name+"Value!=null) {");
+ps.println(" saveHashtable(serializer, "+name+"Value);");
ps.println(" }");
+ps.println(" else {");
+ps.println(" serializer.nullValue();");
+ps.println(" }");
}
else if (param == byte[].class) {
-ps.println(" {");
-ps.println(" byte[] bytes = object."+m.getName()+"();");
-ps.println(" if (bytes!=null) {");
-ps.println(" serializer.value( new String(org.bouncycastle.util.encoders.Base64.encode(bytes)) );");
-ps.println(" }");
-ps.println(" else {");
-ps.println(" serializer.nullValue();");
-ps.println(" }");
+ps.println(" byte[] "+name+"Value = object."+m.getName()+"();");
+ps.println(" if ("+name+"Value!=null) {");
+ps.println(" serializer.value( new String(org.bouncycastle.util.encoders.Base64.encode("+name+"Value)) );");
ps.println(" }");
+ps.println(" else {");
+ps.println(" serializer.nullValue();");
+ps.println(" }");
}
else if (param.isArray()) {
-ps.println(" {");
-ps.println(" Object[] array = object."+m.getName()+"();");
-ps.println(" if (array!=null) {");
-ps.println(" saveArray( serializer, array );");
-ps.println(" }");
-ps.println(" else {");
-ps.println(" serializer.nullValue();");
-ps.println(" }");
+ps.println(" Object[] "+name+"Value = object."+m.getName()+"();");
+ps.println(" if ("+name+"Value!=null) {");
+ps.println(" saveArray(serializer, "+name+"Value);");
ps.println(" }");
+ps.println(" else {");
+ps.println(" serializer.nullValue();");
+ps.println(" }");
}
else if (param == Object.class) {
-ps.println(" {");
-ps.println(" Object obj = object."+m.getName()+"();");
-ps.println(" if (obj!=null) {");
-//ps.println(" serializer.object();");
-ps.println(" saveObject(serializer, obj );");
-//ps.println(" serializer.endObject();");
-ps.println(" }");
-ps.println(" else {");
-ps.println(" serializer.nullValue();");
-ps.println(" }");
+ps.println(" Object "+name+"Value = object."+m.getName()+"();");
+ps.println(" if ("+name+"Value!=null) {");
+ps.println(" saveObject(serializer, "+name+"Value );");
ps.println(" }");
+ps.println(" else {");
+ps.println(" serializer.nullValue();");
+ps.println(" }");
}
else {
-ps.println(" {");
-ps.println(" "+param.getSimpleName()+" obj = object."+m.getName()+"();");
-ps.println(" if (obj!=null) {");
-ps.println(" serializer.object();");
-ps.println(" save"+param.getSimpleName()+"( serializer, obj );");
-ps.println(" serializer.endObject();");
-ps.println(" }");
-ps.println(" else {");
-ps.println(" serializer.nullValue();");
-ps.println(" }");
+ps.println(" "+param.getSimpleName()+" "+name+"Value = object."+m.getName()+"();");
+ps.println(" if ("+name+"Value!=null) {");
+ps.println(" serializer.object();");
+ps.println(" save"+param.getSimpleName()+"(serializer, "+name+"Value);");
+ps.println(" serializer.endObject();");
ps.println(" }");
-ps.println(" ");
+ps.println(" else {");
+ps.println(" serializer.nullValue();");
+ps.println(" }");
}
}
@@ -283,94 +265,93 @@
String className = theclass.getSimpleName();
-ps.println(" protected "+className+" read"+className+"(JSONTokener tokener) throws IOException {");
+ps.println(" protected "+className+" read"+className+"(Hashtable map, "+className+" object) {");
-ps.println(" "+className+" object = new "+className+"();");
-ps.println(" tokener.startObject();");
+Class superClass = theclass.getSuperclass();
+ArrayList<Method> methods;
+if (classes.contains(superClass)) {
+ if (superClass != Object.class) {
+ ps.println(" read"+superClass.getSimpleName()+"(map, object);");
+ }
+ methods = getMethods(theclass,true,false);
+}
+else {
+ methods = getMethods(theclass,true,true);
+}
-ps.println(" for (boolean end=false;!end;end = tokener.endObject()) {");
-ps.println(" String key = tokener.nextKey();");
-ArrayList<Method> methods = getMethods(theclass,true,true);
+
int n = 0;
for (Method m: methods) {
Class param = m.getParameterTypes()[0];
-ps.println(" "+(n==0?"":"else ")+"if (\""+MobileXmlGen.paramName(m)+"\".equals(key)) {");
+String name = MobileXmlGen.paramName(m);
if (param == String.class) {
-ps.println(" if (!tokener.nextNull()) {");
-ps.println(" object."+m.getName()+"( tokener.nextString() );");
-ps.println(" }");
+ps.println(" object."+m.getName()+"( (String) map.get(\""+name+"\") );");
}
else if (param == int.class) {
-ps.println(" object."+m.getName()+"( Integer.parseInt(tokener.nextSimple()) );");
+ps.println(" object."+m.getName()+"( ((Long) map.get(\""+name+"\")).intValue() );");
}
else if (param == double.class) {
-ps.println(" object."+m.getName()+"( Double.parseDouble(tokener.nextSimple()) );");
+ps.println(" object."+m.getName()+"( ((Double) map.get(\""+name+"\")).doubleValue() );");
}
else if (param == float.class) {
-ps.println(" object."+m.getName()+"( Float.parseFloat(tokener.nextSimple()) );");
+ps.println(" object."+m.getName()+"( ((Double) map.get(\""+name+"\")).floatValue() );");
}
-else if (param == boolean.class) {
-ps.println(" object."+m.getName()+"( \"true\".equals(tokener.nextSimple()) );");
-}
else if (param == short.class) {
-ps.println(" object."+m.getName()+"( Short.parseShort(tokener.nextSimple()) );");
+ps.println(" object."+m.getName()+"( ((Long) map.get(\""+name+"\")).shortValue() );");
}
else if (param == long.class) {
-ps.println(" object."+m.getName()+"( Long.parseLong(tokener.nextSimple()) );");
+ps.println(" object."+m.getName()+"( ((Long) map.get(\""+name+"\")).longValue() );");
}
else if (param == char.class) {
-ps.println(" object."+m.getName()+"( tokener.nextSimple().charAt(0) );");
+ps.println(" object."+m.getName()+"( ((Character) map.get(\""+name+"\")).charValue() );");
}
else if (param == byte.class) {
-ps.println(" object."+m.getName()+"( Byte.parseByte(tokener.nextSimple()) );");
+ps.println(" object."+m.getName()+"( ((Long) map.get(\""+name+"\")).byteValue() );");
}
-else if (param == Vector.class) {
-ps.println(" if (!tokener.nextNull()) {");
-ps.println(" object."+m.getName()+"( readVector(tokener) );");
-ps.println(" }");
+else if (param == boolean.class) {
+ps.println(" object."+m.getName()+"( ((Boolean) map.get(\""+name+"\")).booleanValue() );");
}
else if (param == Hashtable.class) {
-ps.println(" if (!tokener.nextNull()) {");
-ps.println(" object."+m.getName()+"( readHashtable(tokener) );");
-ps.println(" }");
+ps.println(" object."+m.getName()+"( (Hashtable) map.get(\""+name+"\") );");
}
else if (param == byte[].class) {
-ps.println(" if (!tokener.nextNull()) {");
-ps.println(" object."+m.getName()+"( org.bouncycastle.util.encoders.Base64.decode( tokener.nextString() ) );");
-ps.println(" }");
+ps.println(" String "+name+"Value = (String) map.get(\""+name+"\");");
+ps.println(" if ("+name+"Value != null) {");
+ps.println(" object."+m.getName()+"( org.bouncycastle.util.encoders.Base64.decode( (String) map.get(\""+name+"\") ) );");
+ps.println(" }");
}
else if (param.isArray()) {
-ps.println(" if (!tokener.nextNull()) {");
-ps.println(" Vector objects = readVector(tokener);");
-ps.println(" "+param.getComponentType().getSimpleName()+"[] array=null;");
-ps.println(" array = new "+param.getComponentType().getSimpleName()+"[objects.size()];");
-ps.println(" objects.copyInto(array);");
-ps.println(" object."+m.getName()+"(array);");
-ps.println(" }");
+ if (param.getComponentType() == Object.class){
+ps.println(" object."+m.getName()+"((Object[]) map.get(\""+name+"\"));");
+ }
+ else {
+ps.println(" Object[] "+name+"Value = (Object[]) map.get(\""+name+"\");");
+ps.println(" if ("+name+"Value != null) {");
+ps.println(" "+param.getComponentType().getSimpleName()+"[] "+name+"Array = new "+param.getComponentType().getSimpleName()+"["+name+"Value.length];");
+ps.println(" System.arraycopy("+name+"Value, 0, "+name+"Array, 0, "+name+"Value.length);");
+ps.println(" object."+m.getName()+"("+name+"Array);");
+ps.println(" }");
+ }
}
+else if (param == Vector.class) {
+ps.println(" Object[] "+name+"Value = (Object[]) map.get(\""+name+"\");");
+ps.println(" if ("+name+"Value != null) {");
+ps.println(" object."+m.getName()+"(SystemUtil.asList("+name+"Value));");
+ps.println(" }");
+}
else if (param == Object.class) {
-ps.println(" if (!tokener.nextNull()) {");
-ps.println(" object."+m.getName()+"( readObject(tokener) );");
-ps.println(" }");
+ps.println(" object."+m.getName()+"( map.get(\""+name+"\") );");
}
else {
-ps.println(" if (!tokener.nextNull()) {");
-ps.println(" object."+m.getName()+"( read"+param.getSimpleName()+"(tokener) );");
-ps.println(" }");
+ps.println(" object."+m.getName()+"( ("+param.getSimpleName()+") map.get(\""+name+"\") );");
}
-ps.println(" }");
n++;
}
-ps.println(" else {");
-ps.println(" throw new IOException(\"unknown field: \"+key); // TODO skip unknown fields");
-ps.println(" }");
-ps.println(" }");
-
ps.println(" return object;");
ps.println(" }");
Modified: ToolsME/test/net/yura/mobile/gen/JSONAccess.java
===================================================================
--- ToolsME/test/net/yura/mobile/gen/JSONAccess.java 2013-11-24 03:32:03 UTC (rev 2296)
+++ ToolsME/test/net/yura/mobile/gen/JSONAccess.java 2013-11-27 05:38:00 UTC (rev 2297)
@@ -6,7 +6,7 @@
import java.io.IOException;
import net.yura.mobile.io.JSONUtil;
import net.yura.mobile.io.json.JSONWriter;
-import net.yura.mobile.io.json.JSONTokener;
+import net.yura.mobile.util.SystemUtil;
/**
* THIS FILE IS GENERATED, DO NOT EDIT
*/
@@ -18,19 +18,17 @@
protected void saveObject(JSONWriter serializer, Object object) throws IOException {
if (object instanceof TestObject) {
serializer.object();
- serializer.key(TYPE_TESTOBJECT);
- serializer.object();
+ serializer.key("class");
+ serializer.value(TYPE_TESTOBJECT);
saveTestObject(serializer,(TestObject)object);
serializer.endObject();
- serializer.endObject();
}
else if (object instanceof Test) {
serializer.object();
- serializer.key(TYPE_TEST);
- serializer.object();
+ serializer.key("class");
+ serializer.value(TYPE_TEST);
saveTest(serializer,(Test)object);
serializer.endObject();
- serializer.endObject();
}
else {
super.saveObject(serializer, object);
@@ -41,211 +39,129 @@
serializer.key("age");
serializer.value( object.getAge() );
serializer.key("body");
- {
- Object obj = object.getBody();
- if (obj!=null) {
- saveObject(serializer, obj );
- }
- else {
- serializer.nullValue();
- }
+ Object bodyValue = object.getBody();
+ if (bodyValue!=null) {
+ saveObject(serializer, bodyValue );
}
+ else {
+ serializer.nullValue();
+ }
serializer.key("image");
- {
- byte[] bytes = object.getImage();
- if (bytes!=null) {
- serializer.value( new String(org.bouncycastle.util.encoders.Base64.encode(bytes)) );
- }
- else {
- serializer.nullValue();
- }
+ byte[] imageValue = object.getImage();
+ if (imageValue!=null) {
+ serializer.value( new String(org.bouncycastle.util.encoders.Base64.encode(imageValue)) );
}
+ else {
+ serializer.nullValue();
+ }
serializer.key("legs");
- {
- Object[] array = object.getLegs();
- if (array!=null) {
- saveArray( serializer, array );
- }
- else {
- serializer.nullValue();
- }
+ Object[] legsValue = object.getLegs();
+ if (legsValue!=null) {
+ saveArray(serializer, legsValue);
}
+ else {
+ serializer.nullValue();
+ }
serializer.key("loginById");
- {
- Hashtable hashtable = object.getLoginById();
- if (hashtable!=null) {
- saveHashtable( serializer, hashtable );
- }
- else {
- serializer.nullValue();
- }
+ Hashtable loginByIdValue = object.getLoginById();
+ if (loginByIdValue!=null) {
+ saveHashtable(serializer, loginByIdValue);
}
+ else {
+ serializer.nullValue();
+ }
serializer.key("myType");
- {
- String string = object.getMyType();
- if (string!=null) {
- serializer.value( string );
- }
- else {
- serializer.nullValue();
- }
+ String myTypeValue = object.getMyType();
+ if (myTypeValue!=null) {
+ serializer.value(myTypeValue);
}
+ else {
+ serializer.nullValue();
+ }
serializer.key("name");
- {
- String string = object.getName();
- if (string!=null) {
- serializer.value( string );
- }
- else {
- serializer.nullValue();
- }
+ String nameValue = object.getName();
+ if (nameValue!=null) {
+ serializer.value(nameValue);
}
+ else {
+ serializer.nullValue();
+ }
serializer.key("numbers");
- {
- Vector vector = object.getNumbers();
- if (vector!=null) {
- saveVector(serializer, vector );
- }
- else {
- serializer.nullValue();
- }
+ Vector numbersValue = object.getNumbers();
+ if (numbersValue!=null) {
+ saveVector(serializer, numbersValue);
}
+ else {
+ serializer.nullValue();
+ }
serializer.key("objectById");
- {
- Object obj = object.getObjectById();
- if (obj!=null) {
- saveObject(serializer, obj );
- }
- else {
- serializer.nullValue();
- }
+ Object objectByIdValue = object.getObjectById();
+ if (objectByIdValue!=null) {
+ saveObject(serializer, objectByIdValue );
}
+ else {
+ serializer.nullValue();
+ }
serializer.key("objects");
- {
- Object[] array = object.getObjects();
- if (array!=null) {
- saveArray( serializer, array );
- }
- else {
- serializer.nullValue();
- }
+ Object[] objectsValue = object.getObjects();
+ if (objectsValue!=null) {
+ saveArray(serializer, objectsValue);
}
+ else {
+ serializer.nullValue();
+ }
serializer.key("testById");
- {
- Test obj = object.getTestById();
- if (obj!=null) {
- serializer.object();
- saveTest( serializer, obj );
- serializer.endObject();
- }
- else {
- serializer.nullValue();
- }
+ Test testByIdValue = object.getTestById();
+ if (testByIdValue!=null) {
+ serializer.object();
+ saveTest(serializer, testByIdValue);
+ serializer.endObject();
}
-
+ else {
+ serializer.nullValue();
+ }
}
protected void saveTest(JSONWriter serializer,Test object) throws IOException {
serializer.key("id");
serializer.value( object.getId() );
}
- protected Object readObject(JSONTokener tokener, String name) throws IOException {
+ protected Object readObject(String name, Hashtable map) {
if ("TestObject".equals(name)) {
- return readTestObject(tokener);
+ return readTestObject(map, new TestObject());
}
- else if ("Test".equals(name)) {
- return readTest(tokener);
+ if ("Test".equals(name)) {
+ return readTest(map, new Test());
}
- else {
- return super.readObject(tokener,name);
- }
+ return super.readObject(name, map);
}
- protected TestObject readTestObject(JSONTokener tokener) throws IOException {
- TestObject object = new TestObject();
- tokener.startObject();
- for (boolean end=false;!end;end = tokener.endObject()) {
- String key = tokener.nextKey();
- if ("age".equals(key)) {
- object.setAge( Byte.parseByte(tokener.nextSimple()) );
- }
- else if ("body".equals(key)) {
- if (!tokener.nextNull()) {
- object.setBody( readObject(tokener) );
- }
- }
- else if ("id".equals(key)) {
- object.setId( Integer.parseInt(tokener.nextSimple()) );
- }
- else if ("image".equals(key)) {
- if (!tokener.nextNull()) {
- object.setImage( org.bouncycastle.util.encoders.Base64.decode( tokener.nextString() ) );
- }
- }
- else if ("legs".equals(key)) {
- if (!tokener.nextNull()) {
- Vector objects = readVector(tokener);
- String[] array=null;
- array = new String[objects.size()];
- objects.copyInto(array);
- object.setLegs(array);
- }
- }
- else if ("loginById".equals(key)) {
- if (!tokener.nextNull()) {
- object.setLoginById( readHashtable(tokener) );
- }
- }
- else if ("myType".equals(key)) {
- if (!tokener.nextNull()) {
- object.setMyType( tokener.nextString() );
- }
- }
- else if ("name".equals(key)) {
- if (!tokener.nextNull()) {
- object.setName( tokener.nextString() );
- }
- }
- else if ("numbers".equals(key)) {
- if (!tokener.nextNull()) {
- object.setNumbers( readVector(tokener) );
- }
- }
- else if ("objectById".equals(key)) {
- if (!tokener.nextNull()) {
- object.setObjectById( readObject(tokener) );
- }
- }
- else if ("objects".equals(key)) {
- if (!tokener.nextNull()) {
- Vector objects = readVector(tokener);
- Object[] array=null;
- array = new Object[objects.size()];
- objects.copyInto(array);
- object.setObjects(array);
- }
- }
- else if ("testById".equals(key)) {
- if (!tokener.nextNull()) {
- object.setTestById( readTest(tokener) );
- }
- }
- else {
- throw new IOException("unknown field: "+key); // TODO skip unknown fields
- }
+ protected TestObject readTestObject(Hashtable map, TestObject object) {
+ readTest(map, object);
+ object.setAge( ((Long) map.get("age")).byteValue() );
+ object.setBody( map.get("body") );
+ String imageValue = (String) map.get("image");
+ if (imageValue != null) {
+ object.setImage( org.bouncycastle.util.encoders.Base64.decode( (String) map.get("image") ) );
}
+ Object[] legsValue = (Object[]) map.get("legs");
+ if (legsValue != null) {
+ String[] legsArray = new String[legsValue.length];
+ System.arraycopy(legsValue, 0, legsArray, 0, legsValue.length);
+ object.setLegs(legsArray);
+ }
+ object.setLoginById( (Hashtable) map.get("loginById") );
+ object.setMyType( (String) map.get("myType") );
+ object.setName( (String) map.get("name") );
+ Object[] numbersValue = (Object[]) map.get("numbers");
+ if (numbersValue != null) {
+ object.setNumbers(SystemUtil.asList(numbersValue));
+ }
+ object.setObjectById( map.get("objectById") );
+ object.setObjects((Object[]) map.get("objects"));
+ object.setTestById( (Test) map.get("testById") );
return object;
}
- protected Test readTest(JSONTokener tokener) throws IOException {
- Test object = new Test();
- tokener.startObject();
- for (boolean end=false;!end;end = tokener.endObject()) {
- String key = tokener.nextKey();
- if ("id".equals(key)) {
- object.setId( Integer.parseInt(tokener.nextSimple()) );
- }
- else {
- throw new IOException("unknown field: "+key); // TODO skip unknown fields
- }
- }
+ protected Test readTest(Hashtable map, Test object) {
+ object.setId( ((Long) map.get("id")).intValue() );
return object;
}
}
Modified: ToolsME/test/net/yura/tools/mobilegen/test/Test1.java
===================================================================
--- ToolsME/test/net/yura/tools/mobilegen/test/Test1.java 2013-11-24 03:32:03 UTC (rev 2296)
+++ ToolsME/test/net/yura/tools/mobilegen/test/Test1.java 2013-11-27 05:38:00 UTC (rev 2297)
@@ -51,7 +51,7 @@
// os = new BufferedOutputStream( new PipedOutputStream( pipe ) );
}
catch(Exception ex) {
- throw new RuntimeException();
+ throw new RuntimeException(ex);
}
}
@@ -305,7 +305,15 @@
for (Object obj:objects) {
System.out.println("DOING TEST "+util+" "+obj);
- o1 = util.read();
+ try {
+ o1 = util.read();
+ }
+ catch (Exception ex) {
+ System.err.print("FAILED TO READ OBJ = ");
+ kxml.save(System.err, obj);
+ System.err.println();
+ throw ex;
+ }
boolean equals = obj.equals(o1);
if (equals) {
System.out.println("equals="+equals+" "+o1);
@@ -314,10 +322,10 @@
}
if (!equals) {
System.err.println("ERROR IN "+util);
- System.err.print("OBJ1 = ");
+ System.err.print("OBJ1 sent = ");
kxml.save(System.err, obj);
System.err.println();
- System.err.print("OBJ2 = ");
+ System.err.print("OBJ2 got = ");
kxml.save(System.err, o1);
System.err.println();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-11-24 03:32:05
|
Revision: 2296
http://sourceforge.net/p/swingme/code/2296
Author: yuranet
Date: 2013-11-24 03:32:03 +0000 (Sun, 24 Nov 2013)
Log Message:
-----------
more classic json
Modified Paths:
--------------
UtilME/src/net/yura/mobile/io/JSONUtil.java
Modified: UtilME/src/net/yura/mobile/io/JSONUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/JSONUtil.java 2013-10-30 22:04:20 UTC (rev 2295)
+++ UtilME/src/net/yura/mobile/io/JSONUtil.java 2013-11-24 03:32:03 UTC (rev 2296)
@@ -17,21 +17,14 @@
public class JSONUtil {
public void save(OutputStream out, Object obj) throws IOException {
-
OutputStreamWriter w = new OutputStreamWriter(out);
-
JSONWriter writer = new JSONWriter(w);
-
saveObject(writer,obj);
-
w.flush();
-
}
public Object load(InputStream in) throws IOException {
-
JSONTokener tokener = new JSONTokener(new UTF8InputStreamReader(in));
-
return readObject(tokener);
}
@@ -50,44 +43,39 @@
saveVector(serializer, (Vector)object);
}
else if (object instanceof Hashtable) {
- serializer.object();
- serializer.key(XMLUtil.TAG_HASHTABLE);
saveHashtable(serializer, (Hashtable)object);
- serializer.endObject();
}
else if (object instanceof Object[]) {
- serializer.object();
- serializer.key(XMLUtil.TAG_ARRAY);
saveArray(serializer, (Object[])object);
- serializer.endObject();
}
+ else if (object instanceof Double) {
+ serializer.value( ((Double)object).doubleValue() );
+ }
+ else if (object instanceof Long) {
+ serializer.value( ((Long)object).longValue() );
+ }
+ else if (object instanceof Character) {
+ serializer.value( ((Character)object).charValue() );
+ }
else {
serializer.object();
- serializer.key( XMLUtil.getObjectType(object) );
-
- if (object instanceof Character) {
- serializer.value( ((Character)object).charValue() );
- }
- else if (object instanceof Integer) {
+ serializer.key("class");
+ serializer.value( XMLUtil.getObjectType(object) );
+ serializer.key("value");
+ if (object instanceof Integer) {
serializer.value( ((Integer)object).longValue() );
}
- else if (object instanceof Double) {
- serializer.value( ((Double)object).doubleValue() );
- }
else if (object instanceof Float) {
serializer.value( ((Float)object).doubleValue() );
}
else if (object instanceof Byte) {
- serializer.value( ((Byte)object).byteValue() );
+ serializer.value( ((Byte)object).longValue() );
}
else if (object instanceof Short) {
- serializer.value( ((Short)object).shortValue() );
+ serializer.value( ((Short)object).longValue() );
}
- else if (object instanceof Long) {
- serializer.value( ((Long)object).longValue() );
- }
else {
- throw new IOException();
+ throw new IOException("unknown object "+object);
}
serializer.endObject();
}
@@ -104,18 +92,34 @@
switch (c) {
case '"':
- case '\'':
result = x.nextString();
break;
- case '{':
- x.startObject();
- String key = x.nextKey();
- result = readObject(x, key);
- if (!x.endObject()) {
- throw new IOException("anon object does not end after 1 value");
+ case '\'':
+ String string = x.nextString();
+ if (string.length() == 1) {
+ result = new Character(string.charAt(0));
}
+ else {
+ result = string;
+ }
break;
+ case '{':
+ Hashtable map = readHashtable(x);
+ Object objClass = map.get("class");
+ if (objClass instanceof String) {
+ map.remove("class");
+ result = readObject(map, (String) objClass);
+ }
+ else {
+ result = map;
+ }
+ break;
case '[':
+ Vector vector = readVector(x);
+ Object[] array = new Object[vector.size()];
+ vector.copyInto(array);
+ result = array;
+ break;
case '(':
result = readVector(x);
break;
@@ -130,61 +134,62 @@
else if (s.equalsIgnoreCase("null")) {
result = null;
}
+ else if (s.indexOf('.') >= 0) {
+ result = Double.valueOf(s);
+ }
else {
- throw new IOException("numbers not wraped in a object not aupported "+s);
+ result = new Long( Long.parseLong(s) );
}
+ break;
}
-
return result;
-
}
- protected Object readObject(JSONTokener tokener, String name) throws IOException {
+ protected Object readObject(Hashtable map, String name) throws IOException {
- if (XMLUtil.TAG_ARRAY.equals(name)) {
- Vector vector = readVector(tokener);
- Object[] array = new Object[vector.size()];
- vector.copyInto(array);
- return array;
+ if (XMLUtil.TAG_HASHTABLE.equals(name)) {
+ // we can only end up here if we failed to encode the map because of non-string keys.
+ Object[] array = (Object[])map.get("value");
+ Hashtable object = new Hashtable();
+ for (int c = 0; c < array.length; c++) {
+ Object key = array[c];
+ c++;
+ Object value = array[c];
+ object.put(key, value);
+ }
+ return object;
}
- else if (XMLUtil.TAG_HASHTABLE.equals(name)) {
- return readHashtable(tokener);
- }
else {
-
- String value = tokener.nextSimple();
-
+ Object value = map.get("value");
if (XMLUtil.TAG_INTEGER.equals(name)) {
- return Integer.valueOf( value );
+ return new Integer(((Long)value).intValue());
}
- else if (XMLUtil.TAG_DOUBLE.equals(name)) {
- return Double.valueOf( value );
- }
else if (XMLUtil.TAG_FLOAT.equals(name)) {
- return Float.valueOf( value );
+ return new Float(((Double)value).floatValue());
}
else if (XMLUtil.TAG_SHORT.equals(name)) {
- return new Short( Short.parseShort( value ) );
+ return new Short(((Long)value).shortValue());
}
- else if (XMLUtil.TAG_LONG.equals(name)) {
- return new Long( Long.parseLong( value ) );
- }
else if (XMLUtil.TAG_CHARACTER.equals(name)) {
- return new Character( value.charAt(0) );
+ return new Character( ((String)value).charAt(0) );
}
else if (XMLUtil.TAG_BYTE.equals(name)) {
- return new Byte( Byte.parseByte( value ) );
+ return new Byte(((Long)value).byteValue());
}
+ // No reason to double encode as these are supported by json.
+ //else if (XMLUtil.TAG_DOUBLE.equals(name)) {
+ // return Double.valueOf( value );
+ //}
+ //else if (XMLUtil.TAG_LONG.equals(name)) {
+ // return new Long( Long.parseLong( value ) );
+ //}
else {
- // TODO load class or something???
- //#debug warn
- Logger.warn("unknown object: " + name);
- //return value;
- throw new IOException();
+ // Failed to find a class, so will return Map.
+ System.err.println("dont know how to decode "+name+" "+map);
+ map.put("class", name);
+ return map;
}
-
}
-
}
protected void saveHashtable(JSONWriter serializer, Hashtable hashtable) throws IOException {
@@ -200,10 +205,12 @@
}
}
- if (keyObject) { // TODO ???
-
+ if (keyObject) {
+ serializer.object();
+ serializer.key("class");
+ serializer.value(XMLUtil.TAG_HASHTABLE);
+ serializer.key("value");
serializer.array();
-
enu = hashtable.keys();
while (enu.hasMoreElements()) {
Object key = enu.nextElement();
@@ -211,12 +218,11 @@
saveObject(serializer, key);
saveObject(serializer, obj);
}
-
serializer.endArray();
+ serializer.endObject();
}
else {
serializer.object();
-
enu = hashtable.keys();
while (enu.hasMoreElements()) {
String key = (String)enu.nextElement();
@@ -225,10 +231,8 @@
saveObject(serializer, obj);
}
-
serializer.endObject();
}
-
}
protected void saveVector(JSONWriter serializer,Vector object) throws IOException {
@@ -267,49 +271,22 @@
if (x.endArray()) {
return vector;
}
-
}
-
}
protected Hashtable readHashtable(JSONTokener x) throws IOException {
Hashtable hashtable = new Hashtable();
- if (x.nextClean() == '[') {
- // we will use array of key,value
- Object key = null;
- for (;;) {
-
- if (key==null) {
- key = readObject(x);
- }
- else {
- hashtable.put(key, readObject(x));
- key = null;
- }
-
- if (x.endArray()) {
- return hashtable;
- }
- }
+ x.startObject();
+ // CHECK FOR EMPTY HASHTABLE
+ if (x.nextClean() == '}') {
+ return hashtable;
}
- else {
- x.back(); // as we read the first char to check for type we need to go back
- x.startObject();
-
- // CHECK FOR EMPTY HASHTABLE
- if (x.nextClean() == '}') {
- return hashtable;
- }
- x.back();
-
- for (boolean end=false;!end;end = x.endObject()) {
- String key = x.nextKey();
- Object obj = readObject(x);
- hashtable.put(key, obj);
- }
-
+ x.back(); // as we read the first char to check for empty we need to go back
+ for (boolean end=false;!end;end = x.endObject()) {
+ String key = x.nextKey();
+ Object obj = readObject(x);
+ hashtable.put(key, obj);
}
return hashtable;
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-10-30 22:04:22
|
Revision: 2295
http://sourceforge.net/p/swingme/code/2295
Author: yuranet
Date: 2013-10-30 22:04:20 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
added hook for post start app
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2013-10-29 23:13:15 UTC (rev 2294)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2013-10-30 22:04:20 UTC (rev 2295)
@@ -64,7 +64,7 @@
new Thread() {
public void run() {
// waitForDefaultView(); TODO:!!!!
- AndroidMeApp.startMIDlet();
+ startMIDlet();
}
}.start();
}
@@ -90,6 +90,30 @@
// System.setOut(log);
}
+ public void startMIDlet() {
+ // Needs to run on the UI thread, otherwise some of the API's will not start
+ AndroidMeApp.getIntance().invokeLater(new Runnable() {
+ public void run() {
+ try {
+ MIDlet midlet = AndroidMeApp.getMIDlet();
+ Display display = Display.getDisplay(midlet);
+ if (display.hiddenDisplay!=null) {
+ display.setCurrent(display.hiddenDisplay);
+ }
+ midlet.doStartApp();
+ onMidletStarted();
+ }
+ catch (Exception ex) {
+ throw new RuntimeException("unable to start MIDlet: ", ex);
+ }
+ }
+ });
+ }
+
+ public void onMidletStarted() {
+ // hook for doing something after the midlet has been started
+ }
+
private boolean foreground;
@Override
protected void onResume() {
@@ -225,7 +249,7 @@
waitForDefaultView();
AndroidMeApp.createMIDlet(midletClassName);
- AndroidMeApp.startMIDlet();
+ startMIDlet();
} catch (Throwable ex) {
Logger.warn(ex);
}
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2013-10-29 23:13:15 UTC (rev 2294)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2013-10-30 22:04:20 UTC (rev 2295)
@@ -67,29 +67,6 @@
instance.invokeAndWait(new Thread());
}
- // TODO: Async
- public static void startMIDlet() {
- // Needs to run on the UI thread, otherwise some of the API's will not start
- instance.handler.post(new Runnable() {
- public void run() {
- try {
-
- Display display = Display.getDisplay(instance.midlet);
-
- if (display.hiddenDisplay!=null) {
- display.setCurrent(display.hiddenDisplay);
- }
-
- instance.midlet.doStartApp();
-
-
- } catch (Exception ex) {
- throw new RuntimeException("unable to start MIDlet: ", ex);
- }
- }
- });
- }
-
public static Vector<String[]> getJadMidlets() {
return instance.jadMidlets;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-10-29 23:13:18
|
Revision: 2294
http://sourceforge.net/p/swingme/code/2294
Author: yuranet
Date: 2013-10-29 23:13:15 +0000 (Tue, 29 Oct 2013)
Log Message:
-----------
behave like swing when component is disabled and enabled
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Component.java
SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java 2013-10-02 20:52:27 UTC (rev 2293)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java 2013-10-29 23:13:15 UTC (rev 2294)
@@ -218,11 +218,15 @@
* @see java.awt.Component#setFocusable(boolean) Component.setFocusable
*/
public void setFocusable(boolean selectable) {
+ boolean old = focusable;
this.focusable = selectable;
Window w = getWindow();
if (w!=null) {
w.setupFocusedComponent();
}
+ if (old != focusable) {
+ repaint();
+ }
}
/**
Modified: SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java 2013-10-02 20:52:27 UTC (rev 2293)
+++ SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java 2013-10-29 23:13:15 UTC (rev 2294)
@@ -355,6 +355,7 @@
setUIDefault("CheckBox.property[icon]",checkboxIcon);
//setUIDefault("CheckBox[focused].property[icon]",checkboxFocusedIcon);
setUIDefault("CheckBox[selected].property[icon]",checkboxSelectedIcon);
+ setUIDefault("CheckBox[disabled].foreground",uiSettings.get("nimbusDisabledText"));
setUIDefault("CheckBoxRenderer.property[icon]",checkboxIcon);
//setUIDefault("CheckBoxRenderer[focused].property[icon]",checkboxFocusedIcon);
@@ -379,6 +380,7 @@
setUIDefault("RadioButton[focused].border",new LineBorder(decodeColor("nimbusBorder"),Style.NO_COLOR,1,false,Graphics.DOTTED));
setUIDefault("RadioButton.property[icon]",radioIcon);
setUIDefault("RadioButton[selected].property[icon]",radioIcon);
+ setUIDefault("RadioButton[disabled].foreground",uiSettings.get("nimbusDisabledText"));
// SPINNER
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-10-02 20:52:32
|
Revision: 2293
http://sourceforge.net/p/swingme/code/2293
Author: yuranet
Date: 2013-10-02 20:52:27 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
back button fix for BB
Modified Paths:
--------------
AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2013-08-31 22:30:28 UTC (rev 2292)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2013-10-02 20:52:27 UTC (rev 2293)
@@ -33,6 +33,7 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
+import android.os.Build;
import android.util.DisplayMetrics;
import android.view.ViewConfiguration;
import net.yura.android.AlertOptionPane;
@@ -682,10 +683,11 @@
}
}
-
+
static void sortoutMenu() {
try {
DesktopPane dp = DesktopPane.getDesktopPane();
+ dp.HIDDEN_BACK = !"BlackBerry".equals(Build.BRAND);
dp.HIDDEN_MENU = ViewConfiguration.get( AndroidMeActivity.DEFAULT_ACTIVITY ).hasPermanentMenuKey();
dp.GRID_MENU = dp.HIDDEN_MENU;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-31 22:30:33
|
Revision: 2292
http://sourceforge.net/p/swingme/code/2292
Author: yuranet
Date: 2013-08-31 22:30:28 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
got rid of hard coded path
Modified Paths:
--------------
AndroidME/.classpath
Modified: AndroidME/.classpath
===================================================================
--- AndroidME/.classpath 2013-08-31 16:47:05 UTC (rev 2291)
+++ AndroidME/.classpath 2013-08-31 22:30:28 UTC (rev 2292)
@@ -13,6 +13,7 @@
<classpathentry excluding="**/.svn/**" kind="src" path="src_JSR135_Multimedia"/>
<classpathentry excluding="**/.svn/**" kind="src" path="src_JSR179_Location"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry exported="true" kind="lib" path="I:/6_Yura/linuxhome/UtilME/lib/xmlpull_1_1_3_1.jar"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-31 16:47:07
|
Revision: 2291
http://sourceforge.net/p/swingme/code/2291
Author: yuranet
Date: 2013-08-31 16:47:05 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
android build works again
Modified Paths:
--------------
AndroidME/build.xml
Modified: AndroidME/build.xml
===================================================================
--- AndroidME/build.xml 2013-08-31 16:33:32 UTC (rev 2290)
+++ AndroidME/build.xml 2013-08-31 16:47:05 UTC (rev 2291)
@@ -99,78 +99,82 @@
<!-- Compiles this project's .java files into .class files. -->
- <target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile">
+ <target name="-compile" depends="-pre-build, -build-setup, -code-gen, -pre-compile">
<do-only-if-manifest-hasCode elseText="hasCode = false. Skipping...">
- <!-- If android rules are used for a test project, its classpath should include
- tested project's location -->
- <condition property="extensible.classpath"
- value="${tested.project.absolute.dir}/bin/classes"
- else=".">
- <isset property="tested.project.absolute.dir" />
- </condition>
- <condition property="extensible.libs.classpath"
- value="${tested.project.absolute.dir}/${jar.libs.dir}"
- else="${jar.libs.dir}">
- <isset property="tested.project.absolute.dir" />
- </condition>
+ <!-- merge the project's own classpath and the tested project's classpath -->
+ <path id="project.javac.classpath">
+ <path refid="project.all.jars.path" />
+ <path refid="tested.project.classpath" />
+ <path path="${java.compiler.classpath}" />
+ </path>
<javac encoding="${java.encoding}"
source="${java.source}" target="${java.target}"
debug="true" extdirs="" includeantruntime="false"
destdir="${out.classes.absolute.dir}"
bootclasspathref="project.target.class.path"
verbose="${verbose}"
- classpath="${extensible.classpath}"
- classpathref="project.all.jars.path"
+ classpathref="project.javac.classpath"
fork="${need.javac.fork}">
<src path="${source.absolute.dir}" />
<src path="${gen.absolute.dir}" />
- <classpath>
- <fileset dir="${extensible.libs.classpath}" includes="*.jar" />
- </classpath>
<compilerarg line="${java.compilerargs}" />
</javac>
+
+ <!-- if the project is instrumented, intrument the classes -->
+ <if condition="${build.is.instrumented}">
+ <then>
+ <echo level="info">Instrumenting classes from ${out.absolute.dir}/classes...</echo>
+
+ <!-- build the filter to remove R, Manifest, BuildConfig -->
+ <getemmafilter
+ appPackage="${project.app.package}"
+ libraryPackagesRefId="project.library.packages"
+ filterOut="emma.default.filter"/>
+
+ <!-- define where the .em file is going. This may have been
+ setup already if this is a library -->
+ <property name="emma.coverage.absolute.file" location="${out.absolute.dir}/coverage.em" />
+
+ <!-- It only instruments class files, not any external libs -->
+ <emma enabled="true">
+ <instr verbosity="${verbosity}"
+ mode="overwrite"
+ instrpath="${out.absolute.dir}/classes"
+ outdir="${out.absolute.dir}/classes"
+ metadatafile="${emma.coverage.absolute.file}">
+ <filter excludes="${emma.default.filter}" />
+ <filter value="${emma.filter}" />
+ </instr>
+ </emma>
+ </then>
+ </if>
+
<!-- if the project is a library then we generate a jar file -->
<if condition="${project.is.library}">
<then>
- <echo>Creating library output jar file...</echo>
+ <echo level="info">Creating library output jar file...</echo>
<property name="out.library.jar.file" location="${out.absolute.dir}/classes.jar" />
<if>
<condition>
<length string="${android.package.excludes}" trim="true" when="greater" length="0" />
</condition>
<then>
- <echo>Custom jar packaging exclusion: ${android.package.excludes}</echo>
+ <echo level="info">Custom jar packaging exclusion: ${android.package.excludes}</echo>
</then>
</if>
- <propertybyreplace name="manifest.package.path" input="${manifest.package}" replace="." with="/" />
+ <propertybyreplace name="project.app.package.path" input="${project.app.package}" replace="." with="/" />
<jar destfile="${out.library.jar.file}">
<fileset dir="${out.classes.absolute.dir}"
includes="**/*.class"
- excludes="${manifest.package.path}/R.class ${manifest.package.path}/R$*.class ${manifest.package.path}/Manifest.class ${manifest.package.path}/Manifest$*.class ${manifest.package.path}/BuildConfig.class"/>
+ excludes="${project.app.package.path}/R.class ${project.app.package.path}/R$*.class ${project.app.package.path}/BuildConfig.class"/>
<!-- YURA YURA YURA <fileset dir="${source.absolute.dir}" excludes="**/*.java ${android.package.excludes}" /> -->
<!-- YURA from: http://stackoverflow.com/questions/14605899#14786100 -->
</jar>
</then>
</if>
- <!-- if the project is instrumented, intrument the classes -->
- <if condition="${build.is.instrumented}">
- <then>
- <echo>Instrumenting classes from ${out.absolute.dir}/classes...</echo>
- <!-- It only instruments class files, not any external libs -->
- <emma enabled="true">
- <instr verbosity="${verbosity}"
- mode="overwrite"
- instrpath="${out.absolute.dir}/classes"
- outdir="${out.absolute.dir}/classes">
- <filter excludes="${manifest.package}.R,${manifest.package}.R$$*,${manifest.package}.BuildConfig" />
- <filter value="${emma.filter}" />
- </instr>
- </emma>
- </then>
- </if>
</do-only-if-manifest-hasCode>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-31 16:33:35
|
Revision: 2290
http://sourceforge.net/p/swingme/code/2290
Author: yuranet
Date: 2013-08-31 16:33:32 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
test update
Modified Paths:
--------------
SwingMETest/src/net/yura/mobile/test/ComponentTest.java
Modified: SwingMETest/src/net/yura/mobile/test/ComponentTest.java
===================================================================
--- SwingMETest/src/net/yura/mobile/test/ComponentTest.java 2013-08-31 14:36:59 UTC (rev 2289)
+++ SwingMETest/src/net/yura/mobile/test/ComponentTest.java 2013-08-31 16:33:32 UTC (rev 2290)
@@ -5,7 +5,11 @@
package net.yura.mobile.test;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Random;
import java.util.Vector;
import javax.microedition.lcdui.Graphics;
import javax.microedition.lcdui.Image;
@@ -14,10 +18,12 @@
import net.yura.mobile.gui.ActionListener;
import net.yura.mobile.gui.ButtonGroup;
import net.yura.mobile.gui.ChangeListener;
+import net.yura.mobile.gui.Graphics2D;
import net.yura.mobile.gui.Icon;
import net.yura.mobile.gui.KeyEvent;
import net.yura.mobile.gui.border.BevelBorder;
import net.yura.mobile.gui.border.LineBorder;
+import net.yura.mobile.gui.border.MatteBorder;
import net.yura.mobile.gui.border.TitledBorder;
import net.yura.mobile.gui.celleditor.DefaultCellEditor;
import net.yura.mobile.gui.cellrenderer.DefaultListCellRenderer;
@@ -50,6 +56,7 @@
import net.yura.mobile.gui.layout.FlowLayout;
import net.yura.mobile.gui.layout.XULLoader;
import net.yura.mobile.io.FileUtil;
+import net.yura.mobile.io.HTTPClient;
import net.yura.mobile.test.MainPane.Section;
import net.yura.mobile.util.ImageUtil;
import net.yura.mobile.util.Option;
@@ -76,6 +83,7 @@
addTest("Table Test","tableTest");
addTest("Scroll Test 1","scrollTest1");
addTest("Scroll Test 2","scrollTest2");
+ addTest("Scroll Test 3","scrollTest3");
addTest("File Chooser","fileChooser");
addTest("Multi File Chooser","fileChooser2");
addTest("Test Camera","testCamera");
@@ -142,6 +150,12 @@
final TextField textField = new TextField(TextField.ANY);
+ textField.addActionListener( new ActionListener() {
+ public void actionPerformed(String actionCommand) {
+ OptionPane.showMessageDialog(null, "yay", "message", OptionPane.INFORMATION_MESSAGE);
+ }
+ });
+
components.addElement(textField);
Slider slider = new Slider(0, 7, 4);
@@ -248,10 +262,18 @@
// menu has NO action listoner, so it fires NO action and ONLY opens the menu!
menu.add(new Button("bob"));
- Menu menu2 = new Menu("Sub");
- //menu2.addActionListener(this);
- menu2.add(new Button("fred"));
- menu2.add(new Button("item 2"));
+ final Menu menu2 = new Menu("Sub");
+
+ menu2.addActionListener( new ActionListener() {
+ // Override
+ public void actionPerformed(String actionCommand) {
+ System.out.println("adding items to submenu");
+ menu2.removeAll();
+ menu2.add(new Button("fred"));
+ menu2.add(new Button("item 2"));
+ }
+ });
+
menu.add(menu2);
menu.add(new Button("bob test 1"));
@@ -354,6 +376,32 @@
addToScrollPane(scrollTest,null);
}
+ else if ("scrollTest3".equals(actionCommand)) {
+
+ Panel p = new Panel(new FlowLayout( Graphics.VCENTER ));
+
+ for (int c=0;c<10;c++) {
+ Panel p2 = new Panel(new FlowLayout( Graphics.VCENTER ));
+ for (int a=0;a<5;a++) {
+ p2.add(new Button("button "+c+" "+a));
+ }
+ List l = new List();
+ for (int a=0;a<5;a++) {
+ l.addElement("item "+c+" "+a);
+ }
+ p2.add(l);
+ ScrollPane scroll = new ScrollPane(p2);
+ if (c==3) {
+ scroll.setMode(ScrollPane.MODE_SCROLLARROWS);
+ scroll.setBackground(0xFFFFAAAA);
+ p2.setBackground(0xFFAAFFAA);
+ }
+ scroll.setPreferredSize(-1, 100);
+ p.add(scroll);
+ }
+
+ addToScrollPane(p,null);
+ }
else if ("tabTest".equals(actionCommand)) {
if (tabPanel==null) {
@@ -415,30 +463,59 @@
tab2.add( level2 );
Panel tab3 = new Panel( new FlowLayout(Graphics.VCENTER) );
- List l3 = new List( new DefaultListCellRenderer() );
+ List l1 = new List( new DefaultListCellRenderer() ) {
+ public void paintComponent(Graphics2D g) {
+ System.out.println("paint "+getFirstVisibleIndex()+" "+getLastVisibleIndex());
+
+ // a error in paint!!?!?!?1!
+ //if (new Random().nextInt(3)==2) {
+ // throw new StringIndexOutOfBoundsException();
+ //}
+
+ super.paintComponent(g);
+ }
+ };
+ //l1.setBorder( new MatteBorder(5, 5, 5, 5, 0xFFFF0000) );
+ l1.setBorder( new MatteBorder(100, 100, 100, 100, 0xFFFF0000) );
+
tab3.setBackground(0xFF0000FF);
Vector anotherlist = new Vector();
for (int c=0;c<20;c++) {
- anotherlist.addElement("A REALLY LONG LIST ITEM, that will need things like side scrolling "+c);
+ anotherlist.addElement(c+" A REALLY LONG LIST ITEM, that will need things like side scrolling "+c);
}
- l3.setListData(anotherlist);
- l3.setFixedCellHeight(15);
+ l1.setListData(anotherlist);
+ //l1.setFixedCellHeight(15);
+ l1.setPreferredSize(-1, 550);
tab3.add(new Label("a lable for the list"));
tab3.add(new Button("button") );
- tab3.add(l3);
+ tab3.add(l1);
tab3.add(new Button("b 2"));
Panel tab4 = new Panel( new BorderLayout() );
tab4.add(new Label("Tab 4 title"),Graphics.TOP);
- List l2 = new List(anotherlist,new DefaultListCellRenderer(),List.VERTICAL);
- l2.addChangeListener(new ChangeListener() {
+ List l2 = new List(anotherlist,new DefaultListCellRenderer(),List.VERTICAL) {
+ public void paintComponent(Graphics2D g) {
+ System.out.println("paint "+getFirstVisibleIndex()+" "+getLastVisibleIndex());
+ super.paintComponent(g);
+ }
+ };
+ l2.addListSelectionListener(new ChangeListener() {
public void changeEvent(Component arg0, int arg1) {
System.out.println("change "+arg1);
}
});
+
+ ActionListener listaction = new ActionListener() {
+ public void actionPerformed(String string) {
+ System.out.println("crazy funk "+string);
+ }
+ };
+ l1.addActionListener(listaction);
+ l2.addActionListener(listaction);
+
tab4.add(new ScrollPane(l2));
tabbedPane.add(tab1);
@@ -451,7 +528,7 @@
}
Menu mainMenu = new Menu("Menu");
- for (int c=0;c<10;c++) {
+ for (int c=0;c<20;c++) {
mainMenu.add( new Button("Hello") );
}
@@ -540,10 +617,17 @@
else if ("optionPaneTest1".equals(actionCommand)) {
//OptionPane.showMessageDialog(null, "Hello There", "Greeting", OptionPane.PLAIN_MESSAGE);
-
+
Button[] b = new Button[] { new Button("Sure!")};
- OptionPane.showOptionDialog(null, "message", "title", 0, OptionPane.INFORMATION_MESSAGE, null,b , null);
+ OptionPane.showOptionDialog(null, "message1", "title", 0, OptionPane.INFORMATION_MESSAGE, null,b , null);
+
+ Button[] b2 = new Button[] { new Button("No!")};
+ OptionPane.showOptionDialog(null, "message2", "title", 0, OptionPane.INFORMATION_MESSAGE, null,b2 , null);
+
+ Button[] b3 = new Button[] { new Button("Yes!")};
+ OptionPane.showOptionDialog(null, "message3", "title", 0, OptionPane.INFORMATION_MESSAGE, null,b3 , null);
+
}
else if ("optionPaneTest".equals(actionCommand)) {
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-31 14:37:01
|
Revision: 2289
http://sourceforge.net/p/swingme/code/2289
Author: yuranet
Date: 2013-08-31 14:36:59 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
build fix
Modified Paths:
--------------
SwingMETest/project.properties
Modified: SwingMETest/project.properties
===================================================================
--- SwingMETest/project.properties 2013-08-31 14:08:27 UTC (rev 2288)
+++ SwingMETest/project.properties 2013-08-31 14:36:59 UTC (rev 2289)
@@ -8,5 +8,5 @@
# project structure.
# Project target.
-target=Google Inc.:Google APIs:13
+target=Google Inc.:Google APIs:14
android.library.reference.1=../AndroidME
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-31 14:08:30
|
Revision: 2288
http://sourceforge.net/p/swingme/code/2288
Author: yuranet
Date: 2013-08-31 14:08:27 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
update to new android build
Modified Paths:
--------------
SwingMETest/build.xml
Added Paths:
-----------
SwingMETest/ant.properties
Added: SwingMETest/ant.properties
===================================================================
--- SwingMETest/ant.properties (rev 0)
+++ SwingMETest/ant.properties 2013-08-31 14:08:27 UTC (rev 2288)
@@ -0,0 +1,19 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+# 'source.dir' for the location of your java source folder and
+# 'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+# 'key.store' for the location of your keystore and
+# 'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+source.dir=src:../AndroidME/src_Test
+
Modified: SwingMETest/build.xml
===================================================================
--- SwingMETest/build.xml 2013-08-31 13:42:50 UTC (rev 2287)
+++ SwingMETest/build.xml 2013-08-31 14:08:27 UTC (rev 2288)
@@ -15,7 +15,7 @@
<mkdir dir="build"/>
<mkdir dir="dist"/>
- <javac debug="on" srcdir="src" destdir="build" source="1.4" target="1.4" classpath="lib/midletrunner.jar:lib/opt.jar:lib/SwingME.jar"/>
+ <javac debug="on" srcdir="src" destdir="build" source="1.4" target="1.4" classpath="lib/midletrunner.jar:lib/opt.jar:lib/SwingME.jar" excludes="net/yura/mobile/junit/**"/>
<copy todir="build">
<fileset dir="resources" includes="**/*.*"/>
</copy>
@@ -102,16 +102,13 @@
<target name="android">
- <loadproperties srcFile="local.properties" />
+ <property file="local.properties" />
<property file="ant.properties" />
+ <property environment="env" />
+ <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+ <isset property="env.ANDROID_HOME" />
+ </condition>
<loadproperties srcFile="project.properties" />
-
- <path id="src">
- <pathelement location="src"/>
- <pathelement location="../AndroidME/src_Test"/>
- </path>
- <pathconvert property="source.absolute.dir" refid="src"/>
-
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
unless="sdk.dir"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-31 13:42:57
|
Revision: 2287
http://sourceforge.net/p/swingme/code/2287
Author: yuranet
Date: 2013-08-31 13:42:50 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
themes build fix
Modified Paths:
--------------
AndroidME/build.xml
AndroidME/project.properties
Added Paths:
-----------
AndroidME/ant.properties
Removed Paths:
-------------
AndroidME/build.properties
Copied: AndroidME/ant.properties (from rev 2283, AndroidME/build.properties)
===================================================================
--- AndroidME/ant.properties (rev 0)
+++ AndroidME/ant.properties 2013-08-31 13:42:50 UTC (rev 2287)
@@ -0,0 +1,19 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+# 'source.dir' for the location of your java source folder and
+# 'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+# 'key.store' for the location of your keystore and
+# 'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+source.dir=../UtilME/src:../SwingME/src:src_Android:src_MIDP:src_SwingME_plaf:src_JSR184_3D:src_JSR179_Location:src_JSR82_Bluetooth:src_JSR135_Multimedia:src_JSR120_SMS:src_JSR234_Advanced_Multimedia
+jar.libs.dir=../UtilME/lib
Deleted: AndroidME/build.properties
===================================================================
--- AndroidME/build.properties 2013-08-29 21:43:12 UTC (rev 2286)
+++ AndroidME/build.properties 2013-08-31 13:42:50 UTC (rev 2287)
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-# 'source.dir' for the location of your java source folder and
-# 'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-# 'key.store' for the location of your keystore and
-# 'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
Modified: AndroidME/build.xml
===================================================================
--- AndroidME/build.xml 2013-08-29 21:43:12 UTC (rev 2286)
+++ AndroidME/build.xml 2013-08-31 13:42:50 UTC (rev 2287)
@@ -3,34 +3,11 @@
<target name="jar" depends="debug" description="override default build action of netbeans"/>
- <property name="jar.libs.dir" value="../UtilME/lib" />
- <path id="src">
- <pathelement location="../UtilME/src"/>
- <pathelement location="../SwingME/src"/>
- <pathelement location="src_Android"/>
- <pathelement location="src_MIDP"/>
- <pathelement location="src_SwingME_plaf"/>
- <pathelement location="src_JSR184_3D"/>
- <pathelement location="src_JSR179_Location"/>
- <pathelement location="src_JSR82_Bluetooth"/>
- <pathelement location="src_JSR135_Multimedia"/>
- <pathelement location="src_JSR120_SMS"/>
- <pathelement location="src_JSR234_Advanced_Multimedia"/>
- </path>
- <pathconvert property="source.absolute.dir" refid="src"/>
-
-
- <!--
-
- <property name="source.dir" value="src" />
- <property name="source.absolute.dir" location="../UtilME/src:../SwingME/src:src_Android:src_MIDP:src_SwingME_plaf:src_JSR184_3D:src_JSR179_Location:src_JSR82_Bluetooth:src_JSR135_Multimedia:src_JSR120_SMS:src_JSR234_Advanced_Multimedia"/>
-
-
- The local.properties file is created and updated by the 'android' tool.
+ <!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
- <loadproperties srcFile="local.properties" />
+ <property file="local.properties" />
<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
@@ -54,6 +31,15 @@
-->
<property file="ant.properties" />
+ <!-- if sdk.dir was not set from one of the property file, then
+ get it from the ANDROID_HOME env var.
+ This must be done before we load project.properties since
+ the proguard config can use sdk.dir -->
+ <property environment="env" />
+ <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+ <isset property="env.ANDROID_HOME" />
+ </condition>
+
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
@@ -67,26 +53,24 @@
<!-- quick check on sdk.dir -->
<fail
- message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
unless="sdk.dir"
/>
+ <!--
+ Import per project custom build rules if present at the root of the project.
+ This is the place to put custom intermediary targets such as:
+ -pre-build
+ -pre-compile
+ -post-compile (This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir})
+ -post-package
+ -post-build
+ -pre-clean
+ -->
+ <import file="custom_rules.xml" optional="true" />
-<!-- extension targets. Uncomment the ones where you want to do custom work
- in between standard targets -->
-<!--
- <target name="-pre-build">
- </target>
- <target name="-pre-compile">
- </target>
-
- /* This is typically used for code obfuscation.
- Compiled code location: ${out.classes.absolute.dir}
- If this is not done in place, override ${out.dex.input.absolute.dir} */
- <target name="-post-compile">
- </target>
--->
-
<!-- Import the actual build file.
To customize existing targets, there are two options:
@@ -105,7 +89,7 @@
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project"
-->
- <!-- version-tag: 1 -->
+ <!-- version-tag: custom -->
<import file="${sdk.dir}/tools/ant/build.xml" />
@@ -166,6 +150,7 @@
includes="**/*.class"
excludes="${manifest.package.path}/R.class ${manifest.package.path}/R$*.class ${manifest.package.path}/Manifest.class ${manifest.package.path}/Manifest$*.class ${manifest.package.path}/BuildConfig.class"/>
<!-- YURA YURA YURA <fileset dir="${source.absolute.dir}" excludes="**/*.java ${android.package.excludes}" /> -->
+ <!-- YURA from: http://stackoverflow.com/questions/14605899#14786100 -->
</jar>
</then>
</if>
@@ -188,31 +173,6 @@
</if>
</do-only-if-manifest-hasCode>
</target>
-
-
-
-
- <!--
- ############################################################################
- ############################ some old crap #################################
- ############################################################################
- -->
-
- <!-- Eclipse uses "bin" for its own output, so we do the same.
- <property name="outdir" location="bin" />
- <property name="AndroidFixResourceAsStream.jar" value="../AndroidME/lib/AndroidFixResourceAsStream.jar" />
- <target name="fix-build">
- <echo>Fixing build....</echo>
- <echo message="ClassPath: ${AndroidFixResourceAsStream.jar}"/>
-
- <java classname="net.yura.mobile.asm.AndroidFixer" classpath="${AndroidFixResourceAsStream.jar}">
- <arg value="net.yura.android.AndroidMeActivity"/>
- <arg value="${outdir}"/>
- </java>
-
- </target>
- -->
-
</project>
Modified: AndroidME/project.properties
===================================================================
--- AndroidME/project.properties 2013-08-29 21:43:12 UTC (rev 2286)
+++ AndroidME/project.properties 2013-08-31 13:42:50 UTC (rev 2287)
@@ -8,5 +8,5 @@
# project structure.
# Project target.
-target=Google Inc.:Google APIs:13
+target=Google Inc.:Google APIs:14
android.library=true
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-29 21:43:16
|
Revision: 2286
http://sourceforge.net/p/swingme/code/2286
Author: yuranet
Date: 2013-08-29 21:43:12 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
android build file fix
Modified Paths:
--------------
AndroidME/build.xml
Modified: AndroidME/build.xml
===================================================================
--- AndroidME/build.xml 2013-08-24 16:13:59 UTC (rev 2285)
+++ AndroidME/build.xml 2013-08-29 21:43:12 UTC (rev 2286)
@@ -133,10 +133,10 @@
source="${java.source}" target="${java.target}"
debug="true" extdirs="" includeantruntime="false"
destdir="${out.classes.absolute.dir}"
- bootclasspathref="android.target.classpath"
+ bootclasspathref="project.target.class.path"
verbose="${verbose}"
classpath="${extensible.classpath}"
- classpathref="project.libraries.jars"
+ classpathref="project.all.jars.path"
fork="${need.javac.fork}">
<src path="${source.absolute.dir}" />
<src path="${gen.absolute.dir}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-24 16:14:02
|
Revision: 2285
http://sourceforge.net/p/swingme/code/2285
Author: yuranet
Date: 2013-08-24 16:13:59 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
better error
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java 2013-08-22 21:53:54 UTC (rev 2284)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java 2013-08-24 16:13:59 UTC (rev 2285)
@@ -342,7 +342,7 @@
// may throw NullPointerException, this is ok
if (xSrc + width > src.getWidth() || ySrc + height > src.getHeight() ||
width < 0 || height < 0 || xSrc < 0 || ySrc < 0) {
- throw new IllegalArgumentException("Area out of Image");
+ throw new IllegalArgumentException("Area out of Image: "+src.getWidth()+"x"+src.getHeight()+" area: "+xSrc+","+ySrc+" "+width+"x"+height);
}
if (anchor == 0) {
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2013-08-22 21:53:54 UTC (rev 2284)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2013-08-24 16:13:59 UTC (rev 2285)
@@ -33,7 +33,7 @@
if (x + width > image.getWidth() || y + height > image.getHeight() ||
width <= 0 || height <= 0 || x < 0 || y < 0) {
- throw new IllegalArgumentException("Area out of Image");
+ throw new IllegalArgumentException("Area out of Image: "+image.getWidth()+"x"+image.getHeight()+" area: "+x+","+y+" "+width+"x"+height);
}
// MIDP: the result image width/height depends on the transform
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-22 21:53:57
|
Revision: 2284
http://sourceforge.net/p/swingme/code/2284
Author: yuranet
Date: 2013-08-22 21:53:54 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
build on jdk 1.7 fix
Modified Paths:
--------------
me4se/build.xml
Modified: me4se/build.xml
===================================================================
--- me4se/build.xml 2013-08-20 23:02:05 UTC (rev 2283)
+++ me4se/build.xml 2013-08-22 21:53:54 UTC (rev 2284)
@@ -159,7 +159,9 @@
<!-- this is used in SwingME to scale images -->
<mkdir dir="build" />
- <javac srcdir="opt/m3g_basic/src" source="1.4" classpath="dist/midletrunner.jar" destdir="build" debug="on" target="1.4"/>
+ <javac srcdir="opt/m3g_basic/src" source="1.4" target="1.4" classpath="dist/midletrunner.jar" destdir="build" debug="on">
+ <compilerarg value="-XDignore.symbol.file"/>
+ </javac>
<jar jarfile="dist/m3gbasic.jar">
<fileset dir="build">
<include name="javax/microedition/m3g/**"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-20 23:02:09
|
Revision: 2283
http://sourceforge.net/p/swingme/code/2283
Author: yuranet
Date: 2013-08-20 23:02:05 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
dont scale awt sizes
Modified Paths:
--------------
me4se/src/org/me4se/scm/ScmWrapper.java
Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-20 22:12:37 UTC (rev 2282)
+++ me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-20 23:02:05 UTC (rev 2283)
@@ -409,8 +409,8 @@
public java.awt.Dimension getMinimumSize() {
Dimension d = component.getMinimumSize();
- d.width = (int) (d.width * scale);
- d.height = (int) (d.height * scale);
+ //d.width = (int) (d.width * scale);
+ //d.height = (int) (d.height * scale);
return d;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-20 22:12:40
|
Revision: 2282
http://sourceforge.net/p/swingme/code/2282
Author: yuranet
Date: 2013-08-20 22:12:37 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
clean and deploy update
Modified Paths:
--------------
me4se/build.xml
Modified: me4se/build.xml
===================================================================
--- me4se/build.xml 2013-08-17 19:08:21 UTC (rev 2281)
+++ me4se/build.xml 2013-08-20 22:12:37 UTC (rev 2282)
@@ -186,15 +186,15 @@
<target name="deploy" depends="build-jars" description="copy lib to some other places">
<copy file="dist/midletrunner.jar" todir="../SwingMETest/lib"/>
- <copy file="dist/midletrunner.jar" todir="../cha/lib"/>
<copy file="dist/midletrunner.jar" todir="../AgentClient/lib"/>
<copy file="dist/midletrunner.jar" todir="../ToolsME/lib"/>
- <copy file="dist/midletrunner.jar" todir="I:/6_Yura/Work/java/badoo/repo/BadooMobile/lib"/>
<copy file="dist/midletrunner.jar" todir="../Domination/lib"/>
</target>
- <target name="clean">
+ <target name="clean" description="del all build files">
<delete dir="tmpclasses" />
+ <delete dir="build" />
+ <delete dir="dist" />
</target>
<target name="jar" depends="build-jars">
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-17 19:08:33
|
Revision: 2281
http://sourceforge.net/p/swingme/code/2281
Author: yuranet
Date: 2013-08-17 19:08:21 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
more retina fixes
Modified Paths:
--------------
me4se/src/org/me4se/scm/ScmWrapper.java
Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-17 17:27:05 UTC (rev 2280)
+++ me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-17 19:08:21 UTC (rev 2281)
@@ -53,6 +53,12 @@
int y2 = (int) Math.ceil((y+h) * scale);
// on MacBookPro Retina Java 1.6, images are streached if we call repaint outside bounds.
+ if (x1 < 0) {
+ x1 = 0;
+ }
+ if (y1 < 0) {
+ y1 = 0;
+ }
if (x2 > ScmWrapper.this.getWidth()) {
x2 = ScmWrapper.this.getWidth();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-17 17:27:12
|
Revision: 2280
http://sourceforge.net/p/swingme/code/2280
Author: yuranet
Date: 2013-08-17 17:27:05 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
fix for retina
Modified Paths:
--------------
me4se/src/org/me4se/scm/ScmWrapper.java
Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-15 22:14:22 UTC (rev 2279)
+++ me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-17 17:27:05 UTC (rev 2280)
@@ -52,6 +52,14 @@
int x2 = (int) Math.ceil((x+w) * scale);
int y2 = (int) Math.ceil((y+h) * scale);
+ // on MacBookPro Retina Java 1.6, images are streached if we call repaint outside bounds.
+ if (x2 > ScmWrapper.this.getWidth()) {
+ x2 = ScmWrapper.this.getWidth();
+ }
+ if (y2 > ScmWrapper.this.getHeight()) {
+ y2 = ScmWrapper.this.getHeight();
+ }
+
ScmWrapper.this.repaint(x1, y1, x2-x1, y2-y1);
Log.log(Log.DRAW_EVENTS, "repaint request sent to AWT");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-15 22:14:25
|
Revision: 2279
http://sourceforge.net/p/swingme/code/2279
Author: yuranet
Date: 2013-08-15 22:14:22 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
can not ask to repaint half pixels
Modified Paths:
--------------
me4se/src/org/me4se/scm/ScmWrapper.java
Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-15 21:59:53 UTC (rev 2278)
+++ me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-15 22:14:22 UTC (rev 2279)
@@ -46,8 +46,13 @@
public void repaint(int x, int y, int w, int h) {
Log.log(Log.DRAW_EVENTS, "sending repaint request to AWT: " + x + "," + y
+ "," + w + "," + h);
- ScmWrapper.this.repaint((int) Math.ceil(x * scale), (int) Math.ceil(y * scale),
- (int) Math.ceil(w * scale), (int) Math.ceil(h * scale));
+
+ int x1 = (int) (x * scale);
+ int y1 = (int) (y * scale);
+ int x2 = (int) Math.ceil((x+w) * scale);
+ int y2 = (int) Math.ceil((y+h) * scale);
+
+ ScmWrapper.this.repaint(x1, y1, x2-x1, y2-y1);
Log.log(Log.DRAW_EVENTS, "repaint request sent to AWT");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-15 21:59:56
|
Revision: 2278
http://sourceforge.net/p/swingme/code/2278
Author: yuranet
Date: 2013-08-15 21:59:53 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
can not ask to repaint half pixels
Modified Paths:
--------------
me4se/src/org/me4se/scm/ScmWrapper.java
Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-11 22:27:35 UTC (rev 2277)
+++ me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-15 21:59:53 UTC (rev 2278)
@@ -46,8 +46,8 @@
public void repaint(int x, int y, int w, int h) {
Log.log(Log.DRAW_EVENTS, "sending repaint request to AWT: " + x + "," + y
+ "," + w + "," + h);
- ScmWrapper.this.repaint((int) (x * scale), (int) (y * scale),
- (int) (w * scale), (int) (h * scale));
+ ScmWrapper.this.repaint((int) Math.ceil(x * scale), (int) Math.ceil(y * scale),
+ (int) Math.ceil(w * scale), (int) Math.ceil(h * scale));
Log.log(Log.DRAW_EVENTS, "repaint request sent to AWT");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-11 22:27:37
|
Revision: 2277
http://sourceforge.net/p/swingme/code/2277
Author: yuranet
Date: 2013-08-11 22:27:35 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
correct arrow size on retina mac
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusIcon.java
Modified: SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusIcon.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusIcon.java 2013-08-11 22:26:19 UTC (rev 2276)
+++ SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusIcon.java 2013-08-11 22:27:35 UTC (rev 2277)
@@ -69,36 +69,44 @@
}
}
else if (type == LookAndFeel.ICON_ARROW_UP) {
- int top = (height/2)-3;
+ int halfSize = height/5;
+
+ int top = (height/2)-halfSize;
int middle = (width/2);
g.fillTriangle(x+middle, y+top,
- x+middle-3, y+top+6,
- x+middle+3, y+top+6);
+ x+middle-halfSize, y+top+halfSize*2,
+ x+middle+halfSize, y+top+halfSize*2);
}
else if (type == LookAndFeel.ICON_ARROW_DOWN || type == LookAndFeel.ICON_COMBO) {
- int top = (height/2)-3;
+ int halfSize = height/5;
+
+ int top = (height/2)-halfSize;
int middle = (width/2);
- g.fillTriangle(x+middle, y+top+6,
- x+middle-3, y+top,
- x+middle+3, y+top);
+ g.fillTriangle(x+middle, y+top+halfSize*2,
+ x+middle-halfSize, y+top,
+ x+middle+halfSize, y+top);
}
else if ((type == LookAndFeel.ICON_SPINNER_LEFT) || (type == LookAndFeel.ICON_ARROW_LEFT)) {
- int top = (height/2)-3;
+ int halfSize = height/5;
+
+ int top = (height/2)-halfSize;
int middle = (width/2);
- g.fillTriangle(x+middle+3, y+top,
- x+middle-3, y+top+3,
- x+middle+3, y+top+6);
+ g.fillTriangle(x+middle+halfSize, y+top,
+ x+middle-halfSize, y+top+halfSize,
+ x+middle+halfSize, y+top+halfSize*2);
}
else if ((type == LookAndFeel.ICON_SPINNER_RIGHT) || (type == LookAndFeel.ICON_ARROW_RIGHT)) {
- int top = (height/2)-3;
+ int halfSize = height/5;
+
+ int top = (height/2)-halfSize;
int middle = (width/2);
- g.fillTriangle(x+middle-3, y+top+6,
- x+middle-3, y+top,
- x+middle+3, y+top+3);
+ g.fillTriangle(x+middle-halfSize, y+top+halfSize*2,
+ x+middle-halfSize, y+top,
+ x+middle+halfSize, y+top+halfSize);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-08-11 22:26:28
|
Revision: 2276
http://sourceforge.net/p/swingme/code/2276
Author: yuranet
Date: 2013-08-11 22:26:19 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
apple MBP retina support
Modified Paths:
--------------
me4se/src/javax/microedition/lcdui/Image.java
me4se/src/javax/microedition/midlet/ApplicationManager.java
me4se/src/org/me4se/impl/lcdui/AwtFont.java
me4se/src/org/me4se/scm/ScmWrapper.java
Modified: me4se/src/javax/microedition/lcdui/Image.java
===================================================================
--- me4se/src/javax/microedition/lcdui/Image.java 2013-07-22 05:29:28 UTC (rev 2275)
+++ me4se/src/javax/microedition/lcdui/Image.java 2013-08-11 22:26:19 UTC (rev 2276)
@@ -151,8 +151,37 @@
* @API MIDP-1.0
*/
public static Image createImage(String name) throws IOException {
- return
- new Image(ApplicationManager.getInstance().getImage(name), false, true, name);
+ double density = ApplicationManager.getDisplayDensity();
+ if (density == 2 && name.startsWith("/")) {
+ try {
+ String name2 = "/drawable-xhdpi"+name;
+ return new Image(ApplicationManager.getInstance().getImage(name2), false, true, name2);
+ }
+ catch (Throwable th) {}
+ }
+
+ BufferedImage img = ApplicationManager.getInstance().getImage(name);
+ if (density != 1) {
+ if (name.endsWith(".9.png")) {
+ BufferedImage newImg = new BufferedImage((int)(density*(img.getWidth()-2))+2, (int)(density*(img.getHeight()-2))+2, img.getType());
+ java.awt.Graphics g = newImg.getGraphics();
+ g.drawImage(img, 1, 1, newImg.getWidth()-1, newImg.getHeight()-1, 1, 1, img.getWidth()-1, img.getHeight()-1, null); // center
+ g.drawImage(img, 1, 0, newImg.getWidth()-1, 1, 1, 0, img.getWidth()-1, 1, null); // top
+ g.drawImage(img, 1, newImg.getHeight()-1, newImg.getWidth()-1, newImg.getHeight(), 1, img.getHeight()-1, img.getWidth()-1, img.getHeight(), null); // bottom
+ g.drawImage(img, 0, 1, 1, newImg.getHeight()-1, 0, 1, 1, img.getHeight()-1, null); // left
+ g.drawImage(img, newImg.getWidth()-1, 1, newImg.getWidth(), newImg.getHeight()-1, img.getWidth()-1, 1, img.getWidth(), img.getHeight()-1, null); // right
+ g.dispose();
+ img=newImg;
+ }
+ else {
+ BufferedImage newImg = new BufferedImage((int)(density*img.getWidth()), (int)(density*img.getHeight()), img.getType());
+ java.awt.Graphics g = newImg.getGraphics();
+ g.drawImage(img, 0, 0, newImg.getWidth(), newImg.getHeight(), 0, 0, img.getWidth(), img.getHeight(), null);
+ g.dispose();
+ img=newImg;
+ }
+ }
+ return new Image(img, false, true, name);
}
/*
Modified: me4se/src/javax/microedition/midlet/ApplicationManager.java
===================================================================
--- me4se/src/javax/microedition/midlet/ApplicationManager.java 2013-07-22 05:29:28 UTC (rev 2275)
+++ me4se/src/javax/microedition/midlet/ApplicationManager.java 2013-08-11 22:26:19 UTC (rev 2276)
@@ -20,10 +20,13 @@
import java.applet.Applet;
import java.awt.Dimension;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
import java.awt.Image;
import java.awt.Menu;
import java.awt.MenuBar;
import java.awt.MenuItem;
+import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
@@ -37,6 +40,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Field;
import java.net.URL;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -617,7 +621,10 @@
}
}
- wrapper = new ScmWrapper(this, new Float(getProperty("scale", "1"))
+ double displayDensity = getDisplayDensity();
+ setSystemProperty("display.density",String.valueOf(displayDensity));
+
+ wrapper = new ScmWrapper(this, new Float(getProperty("scale", String.valueOf( 1/displayDensity )))
.floatValue());
// FontInfo.cache = new Hashtable ();
@@ -1310,4 +1317,26 @@
return menuBar;
}
+ public static double getDisplayDensity() {
+
+ // Apple Java 1.6 check
+ try {
+ Object contentScaleFactor = Toolkit.getDefaultToolkit().getDesktopProperty("apple.awt.contentScaleFactor");
+ return Double.parseDouble(String.valueOf(contentScaleFactor));
+ }
+ catch (Throwable th) {}
+
+ // Oracle Java 1.7 check
+ try {
+ GraphicsDevice device = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+ Field field = device.getClass().getDeclaredField("scale");
+ field.setAccessible(true);
+ return ((Integer)field.get(device)).intValue();
+ }
+ catch (Throwable th) {}
+
+ // default
+ return 1;
+ }
+
}
Modified: me4se/src/org/me4se/impl/lcdui/AwtFont.java
===================================================================
--- me4se/src/org/me4se/impl/lcdui/AwtFont.java 2013-07-22 05:29:28 UTC (rev 2275)
+++ me4se/src/org/me4se/impl/lcdui/AwtFont.java 2013-08-11 22:26:19 UTC (rev 2276)
@@ -1,6 +1,7 @@
package org.me4se.impl.lcdui;
import java.awt.*;
+import javax.microedition.midlet.ApplicationManager;
/**
* @author Stefan Haustein
@@ -55,6 +56,8 @@
(bold ? java.awt.Font.BOLD : 0)
+ (italic ? java.awt.Font.ITALIC : 0);
+ height = (int)(height * ApplicationManager.getDisplayDensity());
+
int points = height * 3;
// do {
Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java 2013-07-22 05:29:28 UTC (rev 2275)
+++ me4se/src/org/me4se/scm/ScmWrapper.java 2013-08-11 22:26:19 UTC (rev 2276)
@@ -164,6 +164,8 @@
}
// System.out.println("Size: "+size);
+ size.width = (int)(size.width / scale);
+ size.height = (int)(size.height / scale);
if (offScreenCache == null || offScreenCache.getWidth(this) != size.width
|| offScreenCache.getHeight(this) != size.height) {
@@ -192,12 +194,13 @@
BufferedImage offScreen = getOffScreen();
- Graphics offScreenGraphics = offScreen.getGraphics();
+ Graphics2D offScreenGraphics = offScreen.createGraphics();
+ offScreenGraphics.scale(1/scale, 1/scale);
offScreenGraphics.setClip(g.getClip());
+ offScreenGraphics.scale(scale, scale);
-
offScreenGraphics.setColor(Color.black);
helper.paint(offScreenGraphics);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
