Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5605] trunk
|
From: <ls...@us...> - 2009-07-12 22:22:50
|
Revision: 5605
http://jnode.svn.sourceforge.net/jnode/?rev=5605&view=rev
Author: lsantha
Date: 2009-07-12 20:10:54 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
Fixed code style.
Modified Paths:
--------------
trunk/builder/src/builder/org/jnode/build/dependencies/BCELDependencyChecker.java
trunk/core/src/core/org/jnode/vm/MathSupport.java
trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
trunk/core/src/test/org/jnode/test/core/CompilerTest.java
trunk/core/src/test/org/jnode/test/core/LongTest.java
trunk/distr/src/apps/org/jnode/apps/jpartition/JPartitionCommand.java
trunk/fs/src/driver/org/jnode/driver/block/GeometryException.java
trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java
trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java
trunk/fs/src/fs/org/jnode/fs/hfsplus/Superblock.java
trunk/fs/src/fs/org/jnode/fs/service/def/FileSystemAPIImpl.java
trunk/fs/src/test/org/jnode/test/support/MockUtils.java
trunk/gui/src/awt/org/jnode/awt/font/truetype/TTFFontPeer.java
trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java
Modified: trunk/builder/src/builder/org/jnode/build/dependencies/BCELDependencyChecker.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/dependencies/BCELDependencyChecker.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/builder/src/builder/org/jnode/build/dependencies/BCELDependencyChecker.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -350,7 +350,7 @@
usedPlugins.put(fragment.getFullPluginId(), fragment);
}
- for (PluginPrerequisite prerequisite: plugin.descr.getPrerequisites()) {
+ for (PluginPrerequisite prerequisite : plugin.descr.getPrerequisites()) {
String idOfUsedPlugin =
createFullPluginId(prerequisite.getPluginId(), prerequisite.getPluginVersion());
usedPlugins.put(idOfUsedPlugin, findPlugin(idOfUsedPlugin));
Modified: trunk/core/src/core/org/jnode/vm/MathSupport.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/MathSupport.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/core/src/core/org/jnode/vm/MathSupport.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -53,7 +53,7 @@
}
}
- if(den == Long.MIN_VALUE) {
+ if (den == Long.MIN_VALUE) {
return 0;
}
@@ -109,7 +109,7 @@
}
}
- if(den == Long.MIN_VALUE) {
+ if (den == Long.MIN_VALUE) {
return num;
}
Modified: trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -55,7 +55,6 @@
import org.jnode.vm.classmgr.VmIsolatedStatics;
import org.jnode.vm.classmgr.VmType;
import org.jnode.vm.scheduler.VmThread;
-import gnu.classpath.SystemProperties;
/**
* VM specific implementation of the Isolate class.
Modified: trunk/core/src/test/org/jnode/test/core/CompilerTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/core/CompilerTest.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/core/src/test/org/jnode/test/core/CompilerTest.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -75,7 +75,7 @@
// "org.jnode.vm.VmStacReader",
// "org.jnode.vm.classmgr.VmType",
// "org.jnode.test.ArrayLongTest",
- "org.jnode.test.ArrayTest",
+ "org.jnode.test.ArrayTest",
// "org.jnode.test.Linpack",
// "org.jnode.test.MultiANewArrayTest",
// "org.jnode.test.Sieve",
@@ -119,7 +119,7 @@
File classlib = new File("./all/lib/classlib.jar").getCanonicalFile();
final VmSystemClassLoader cl = new VmSystemClassLoader(new java.net.URL[]{
classes.toURI().toURL(),
- new java.net.URL("jar:"+ classlib.toURI().toURL() + "!/"),
+ new java.net.URL("jar:" + classlib.toURI().toURL() + "!/"),
}, arch);
final Vm vm = new Vm("?", arch, cl.getSharedStatics(), false, cl, null);
Modified: trunk/core/src/test/org/jnode/test/core/LongTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/core/LongTest.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/core/src/test/org/jnode/test/core/LongTest.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -26,39 +26,39 @@
}
private static void divtestLoop(long min, long max) {
- for(long i = min; i < max; i++) {
+ for (long i = min; i < max; i++) {
divtest(Long.MIN_VALUE, i);
}
- for(long i = min; i < max; i++) {
+ for (long i = min; i < max; i++) {
divtest(Long.MAX_VALUE, i);
}
- for(long i = min; i < max; i++) {
+ for (long i = min; i < max; i++) {
divtest(0, i);
}
- for(long i = min; i < max; i++) {
+ for (long i = min; i < max; i++) {
divtest(1, i);
}
- for(long i = min; i < max; i++) {
+ for (long i = min; i < max; i++) {
divtest(-1, i);
}
}
private static void divtest(long num, long den) {
- if(den == 0) return;
+ if (den == 0) return;
long q1 = num / den;
long q2 = MathSupport.ldiv(num , den);
- if(q1 != q2){
+ if (q1 != q2) {
System.out.println("error for " + num + " / " + den);
System.out.println(q1);
System.out.println(q2);
}
q1 = num % den;
q2 = MathSupport.lrem(num, den);
- if(q1 != q2){
+ if (q1 != q2) {
System.out.println("error for " + num + " % " + den);
System.out.println(q1);
System.out.println(q2);
Modified: trunk/distr/src/apps/org/jnode/apps/jpartition/JPartitionCommand.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/jpartition/JPartitionCommand.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/distr/src/apps/org/jnode/apps/jpartition/JPartitionCommand.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -79,7 +79,8 @@
/**
* {@inheritDoc}
*/
- public void doExecute(boolean install, InputStream in, PrintStream out, PrintStream err, boolean consoleView, boolean swingView) throws Exception {
+ public void doExecute(boolean install, InputStream in, PrintStream out, PrintStream err, boolean consoleView,
+ boolean swingView) throws Exception {
ViewFactory viewFactory =
consoleView ? new ConsoleViewFactory()
: swingView ? new SwingViewFactory() : null;
Modified: trunk/fs/src/driver/org/jnode/driver/block/GeometryException.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/GeometryException.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/fs/src/driver/org/jnode/driver/block/GeometryException.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -37,4 +37,4 @@
super(message);
initCause(t);
}
-}
\ No newline at end of file
+}
Modified: trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusDirectory.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -93,7 +93,7 @@
Catalog catalog = fs.getCatalog();
Superblock volumeHeader = ((HfsPlusFileSystem) getFileSystem()).getVolumeHeader();
LeafRecord fileRecord = catalog.createNode(name, this.folder
- .getFolderId(), new CatalogNodeId(volumeHeader.getNextCatalogId()), CatalogFile.RECORD_TYPE_FILE);
+ .getFolderId(), new CatalogNodeId(volumeHeader.getNextCatalogId()), CatalogFile.RECORD_TYPE_FILE);
HFSPlusEntry newEntry = new HFSPlusFile(fs, this, name, folderRecord);
newEntry.setDirty();
Modified: trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/fs/src/fs/org/jnode/fs/hfsplus/HfsPlusFileSystem.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -153,7 +153,8 @@
volumeHeader.create(params);
log.debug("Volume header : \n" + volumeHeader.toString());
long volumeBlockUsed =
- volumeHeader.getTotalBlocks() - volumeHeader.getFreeBlocks() - ((volumeHeader.getBlockSize() == 512) ? 2 : 1);
+ volumeHeader.getTotalBlocks() - volumeHeader.getFreeBlocks() - ((volumeHeader.getBlockSize() == 512) ?
+ 2 : 1);
// ---
log.debug("Write allocation bitmap bits to disk.");
writeAllocationFile((int) volumeBlockUsed);
Modified: trunk/fs/src/fs/org/jnode/fs/hfsplus/Superblock.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/hfsplus/Superblock.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/fs/src/fs/org/jnode/fs/hfsplus/Superblock.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -27,7 +27,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.jnode.driver.ApiNotFoundException;
import org.jnode.fs.FileSystemException;
import org.jnode.fs.hfsplus.catalog.CatalogNodeId;
import org.jnode.fs.hfsplus.extent.ExtentDescriptor;
@@ -436,7 +435,7 @@
return data;
}
- public void update() throws IOException{
+ public void update() throws IOException {
fs.getApi().write(1024, ByteBuffer.wrap(data));
}
Modified: trunk/fs/src/fs/org/jnode/fs/service/def/FileSystemAPIImpl.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/service/def/FileSystemAPIImpl.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/fs/src/fs/org/jnode/fs/service/def/FileSystemAPIImpl.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -288,7 +288,7 @@
entryCache.setEntry(entryPath.toString(), child);
entryPath.setLength(directoryPathSize);
- if(name != null){
+ if (name != null) {
list.add(name);
}
}
Modified: trunk/fs/src/test/org/jnode/test/support/MockUtils.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/MockUtils.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/fs/src/test/org/jnode/test/support/MockUtils.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -46,7 +46,8 @@
return createMockObject(name, null, clsArgs, args);
}
- public static Object createMockObject(Class<?> name, MockInitializer initializer, Class<?>[] clsArgs, Object[] args) {
+ public static Object createMockObject(Class<?> name, MockInitializer initializer,
+ Class<?>[] clsArgs, Object[] args) {
String shortName = getShortName(name);
CGLibCoreMockExt cglibMock = new CGLibCoreMockExt(name, shortName);
Mock mock = new Mock(cglibMock);
Modified: trunk/gui/src/awt/org/jnode/awt/font/truetype/TTFFontPeer.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/truetype/TTFFontPeer.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/gui/src/awt/org/jnode/awt/font/truetype/TTFFontPeer.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -39,7 +39,7 @@
public class TTFFontPeer extends JNodeFontPeer<TTFontProvider, TTFFont> {
- public TTFFontPeer(TTFontProvider provider, String name, Map<?,?> attrs) {
+ public TTFFontPeer(TTFontProvider provider, String name, Map<?, ?> attrs) {
super(provider, name, attrs);
}
Modified: trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java 2009-07-12 19:52:16 UTC (rev 5604)
+++ trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java 2009-07-12 20:10:54 UTC (rev 5605)
@@ -478,7 +478,8 @@
}
} else {
comp = super.getTopComponentAt(x, y);
- SwingBaseWindow<?, ?> window = (SwingBaseWindow<?, ?>) SwingUtilities.getAncestorOfClass(SwingBaseWindow.class, comp);
+ SwingBaseWindow<?, ?> window = (SwingBaseWindow<?, ?>) SwingUtilities.
+ getAncestorOfClass(SwingBaseWindow.class, comp);
if (window != null) {
Rectangle r = window.getBounds();
Insets ins = window.getSwingPeer().getInsets();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
