Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[4608] trunk
|
From: <ls...@us...> - 2008-10-06 09:26:34
|
Revision: 4608
http://jnode.svn.sourceforge.net/jnode/?rev=4608&view=rev
Author: lsantha
Date: 2008-10-06 09:00:26 +0000 (Mon, 06 Oct 2008)
Log Message:
-----------
Style fixes.
Modified Paths:
--------------
trunk/core/src/core/org/jnode/vm/isolate/IsolateStatusImpl.java
trunk/core/src/core/org/jnode/vm/isolate/ObjectLinkMessage.java
trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
trunk/core/src/core/org/jnode/vm/isolate/VmIsolateLocal.java
trunk/core/src/driver/org/jnode/driver/Device.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/KeyboardReader.java
trunk/core/src/test/org/jnode/test/core/IsolateTest.java
trunk/core/src/test/org/jnode/test/core/StatusLinkTest.java
trunk/gui/src/awt/org/jnode/awt/font/FontProvider.java
trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java
trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractFontProvider.java
trunk/gui/src/awt/org/jnode/awt/font/truetype/TTFontProvider.java
trunk/gui/src/awt/org/jnode/awt/util/BasicGraphics.java
trunk/gui/src/awt/org/jnode/awt/util/SurfaceGraphics2D.java
trunk/shell/src/shell/org/jnode/shell/isolate/IsolateCommandThreadImpl.java
Modified: trunk/core/src/core/org/jnode/vm/isolate/IsolateStatusImpl.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/isolate/IsolateStatusImpl.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/core/src/core/org/jnode/vm/isolate/IsolateStatusImpl.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -29,7 +29,7 @@
@Override
public String toString() {
State s = getState();
- if(s.equals(State.EXITED)) {
+ if (s.equals(State.EXITED)) {
return getState() + "(" + getExitReason() + "," + getExitCode();
} else {
return getState().toString();
Modified: trunk/core/src/core/org/jnode/vm/isolate/ObjectLinkMessage.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/isolate/ObjectLinkMessage.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/core/src/core/org/jnode/vm/isolate/ObjectLinkMessage.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -23,7 +23,7 @@
/**
* This message type passes an object by reference. This is probably a bad idea
* because it 'breaks' the isolation of isolates. Use sparingly if at all.
- *
+ *
* @author cr...@jn...
*/
public class ObjectLinkMessage extends LinkMessageImpl {
@@ -34,7 +34,7 @@
this.obj = cr;
}
- public static ObjectLinkMessage newMessage (Object obj) {
+ public static ObjectLinkMessage newMessage(Object obj) {
return new ObjectLinkMessage(obj);
}
Modified: trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -29,16 +29,14 @@
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Properties;
-import java.util.List;
-import java.util.LinkedList;
-
import javax.isolate.Isolate;
import javax.isolate.IsolateStartupException;
import javax.isolate.IsolateStatus;
import javax.isolate.Link;
import javax.naming.NameNotFoundException;
-
import org.jnode.naming.InitialNaming;
import org.jnode.plugin.PluginManager;
import org.jnode.util.BootableHashMap;
@@ -177,7 +175,7 @@
TERMINATED(IsolateStatus.State.EXITED),
NEVERSTARTED(IsolateStatus.State.UNKNOWN),
-
+
UNKNOWN(IsolateStatus.State.UNKNOWN);
private final IsolateStatus.State isolateState;
@@ -241,7 +239,7 @@
}
static synchronized int nextId() {
- return nextId ++;
+ return nextId++;
}
}
@@ -390,7 +388,7 @@
}
this.exitCode = status;
- if(currentIsolate() == this) {
+ if (currentIsolate() == this) {
//todo implement: IMPLICIT_EXIT, UNCAUGHT_EXCEPTION
this.exitReason = IsolateStatus.ExitReason.SELF_EXIT;
} else {
@@ -422,7 +420,7 @@
t.printStackTrace();
}
this.exitCode = status;
- if(currentIsolate() == this) {
+ if (currentIsolate() == this) {
this.exitReason = IsolateStatus.ExitReason.SELF_HALT;
} else {
this.exitReason = IsolateStatus.ExitReason.OTHER_HALT;
@@ -498,11 +496,11 @@
* Start this isolate.
*
* @param isolate the isolate to start
- * @param links an array of links passed to the isolate on startup
+ * @param links an array of links passed to the isolate on startup
* @throws IsolateStartupException on startup failure
*/
@PrivilegedActionPragma
- public synchronized final void start(Isolate isolate, Link[] links)
+ public final void start(Isolate isolate, Link[] links)
throws IsolateStartupException {
testIsolate(isolate);
// The creator of this isolate must be the same as the current isolate
@@ -773,6 +771,7 @@
/**
* Returns the identifier of this isolate.
+ *
* @return the unique identifier
*/
public int getId() {
@@ -781,6 +780,7 @@
/**
* Returns the state of this isolate.
+ *
* @return the current state
*/
public State getState() {
@@ -789,6 +789,7 @@
/**
* Returns the VmIsolate instance which created this VmIsolate instance.
+ *
* @return
*/
public VmIsolate getCreator() {
@@ -797,6 +798,7 @@
/**
* Returns the map of isolate locals belonging to this isolate.
+ *
* @return the isolate local map
*/
BootableHashMap getIsolateLocalMap() {
@@ -810,6 +812,7 @@
/**
* Create and return a new status link for this isolate and the supplied
* receiver isolate.
+ *
* @param receiver the receiver for the link.
* @return the link.
*/
@@ -817,7 +820,7 @@
Link link = VmLink.newLink(this, receiver);
VmLink vmLink = VmLink.fromLink(link);
statusLinks.add(vmLink);
- if (isolateState != null && isolateState.equals(IsolateStatus.State.EXITED)) {
+ if (isolateState != null && isolateState.equals(IsolateStatus.State.EXITED)) {
// The spec says that we should immediately send a link message
// if the isolate is already 'EXITED'.
sendStatus(vmLink, isolateState);
@@ -838,7 +841,7 @@
}
private void sendStatus(VmLink link, IsolateStatus.State state) {
- if(state.equals(IsolateStatus.State.EXITED)) {
+ if (state.equals(IsolateStatus.State.EXITED)) {
org.jnode.vm.Unsafe.debugStackTrace();
link.sendStatus(new StatusLinkMessage(new IsolateStatusImpl(state, exitReason, exitCode)));
} else {
Modified: trunk/core/src/core/org/jnode/vm/isolate/VmIsolateLocal.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/isolate/VmIsolateLocal.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/core/src/core/org/jnode/vm/isolate/VmIsolateLocal.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -3,7 +3,6 @@
*/
package org.jnode.vm.isolate;
-import org.jnode.util.BootableHashMap;
import org.jnode.vm.VmSystemObject;
/**
Modified: trunk/core/src/driver/org/jnode/driver/Device.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/Device.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/core/src/driver/org/jnode/driver/Device.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -245,8 +245,8 @@
*/
public final boolean implementsAPI(Class<? extends DeviceAPI> apiInterface) {
//lookup is classname based to handle multi isolate uscases
- for(Class clazz : apis.keySet()) {
- if(clazz.getName().equals(apiInterface.getName())) {
+ for (Class clazz : apis.keySet()) {
+ if (clazz.getName().equals(apiInterface.getName())) {
return true;
}
}
@@ -272,8 +272,8 @@
public final <T extends DeviceAPI> T getAPI(Class<T> apiInterface) throws ApiNotFoundException {
//lookup is classname based to handle multi isolate uscases
Class apiInterface2 = null;
- for(Class clazz : apis.keySet()) {
- if(clazz.getName().equals(apiInterface.getName())) {
+ for (Class clazz : apis.keySet()) {
+ if (clazz.getName().equals(apiInterface.getName())) {
apiInterface2 = clazz;
break;
}
Modified: trunk/core/src/driver/org/jnode/driver/console/textscreen/KeyboardReader.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/textscreen/KeyboardReader.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/core/src/driver/org/jnode/driver/console/textscreen/KeyboardReader.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -5,7 +5,6 @@
import java.io.Reader;
import java.io.Writer;
-import org.apache.log4j.Logger;
import org.jnode.driver.console.InputCompleter;
import org.jnode.driver.console.TextConsole;
import org.jnode.driver.input.KeyboardEvent;
Modified: trunk/core/src/test/org/jnode/test/core/IsolateTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/core/IsolateTest.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/core/src/test/org/jnode/test/core/IsolateTest.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -5,10 +5,6 @@
import javax.isolate.Isolate;
import javax.isolate.IsolateStartupException;
-import javax.isolate.Link;
-import javax.isolate.ClosedLinkException;
-import javax.isolate.LinkMessage;
-import javax.isolate.IsolateStatus;
public class IsolateTest {
Modified: trunk/core/src/test/org/jnode/test/core/StatusLinkTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/core/StatusLinkTest.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/core/src/test/org/jnode/test/core/StatusLinkTest.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -5,12 +5,11 @@
import java.io.IOException;
import java.io.InterruptedIOException;
-import javax.isolate.ClosedLinkException;
import javax.isolate.Isolate;
import javax.isolate.IsolateStartupException;
+import javax.isolate.IsolateStatus;
import javax.isolate.Link;
import javax.isolate.LinkMessage;
-import javax.isolate.IsolateStatus;
public class StatusLinkTest {
@@ -19,7 +18,7 @@
Isolate child = new Isolate(clsName);
Link link = child.newStatusLink();
new Thread(new StatusMonitor(link)).start();
- child.start();
+ child.start();
}
public static class StatusMonitor implements Runnable {
@@ -33,9 +32,9 @@
try {
while (true) {
LinkMessage msg = link.receive();
- if(msg.containsStatus()) {
+ if (msg.containsStatus()) {
IsolateStatus is = msg.extractStatus();
- if(is.getState().equals(IsolateStatus.State.EXITED)) {
+ if (is.getState().equals(IsolateStatus.State.EXITED)) {
System.out.println("Message: state=" + is.getState() + " code=" + is.getExitCode() +
" reason=" + is.getExitReason());
break;
@@ -43,7 +42,7 @@
System.out.println("Message: state=" + is.getState());
}
} else {
- System.out.println("Unknown message: " + msg);
+ System.out.println("Unknown message: " + msg);
}
}
} catch (Exception x) {
@@ -61,4 +60,4 @@
System.out.println("Child: exiting");
}
}
-}
\ No newline at end of file
+}
Modified: trunk/gui/src/awt/org/jnode/awt/font/FontProvider.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/FontProvider.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/gui/src/awt/org/jnode/awt/font/FontProvider.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -29,8 +29,6 @@
import java.util.Map;
import java.util.Set;
-import org.jnode.awt.JNodeToolkit;
-
/**
* @author Ewout Prangsma (ep...@us...)
* @author Fabien DUMINY (fd...@jn...)
@@ -96,7 +94,7 @@
/**
* Creates a font peer from the given name or return null if not supported/provided.
- * As said in {@link JNodeToolkit#getClasspathFontPeer(String, java.util.Map)} javadoc :
+ * As said in {@link org.jnode.awt.JNodeToolkit#getClasspathFontPeer(String, java.util.Map)} javadoc :
* "We don't know what kind of "name" the user requested (logical, face, family)".
*
* @param name
Modified: trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -34,20 +34,16 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.log4j.Logger;
-import org.jnode.awt.JNodeToolkit;
-import org.jnode.awt.font.FontProvider;
import org.jnode.awt.font.TextRenderer;
import org.jnode.awt.font.renderer.RenderCache;
import org.jnode.awt.font.spi.AbstractFontProvider;
import org.jnode.font.bdf.BDFFontContainer;
import org.jnode.font.bdf.BDFGlyph;
-import org.jnode.vm.Unsafe;
/**
- * {@link FontProvider} for {@link BDFFont}s.
- *
+ * {@link org.jnode.awt.font.FontProvider} for {@link BDFFont}s.
+ *
* @author Fabien DUMINY (fd...@jn...)
*/
public class BDFFontProvider extends AbstractFontProvider<BDFFont, BDFFontContainer> {
@@ -64,11 +60,11 @@
};
private List<BDFFontContainer> containers;
-
- private Map<BDFFontContainer, Size> maxCharBounds = new HashMap<BDFFontContainer, Size>();
-
+
+ private Map<BDFFontContainer, Size> maxCharBounds = new HashMap<BDFFontContainer, Size>();
+
public BDFFontProvider() {
- super(BDFFont.class, "bdf");
+ super(BDFFont.class, "bdf");
}
protected TextRenderer createTextRenderer(RenderCache renderCache, Font font) {
@@ -82,12 +78,12 @@
final BDFFont bdfFont = getCompatibleFont(font);
return bdfFont.getFontMetrics();
}
-
+
/**
* Creates a font peer from the given name or return null if not supported/provided.
- * As said in {@link JNodeToolkit#getClasspathFontPeer(String, java.util.Map)} javadoc :
+ * As said in {@link org.jnode.awt.JNodeToolkit#getClasspathFontPeer(String, java.util.Map)} javadoc :
* "We don't know what kind of "name" the user requested (logical, face, family)".
- *
+ *
* @param name
* @param attrs
* @return
@@ -104,20 +100,21 @@
break;
}
}
-
+
for (BDFFontContainer container : getContainers()) {
if (match(container, name, attrs)) {
peer = new BDFFontPeer(this, name, attrs);
break;
}
}
-
+
//Unsafe.debug("BDFFontProvider: name=" + name + "fontPeer=" + peer);
return peer;
}
/**
* Read an create a Font from the given InputStream
+ *
* @param stream
* @return
*/
@@ -136,7 +133,7 @@
throw ffe;
}
}
-
+
/**
* Load all default fonts.
*/
@@ -146,7 +143,7 @@
addFont(new BDFFont(container));
}
}
-
+
private List<BDFFontContainer> getContainers() {
if (containers == null) {
containers = new ArrayList<BDFFontContainer>();
@@ -156,7 +153,7 @@
final ClassLoader cl = Thread.currentThread().getContextClassLoader();
final URL url = cl.getResource(fontResource);
if (url != null) {
- Reader reader = new InputStreamReader(url.openStream());
+ Reader reader = new InputStreamReader(url.openStream());
containers.add(BDFFontContainer.createFont(reader));
} else {
log.error("Cannot find font resource " + fontResource);
@@ -166,15 +163,15 @@
} catch (Throwable ex) {
log.error("Cannot find font " + fontResource, ex);
}
- }
+ }
}
-
+
return containers;
}
Rectangle2D getMaxCharBounds(BDFFontContainer container) {
Size size = maxCharBounds.get(container);
-
+
if (size == null) {
size = new Size();
for (BDFGlyph g : container.getGlyphs()) {
@@ -185,8 +182,8 @@
}
maxCharBounds.put(container, size);
}
-
- return new Rectangle2D.Double(0, 0, size.maxCharWidth, size.maxCharHeight);
+
+ return new Rectangle2D.Double(0, 0, size.maxCharWidth, size.maxCharHeight);
}
private boolean match(BDFFontContainer container, String name, Map attrs) {
@@ -195,9 +192,8 @@
//if (container.getFamily().equals(name) || container.getName().equals(name)) {
return true;
}
-
- private static class Size
- {
+
+ private static class Size {
int maxCharWidth = 0;
int maxCharHeight = 0;
}
Modified: trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractFontProvider.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractFontProvider.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractFontProvider.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -24,7 +24,6 @@
import java.awt.Font;
import java.awt.FontMetrics;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Modified: trunk/gui/src/awt/org/jnode/awt/font/truetype/TTFontProvider.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/truetype/TTFontProvider.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/gui/src/awt/org/jnode/awt/font/truetype/TTFontProvider.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -27,18 +27,11 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.List;
import java.util.Map;
-
import org.apache.log4j.Logger;
-import org.jnode.awt.JNodeToolkit;
-import org.jnode.awt.font.JNodeFontPeer;
import org.jnode.awt.font.TextRenderer;
-import org.jnode.awt.font.bdf.BDFFont;
-import org.jnode.awt.font.bdf.BDFFontPeer;
import org.jnode.awt.font.renderer.RenderCache;
import org.jnode.awt.font.spi.AbstractFontProvider;
-import org.jnode.font.bdf.BDFFontContainer;
/**
* @author epr
@@ -77,12 +70,12 @@
return new TTFFontMetrics(font, getFontData(font));
}
-
+
/**
* Creates a font peer from the given name or return null if not supported/provided.
- * As said in {@link JNodeToolkit#getClasspathFontPeer(String, java.util.Map)} javadoc :
+ * As said in {@link org.jnode.awt.JNodeToolkit#getClasspathFontPeer(String, java.util.Map)} javadoc :
* "We don't know what kind of "name" the user requested (logical, face, family)".
- *
+ *
* @param name
* @param attrs
* @return
@@ -109,12 +102,13 @@
// }
//
// return peer;
-
+
return new TTFFontPeer(this, name, attrs);
}
/**
* Read an create a Font from the given InputStream
+ *
* @param stream
* @return
*/
@@ -130,9 +124,9 @@
FontFormatException ffe = new FontFormatException("bad ttf format");
ffe.initCause(e);
throw ffe;
- }
+ }
}
-
+
/**
* Gets the font data for the given font
*
@@ -170,6 +164,6 @@
} catch (Throwable ex) {
log.error("Cannot find font " + fontResource, ex);
}
- }
+ }
}
}
Modified: trunk/gui/src/awt/org/jnode/awt/util/BasicGraphics.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/util/BasicGraphics.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/gui/src/awt/org/jnode/awt/util/BasicGraphics.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -62,7 +62,8 @@
clip = clip.intersection(r);
if (this.clip.width == 0 && this.clip.height == 0) {
- //TODO it's probably a regular (but rare) use case since a GUI (swing/awt) component can have width=0 and height=0
+ //TODO it's probably a regular (but rare) use case since a GUI (swing/awt)
+ // component can have width=0 and height=0
org.jnode.vm.Unsafe.debug(getClass().getSimpleName() + ": zero clip\n");
}
}
Modified: trunk/gui/src/awt/org/jnode/awt/util/SurfaceGraphics2D.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/util/SurfaceGraphics2D.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/gui/src/awt/org/jnode/awt/util/SurfaceGraphics2D.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -26,7 +26,6 @@
import java.awt.font.GlyphVector;
import java.awt.geom.AffineTransform;
import java.awt.geom.Arc2D;
-import java.awt.geom.Area;
import java.awt.geom.Ellipse2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.RoundRectangle2D;
@@ -41,7 +40,6 @@
import java.text.AttributedCharacterIterator;
import java.util.HashMap;
import java.util.Map;
-
import org.jnode.awt.JNodeToolkit;
import org.jnode.awt.font.FontManager;
import org.jnode.driver.video.Surface;
Modified: trunk/shell/src/shell/org/jnode/shell/isolate/IsolateCommandThreadImpl.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/isolate/IsolateCommandThreadImpl.java 2008-10-06 07:56:13 UTC (rev 4607)
+++ trunk/shell/src/shell/org/jnode/shell/isolate/IsolateCommandThreadImpl.java 2008-10-06 09:00:26 UTC (rev 4608)
@@ -8,16 +8,13 @@
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
-import java.io.InterruptedIOException;
import java.net.Socket;
import java.util.Properties;
-
import javax.isolate.Isolate;
import javax.isolate.IsolateStatus;
import javax.isolate.Link;
import javax.isolate.LinkMessage;
import javax.isolate.StreamBindings;
-
import org.jnode.shell.CommandRunner;
import org.jnode.shell.CommandThread;
import org.jnode.shell.ShellInvocationException;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
