Merge branch 'master' of github.com:russellallen/self

objects/applications/javaClient/SelfDisconnectButton.java

@@ -19,7 +19,7 @@
 import java.io.*;
 import java.net.*;
 import java.util.*;
-import SelfViewer;
+//import SelfViewer;
 
 public class SelfDisconnectButton extends Applet
 {

objects/applications/javaClient/Utils.java

@@ -102,7 +102,7 @@ public static Image createFrom (String colors, String pixels, int width, Compone
       for (int i = 0; i < size; ++i)
          {
          int colorOffset = Integer.parseInt (pixels.substring (i*2, i*2 + 2), 16);
-         int rgb = Integer.parseInt (colors.substring (colorOffset*8, colorOffset*8 + 8), 16);
+         int rgb = Integer.parseInt (colors.substring (colorOffset*8+2, colorOffset*8 + 6), 16);
          if (useColors)
             pixelData[i] = rgb;
          else

objects/applications/javaClient/makefile.java

@@ -19,26 +19,26 @@
 $(SelfViewer): SelfViewer.java $(Utils) $(RadarViewer) $(Viewer) \
                $(LensRadarViewer) $(Structure) $(CutoutBrowser)
 	./makedate
-	javac BuildInfo.java
-	javac SelfViewer.java
+	javac -cp . BuildInfo.java
+	javac -cp . SelfViewer.java
 
 $(Utils): Utils.java
-	javac Utils.java
+	javac -cp . Utils.java
 
 $(Viewer): Viewer.java $(Utils) $(Structure)
-	javac Viewer.java
+	javac -cp . Viewer.java
 
 $(Structure): Structure.java $(Utils)
-	javac Structure.java
+	javac -cp . Structure.java
 
 $(RadarViewer): RadarViewer.java $(Utils) $(Structure)
-	javac RadarViewer.java
+	javac -cp . RadarViewer.java
 
 $(LensRadarViewer): LensRadarViewer.java $(Utils) $(Structure)
-	javac LensRadarViewer.java
+	javac -cp . LensRadarViewer.java
 
 $(CutoutBrowser): CutoutBrowser.java $(Structure) $(Utils)
-	javac CutoutBrowser.java
+	javac -cp . CutoutBrowser.java
 
 $(SelfDisconnectButton): SelfDisconnectButton.java $(SelfViewer)
-	javac SelfDisconnectButton.java
+	javac -cp . SelfDisconnectButton.java

objects/applications/javaServer/javaInterface.self

@@ -1,7 +1,7 @@
  '$Revision: 30.8 $'
  '
-Copyright 1992-2012 AUTHORS.
-See the LICENSE file for license information.
+Copyright 1992-2011 AUTHORS.
+See the legal/LICENSE file for license information and legal/AUTHORS for authors.
 '
 
 
@@ -554,7 +554,7 @@ This saves recomputing the bounds for most morphs.
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'javaUser' -> () From: ( | {
          'Category: Basic Morph State\x7fModuleInfo: Module: javaInterface InitialContents: InitializeToExpression: (vector)\x7fVisibility: private'
 
-         rawMorphs <- bootstrap stub -> 'globals' -> 'vector' -> ().
+         rawMorphs <- ((bootstrap stub -> 'globals') \/-> 'vector') -> ().
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'javaUser' -> () From: ( | {
@@ -578,7 +578,7 @@ This saves recomputing the bounds for most morphs.
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'javaUser' -> () From: ( | {
          'ModuleInfo: Module: javaInterface InitialContents: InitializeToExpression: (os_file)'
 
-         socket <- os_file.
+         socket <- bootstrap stub -> 'globals' -> 'unixGlobals' -> 'os_file' -> ().
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'javaUser' -> () From: ( | {
@@ -682,6 +682,7 @@ SlotsToOmit: parent.
              bootstrap remove: 'comment' From:
              bootstrap remove: 'directory' From:
              bootstrap remove: 'fileInTimeString' From:
+             bootstrap remove: 'myComment' From:
              bootstrap remove: 'postFileIn' From:
              bootstrap remove: 'revision' From:
              bootstrap remove: 'subpartNames' From:
@@ -696,12 +697,6 @@ SlotsToOmit: comment directory fileInTimeString myComment postFileIn revision su
             | ) .
         } | ) 
 
- bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'modules' -> 'javaInterface' -> () From: ( | {
-         'ModuleInfo: Module: javaInterface InitialContents: FollowSlot\x7fVisibility: private'
-
-         myComment <- ''.
-        } | ) 
-
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'modules' -> 'javaInterface' -> () From: ( | {
          'ModuleInfo: Module: javaInterface InitialContents: FollowSlot\x7fVisibility: public'
 
@@ -714,6 +709,12 @@ SlotsToOmit: comment directory fileInTimeString myComment postFileIn revision su
          fileInTimeString <- _CurrentTimeString.
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'modules' -> 'javaInterface' -> () From: ( | {
+         'ModuleInfo: Module: javaInterface InitialContents: FollowSlot\x7fVisibility: private'
+
+         myComment <- ''.
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'modules' -> 'javaInterface' -> () From: ( | {
          'ModuleInfo: Module: javaInterface InitialContents: FollowSlot'
 
@@ -897,7 +898,7 @@ SlotsToOmit: comment directory fileInTimeString myComment postFileIn revision su
              [changedFields matchesPattern: '*image*'] ifTrue: [
                d at: 'imageColormap' Put: image javaGetColormapDataString.
                d at: 'imagePixels' Put: image javaGetImageDataString.
-               d at: 'imageWidth' Put: width.
+               d at: 'imageWidth' Put: image width.
             ].
 
             d).
@@ -2357,11 +2358,11 @@ Hacked since java users don\'t have a winCanvas
             d: resend.javaDataPairs: changedFields.
             (changedFields = 'all') ||
              [changedFields matchesPattern: '*fontName*'] ifTrue: [
-               d at: 'fontName' Put: fontName.
+               d at: 'fontName' Put: myFontSpec name.
             ].
             (changedFields = 'all') ||
              [changedFields matchesPattern: '*fontSize*'] ifTrue: [
-               d at: 'fontSize' Put: fontSize.
+               d at: 'fontSize' Put: myFontSpec size.
             ].
             (changedFields = 'all') ||
              [changedFields matchesPattern: '*label*'] ifTrue: [
@@ -2849,6 +2850,15 @@ forcibly resized using this method.\x7fModuleInfo: Module: javaInterface Initial
             self).
         } | ) 
 
+ bootstrap addSlotsTo: bootstrap stub -> 'traits' -> () From: ( | {
+         'ModuleInfo: Module: javaInterface InitialContents: FollowSlot'
+
+         objectOutliner = bootstrap setObjectAnnotationOf: bootstrap stub -> 'traits' -> 'objectOutliner' -> () From: ( |
+             {} = 'ModuleInfo: Creator: traits objectOutliner.
+'.
+            | ) .
+        } | ) 
+
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'objectOutliner' -> () From: ( | {
          'Category: java interface\x7fModuleInfo: Module: javaInterface InitialContents: FollowSlot'
 
@@ -2964,7 +2974,7 @@ forcibly resized using this method.\x7fModuleInfo: Module: javaInterface Initial
          'Category: padding\x7fModuleInfo: Module: javaInterface InitialContents: FollowSlot\x7fVisibility: private'
 
          whiteSpace = ' 	
-'.
+\x0d'.
         } | ) 
 
  bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'trashCanMorph' -> () From: ( | {