pixelle-commit Mailing List for pixelle

Brought to you by: dbrosius

pixelle-commit — Svn commit mailing list

You can subscribe to this list here.

2008	_Jan	_Feb	_Mar	_Apr	_May	_Jun (129)	_Jul (39)	_Aug	_Sep	_Oct	_Nov (63)	_Dec
2009	_Jan (1)	_Feb (24)	_Mar	_Apr	_May	_Jun	_Jul (41)	_Aug (1)	_Sep (7)	_Oct	_Nov	_Dec (5)
2010	_Jan (2)	_Feb	_Mar	_Apr	_May	_Jun (4)	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2012	_Jan (2)	_Feb	_Mar (4)	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

1 2 3 .. 13 > >> (Page 1 of 13)

[Pixelle-commit] SF.net SVN: pixelle:[322] trunk/pixelle/etc/pixelle.jnlp

From: <dbr...@us...> - 2012-03-18 05:01:33

Revision: 322
          http://pixelle.svn.sourceforge.net/pixelle/?rev=322&view=rev
Author:   dbrosius
Date:     2012-03-18 05:01:27 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
sync from github

Modified Paths:
--------------
    trunk/pixelle/etc/pixelle.jnlp

Modified: trunk/pixelle/etc/pixelle.jnlp
===================================================================
--- trunk/pixelle/etc/pixelle.jnlp	2012-03-18 04:52:16 UTC (rev 321)
+++ trunk/pixelle/etc/pixelle.jnlp	2012-03-18 05:01:27 UTC (rev 322)
@@ -16,10 +16,10 @@
   </security> 
   <resources> 
     <j2se version="1.6+" initial-heap-size="500m" max-heap-size="1200m"/>
-    <jar href="pixelle-$VERSION.jar"/>
-    <jar href="antlr-runtime-3.4.jar"/> 
-    <jar href="asm-3.3.1.jar"/> 
-    <jar href="stringtemplate-4.0.2.jar"/> 
+    <jar href="/jnlp/pixelle-$VERSION.jar"/>
+    <jar href="/jnlp/antlr-runtime-3.4.jar"/> 
+    <jar href="/jnlp/asm-3.3.1.jar"/> 
+    <jar href="/jnlp/stringtemplate-4.0.2.jar"/> 
   </resources> 
   <application-desc main-class="com.mebigfatguy.pixelle.Pixelle"/> 
 </jnlp> 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[321] trunk/pixelle

From: <dbr...@us...> - 2012-03-18 04:52:22

Revision: 321
          http://pixelle.svn.sourceforge.net/pixelle/?rev=321&view=rev
Author:   dbrosius
Date:     2012-03-18 04:52:16 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
sync from github

Modified Paths:
--------------
    trunk/pixelle/etc/Pixelle.g
    trunk/pixelle/etc/pixelle.jnlp
    trunk/pixelle/pixelle.store

Modified: trunk/pixelle/etc/Pixelle.g
===================================================================
--- trunk/pixelle/etc/Pixelle.g	2012-03-12 02:57:00 UTC (rev 320)
+++ trunk/pixelle/etc/Pixelle.g	2012-03-18 04:52:16 UTC (rev 321)
@@ -69,20 +69,6 @@
 		
 		mv = cw.visitMethod(Opcodes.ACC_PRIVATE, "pixelAverage", "(DDDCLcom/mebigfatguy/pixelle/PixelleEval;)D", null, new String[0]);
         
-        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
-        mv.visitTypeInsn(Opcodes.NEW, "java/lang/StringBuilder");
-        mv.visitInsn(Opcodes.DUP);
-        mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/StringBuilder", "<init>", "()V");
-        mv.visitVarInsn(Opcodes.DLOAD, 1);
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(D)Ljava/lang/StringBuilder;");
-        mv.visitVarInsn(Opcodes.DLOAD, 3);
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(D)Ljava/lang/StringBuilder;");        
-        mv.visitVarInsn(Opcodes.DLOAD, 5);
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(D)Ljava/lang/StringBuilder;");
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "toString", "()Ljava/lang/String;");
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V");
-                   
-        
 		mv.visitVarInsn(Opcodes.DLOAD, 1);
 		mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "round", "(D)J");
 		mv.visitInsn(Opcodes.L2I);
@@ -121,7 +107,6 @@
         mv.visitJumpInsn(Opcodes.GOTO, xBranchBottom);
         Label xBranchTop = new Label();
         mv.visitLabel(xBranchTop);
-                
         mv.visitVarInsn(Opcodes.DLOAD, 12);
         mv.visitVarInsn(Opcodes.ALOAD, 8);
         mv.visitVarInsn(Opcodes.ILOAD, 17);
@@ -146,7 +131,7 @@
         mv.visitInsn(Opcodes.IMUL);
         mv.visitInsn(Opcodes.ICONST_1);
         mv.visitInsn(Opcodes.IADD);
-        mv.visitInsn(Opcodes.ICONST_2);
+        mv.visitInsn(Opcodes.DUP);
         mv.visitInsn(Opcodes.IMUL);
         mv.visitInsn(Opcodes.I2D);
         mv.visitInsn(Opcodes.DDIV);
@@ -739,7 +724,7 @@
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
             mv.visitInsn(Opcodes.ICONST_1);
             mv.visitInsn(Opcodes.ISUB);
-            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "remove", "(I)Ljava/lang/Object;");
             mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
             
@@ -749,7 +734,7 @@
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
             mv.visitInsn(Opcodes.ICONST_1);
             mv.visitInsn(Opcodes.ISUB);
-            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "remove", "(I)Ljava/lang/Object;");
             mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
             
@@ -759,7 +744,7 @@
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
             mv.visitInsn(Opcodes.ICONST_1);
             mv.visitInsn(Opcodes.ISUB);
-            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "remove", "(I)Ljava/lang/Object;");
             mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
             
@@ -769,7 +754,7 @@
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
             mv.visitInsn(Opcodes.ICONST_1);
             mv.visitInsn(Opcodes.ISUB);
-            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "remove", "(I)Ljava/lang/Object;");
             mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
                                     

Modified: trunk/pixelle/etc/pixelle.jnlp
===================================================================
--- trunk/pixelle/etc/pixelle.jnlp	2012-03-12 02:57:00 UTC (rev 320)
+++ trunk/pixelle/etc/pixelle.jnlp	2012-03-18 04:52:16 UTC (rev 321)
@@ -15,13 +15,11 @@
       <all-permissions/> 
   </security> 
   <resources> 
-    <j2se version="1.5+" initial-heap-size="500m" max-heap-size="1200m"/>
-    <jar href="pixelle-$VERSION.jar"/> 
-    <jar href="antlr-2.7.7.jar"/> 
-    <jar href="antlr-3.1b1.jar"/> 
-    <jar href="antlr-runtime-3.1b1.jar"/> 
-    <jar href="asm-3.1.jar"/> 
-    <jar href="stringtemplate-3.1.jar"/> 
+    <j2se version="1.6+" initial-heap-size="500m" max-heap-size="1200m"/>
+    <jar href="pixelle-$VERSION.jar"/>
+    <jar href="antlr-runtime-3.4.jar"/> 
+    <jar href="asm-3.3.1.jar"/> 
+    <jar href="stringtemplate-4.0.2.jar"/> 
   </resources> 
   <application-desc main-class="com.mebigfatguy.pixelle.Pixelle"/> 
 </jnlp> 

Modified: trunk/pixelle/pixelle.store
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[320] trunk/pixelle

From: <dbr...@us...> - 2012-03-12 02:57:06

Revision: 320
          http://pixelle.svn.sourceforge.net/pixelle/?rev=320&view=rev
Author:   dbrosius
Date:     2012-03-12 02:57:00 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
sync from github

Modified Paths:
--------------
    trunk/pixelle/etc/Pixelle.g
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties

Modified: trunk/pixelle/etc/Pixelle.g
===================================================================
--- trunk/pixelle/etc/Pixelle.g	2012-03-11 17:06:02 UTC (rev 319)
+++ trunk/pixelle/etc/Pixelle.g	2012-03-12 02:57:00 UTC (rev 320)
@@ -67,6 +67,92 @@
 		mv.visitInsn(Opcodes.RETURN);
 		mv.visitMaxs(0,0);
 		
+		mv = cw.visitMethod(Opcodes.ACC_PRIVATE, "pixelAverage", "(DDDCLcom/mebigfatguy/pixelle/PixelleEval;)D", null, new String[0]);
+        
+        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+        mv.visitTypeInsn(Opcodes.NEW, "java/lang/StringBuilder");
+        mv.visitInsn(Opcodes.DUP);
+        mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/StringBuilder", "<init>", "()V");
+        mv.visitVarInsn(Opcodes.DLOAD, 1);
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(D)Ljava/lang/StringBuilder;");
+        mv.visitVarInsn(Opcodes.DLOAD, 3);
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(D)Ljava/lang/StringBuilder;");        
+        mv.visitVarInsn(Opcodes.DLOAD, 5);
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(D)Ljava/lang/StringBuilder;");
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "toString", "()Ljava/lang/String;");
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V");
+                   
+        
+		mv.visitVarInsn(Opcodes.DLOAD, 1);
+		mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "round", "(D)J");
+		mv.visitInsn(Opcodes.L2I);
+		mv.visitVarInsn(Opcodes.ISTORE, 9);
+        mv.visitVarInsn(Opcodes.DLOAD, 3);
+        mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "round", "(D)J");
+        mv.visitInsn(Opcodes.L2I);
+        mv.visitVarInsn(Opcodes.ISTORE, 10);
+        mv.visitVarInsn(Opcodes.DLOAD, 5);
+        mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "round", "(D)J");
+        mv.visitInsn(Opcodes.L2I);
+        mv.visitVarInsn(Opcodes.ISTORE, 11);		
+		mv.visitInsn(Opcodes.DCONST_0);
+		mv.visitVarInsn(Opcodes.DSTORE, 12);
+		mv.visitVarInsn(Opcodes.ILOAD, 10);
+		mv.visitVarInsn(Opcodes.ILOAD, 11);
+		mv.visitInsn(Opcodes.IADD);
+        mv.visitVarInsn(Opcodes.ISTORE, 14);
+		mv.visitVarInsn(Opcodes.ILOAD, 9);
+        mv.visitVarInsn(Opcodes.ILOAD, 11);
+        mv.visitInsn(Opcodes.IADD);
+        mv.visitVarInsn(Opcodes.ISTORE, 15);
+        mv.visitVarInsn(Opcodes.ILOAD, 10);
+        mv.visitVarInsn(Opcodes.ILOAD, 11);
+        mv.visitInsn(Opcodes.ISUB);
+        mv.visitVarInsn(Opcodes.ISTORE, 16);
+        Label yBranchBottom = new Label();
+        mv.visitJumpInsn(Opcodes.GOTO, yBranchBottom);
+        Label yBranchTop = new Label();
+        mv.visitLabel(yBranchTop);
+        mv.visitVarInsn(Opcodes.ILOAD, 9);
+        mv.visitVarInsn(Opcodes.ILOAD, 11);        
+        mv.visitInsn(Opcodes.ISUB);
+        mv.visitVarInsn(Opcodes.ISTORE, 17);        
+        Label xBranchBottom = new Label();
+        mv.visitJumpInsn(Opcodes.GOTO, xBranchBottom);
+        Label xBranchTop = new Label();
+        mv.visitLabel(xBranchTop);
+                
+        mv.visitVarInsn(Opcodes.DLOAD, 12);
+        mv.visitVarInsn(Opcodes.ALOAD, 8);
+        mv.visitVarInsn(Opcodes.ILOAD, 17);
+        mv.visitVarInsn(Opcodes.ILOAD, 16);         
+        mv.visitVarInsn(Opcodes.ILOAD, 7);  
+        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getValue", "(IIC)D");
+        mv.visitInsn(Opcodes.DADD);
+        mv.visitVarInsn(Opcodes.DSTORE, 12);
+        mv.visitIincInsn(17, 1);
+        mv.visitLabel(xBranchBottom);
+        mv.visitVarInsn(Opcodes.ILOAD, 17);
+        mv.visitVarInsn(Opcodes.ILOAD, 15);
+        mv.visitJumpInsn(Opcodes.IF_ICMPLE, xBranchTop); 
+        mv.visitIincInsn(16, 1);
+        mv.visitLabel(yBranchBottom);
+        mv.visitVarInsn(Opcodes.ILOAD, 16);
+        mv.visitVarInsn(Opcodes.ILOAD, 14);
+        mv.visitJumpInsn(Opcodes.IF_ICMPLE, yBranchTop);
+        mv.visitVarInsn(Opcodes.DLOAD, 12);
+        mv.visitVarInsn(Opcodes.ILOAD, 11);
+        mv.visitInsn(Opcodes.ICONST_2);
+        mv.visitInsn(Opcodes.IMUL);
+        mv.visitInsn(Opcodes.ICONST_1);
+        mv.visitInsn(Opcodes.IADD);
+        mv.visitInsn(Opcodes.ICONST_2);
+        mv.visitInsn(Opcodes.IMUL);
+        mv.visitInsn(Opcodes.I2D);
+        mv.visitInsn(Opcodes.DDIV);
+        mv.visitInsn(Opcodes.DRETURN);
+        mv.visitMaxs(0,0);                                           
+
 		mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "eval", "([Lcom/mebigfatguy/pixelle/PixelleEval;II)D", null, new String[0]);
 		mv.visitVarInsn(Opcodes.ALOAD, 1);
 		mv.visitInsn(Opcodes.ARRAYLENGTH);
@@ -611,12 +697,95 @@
                        
             mv.visitLabel(exitLabel);
         }
-    |   PIXELAVERAGE '(' expr ',' expr ',' expr ')'
+    |   PIXELAVERAGE '(' expr ',' expr ',' expr ',' expr ',' spec=(R|G|B|T|S) ')'
         {
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP_X2);
             mv.visitInsn(Opcodes.POP);
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Double", "valueOf", "(D)Ljava/lang/Double;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "add", "(Ljava/lang/Object;)Z");
             mv.visitInsn(Opcodes.POP);
+            
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP_X2);
             mv.visitInsn(Opcodes.POP);
-            mv.visitInsn(Opcodes.DCONST_0);
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Double", "valueOf", "(D)Ljava/lang/Double;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "add", "(Ljava/lang/Object;)Z");
+            mv.visitInsn(Opcodes.POP);
+            
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP_X2);
+            mv.visitInsn(Opcodes.POP);
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Double", "valueOf", "(D)Ljava/lang/Double;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "add", "(Ljava/lang/Object;)Z");
+            mv.visitInsn(Opcodes.POP);
+            
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP_X2);
+            mv.visitInsn(Opcodes.POP);
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Double", "valueOf", "(D)Ljava/lang/Double;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "add", "(Ljava/lang/Object;)Z");
+            mv.visitInsn(Opcodes.POP);
+            
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
+            mv.visitInsn(Opcodes.ICONST_1);
+            mv.visitInsn(Opcodes.ISUB);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
+            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
+            
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
+            mv.visitInsn(Opcodes.ICONST_1);
+            mv.visitInsn(Opcodes.ISUB);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
+            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
+            
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
+            mv.visitInsn(Opcodes.ICONST_1);
+            mv.visitInsn(Opcodes.ISUB);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
+            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
+            
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
+            mv.visitInsn(Opcodes.ICONST_1);
+            mv.visitInsn(Opcodes.ISUB);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
+            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
+                                    
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "round", "(D)J");
+            mv.visitInsn(Opcodes.L2I);
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "abs", "(I)I");
+            mv.visitVarInsn(Opcodes.ALOAD, 1);
+            mv.visitInsn(Opcodes.ARRAYLENGTH);
+            mv.visitInsn(Opcodes.IREM);
+            mv.visitVarInsn(Opcodes.ALOAD, 1);
+            mv.visitInsn(Opcodes.SWAP);
+            mv.visitInsn(Opcodes.AALOAD);
+            String s = $spec.text; 
+            mv.visitLdcInsn(Character.valueOf(s.charAt(0))); 
+            mv.visitInsn(Opcodes.SWAP);
+            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, clz, "pixelAverage", "(DDDCLcom/mebigfatguy/pixelle/PixelleEval;)D");
         } ;
 
 

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2012-03-11 17:06:02 UTC (rev 319)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2012-03-12 02:57:00 UTC (rev 320)
@@ -308,10 +308,10 @@
 		addSimpleShortCutListener(piItem, "pi()");
 		addSimpleShortCutListener(randomItem, "random()");
 		
-		addSimpleShortCutListener(pixelInRectItem, "pixelInRect(t,l,b.r)");
-		addSimpleShortCutListener(pixelInCircleItem, "pixelInCircle(x,y,r)");
+		addSimpleShortCutListener(pixelInRectItem, "pixelInRect(t,l,b,r)");
+		addSimpleShortCutListener(pixelInCircleItem, "pixelInCircle(x,y,radius)");
 		addSimpleShortCutListener(pixelOnEdgeItem, "pixelOnEdge(e)");
-		addSimpleShortCutListener(pixelOnEdgeItem, "pixelAverage(x,y,s)");
+		addSimpleShortCutListener(pixelOnEdgeItem, "pixelAverage(x, y, size, source, color)");
 	}
 
 	private void addSimpleShortCutListener(JMenuItem mi, final String sc) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties	2012-03-11 17:06:02 UTC (rev 319)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties	2012-03-12 02:57:00 UTC (rev 320)
@@ -159,7 +159,7 @@
 label.pixelInRect = pixelInRect(t, l, b, r)
 label.pixelInCircle = pixelInCircle(cx, cy, r)
 label.pixelOnEdge = pixelOnEdge(e)
-label.pixelAverage = pixelAverage(x, y, s)
+label.pixelAverage = pixelAverage(x, y, size, source, color)
 
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[319] trunk/pixelle

From: <dbr...@us...> - 2012-03-11 17:06:10

Revision: 319
          http://pixelle.svn.sourceforge.net/pixelle/?rev=319&view=rev
Author:   dbrosius
Date:     2012-03-11 17:06:02 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
merge from github repository

Modified Paths:
--------------
    trunk/pixelle/.classpath
    trunk/pixelle/build.xml
    trunk/pixelle/etc/Pixelle.g
    trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties

Modified: trunk/pixelle/.classpath
===================================================================
--- trunk/pixelle/.classpath	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/.classpath	2012-03-11 17:06:02 UTC (rev 319)
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/antlr-2.7.7.jar"/>
-	<classpathentry kind="lib" path="lib/asm-3.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/antlr-3.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/antlr-runtime-3.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/stringtemplate-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-3.4.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-runtime-3.4.jar"/>
+	<classpathentry kind="lib" path="lib/asm-3.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/stringtemplate-4.0.2.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Modified: trunk/pixelle/build.xml
===================================================================
--- trunk/pixelle/build.xml	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/build.xml	2012-03-11 17:06:02 UTC (rev 319)
@@ -38,13 +38,11 @@
 	
 	<property name="pixelle.version" value="1.1.0"/>
 	
-	<property name="antlr-old.version" value="2.7.7"/>
-	<property name="antlr.version" value="3.1.3"/>
-	<property name="antlr-runtime.version" value="3.1.3"/>
-	<property name="stringtemplate.version" value="3.2.1"/>
-	<property name="asm.version" value="3.1"/>
+	<property name="antlr.version" value="3.4"/>
+	<property name="antlr-runtime.version" value="3.4"/>
+	<property name="stringtemplate.version" value="4.0.2"/>
+	<property name="asm.version" value="3.3.1"/>
 	
-    <property name="antlr-old-url" value="http://repo1.maven.org/maven2/antlr/antlr/${antlr-old.version}/antlr-${antlr-old.version}.jar"/> 
     <property name="antlr-url" value="http://repo1.maven.org/maven2/org/antlr/antlr/${antlr.version}/antlr-${antlr.version}.jar"/> 
     <property name="antlr-runtime-url" value="http://repo1.maven.org/maven2/org/antlr/antlr-runtime/${antlr-runtime.version}/antlr-runtime-${antlr-runtime.version}.jar"/> 
     <property name="stringtemplate-url" value="http://repo1.maven.org/maven2/org/antlr/stringtemplate/${stringtemplate.version}/stringtemplate-${stringtemplate.version}.jar"/> 
@@ -76,10 +74,6 @@
 		<echo message="pixelle.version = ${pixelle.version}" file="${src.dir}/com/mebigfatguy/pixelle/resources/version.properties"/>
 	</target>
 	
-	<target name="antlr-old-check">
-        <available file="${basedir}/lib/antlr-${antlr-old.version}.jar" property="antlr-old-exists"/>
-    </target>
-
 	<target name="antlr-check">
         <available file="${basedir}/lib/antlr-${antlr.version}.jar" property="antlr-exists"/>
     </target>
@@ -96,10 +90,6 @@
         <available file="${basedir}/lib/asm-${asm.version}.jar" property="asm-exists"/>
     </target>
 
-    <target name="install-antlr-old" depends="antlr-old-check" unless="antlr-old-exists" description="installs antlr-old.jar into lib">
-        <get src="${antlr-old-url}" dest="${basedir}/lib/antlr-${antlr-old.version}.jar" verbose="true" ignoreerrors="true"/>
-    </target>
-
 	<target name="install-antlr" depends="antlr-check" unless="antlr-exists" description="installs antlr.jar into lib">
         <get src="${antlr-url}" dest="${basedir}/lib/antlr-${antlr.version}.jar" verbose="true" ignoreerrors="true"/>
     </target>
@@ -116,12 +106,12 @@
         <get src="${asm-url}" dest="${basedir}/lib/asm-${asm.version}.jar" verbose="true" ignoreerrors="true"/>
     </target>
 
-	<target name="pull" depends="install-antlr-old, install-antlr, install-antlr-runtime, install-stringtemplate, install-asm" description="pull 3rdparty jars to the lib directory"/>
+	<target name="pull" depends="install-antlr, install-antlr-runtime, install-stringtemplate, install-asm" description="pull 3rdparty jars to the lib directory"/>
 
 	<target name="-gen" depends="pull" description="generate antlr files">
 		<exec executable="java" failonerror="true">
 		    <arg value="-classpath"/>
-		    <arg value="${lib.dir}/antlr-${antlr-old.version}.jar:${lib.dir}/antlr-${antlr.version}.jar:${lib.dir}/antlr-runtime-${antlr-runtime.version}.jar:${lib.dir}/stringtemplate-${stringtemplate.version}.jar"/>
+		    <arg value="${lib.dir}/antlr-${antlr.version}.jar:${lib.dir}/antlr-runtime-${antlr-runtime.version}.jar:${lib.dir}/stringtemplate-${stringtemplate.version}.jar"/>
 		    <arg value="org.antlr.Tool"/>
 		    <arg value="-target"/>
 		    <arg value="${etc.dir}/Pixelle.g"/>

Modified: trunk/pixelle/etc/Pixelle.g
===================================================================
--- trunk/pixelle/etc/Pixelle.g	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/etc/Pixelle.g	2012-03-11 17:06:02 UTC (rev 319)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -44,10 +44,16 @@
 
 		cw.visitField(Opcodes.ACC_PRIVATE, "width", "I", null, Integer.valueOf(0));
 		cw.visitField(Opcodes.ACC_PRIVATE, "height", "I", null, Integer.valueOf(0));
+		cw.visitField(Opcodes.ACC_PRIVATE, "stack", "Ljava/util/List;", "Ljava/lang/List<Ljava/lang/Double;>;", null);
 		
 		mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, new String[0]);
 		mv.visitVarInsn(Opcodes.ALOAD, 0);
 		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
+		mv.visitVarInsn(Opcodes.ALOAD, 0);
+		mv.visitTypeInsn(Opcodes.NEW, "java/util/ArrayList");
+        mv.visitInsn(Opcodes.DUP);
+        mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/util/ArrayList", "<init>", "()V");
+        mv.visitFieldInsn(Opcodes.PUTFIELD, clz, "stack", "Ljava/util/List;"); 
 		mv.visitInsn(Opcodes.RETURN);
 		mv.visitMaxs(0,0);
 		
@@ -275,8 +281,8 @@
 		}
 	)* ;
 
-unaryExpression : 
-		'!' unaryExpression
+unaryExpression 
+    :   '!' unaryExpression
 		{
 			Label falseLabel = new Label();
 			Label continueLabel = new Label();
@@ -296,129 +302,355 @@
 	|	factor ;
 
 factor	
-	:	NUMBER 
+    :	NUMBER 
 		{
 			mv.visitLdcInsn(Double.valueOf($NUMBER.text));
 		}
 	|	'(' expr ')'
-	|   'p' 
-		{
-			mv.visitVarInsn(Opcodes.ALOAD, 1);
-		}
-		( '(' selector=expr ')' )?
-		{
-			if ($selector.text == null)
-				mv.visitInsn(Opcodes.ICONST_0);
-			else 
-			{
-				mv.visitInsn(Opcodes.D2I);
-				mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "abs", "(I)I");
-			}
+	|   functionExpr
+	|   specialExpr
+    |   pixelExpr
+    |   locationExpr;
+		       
+pixelExpr 
+    :   P 
+        {
+            mv.visitVarInsn(Opcodes.ALOAD, 1);
+        }
+        ( '(' selector=expr ')' )?
+        {
+            if ($selector.text == null)
+                mv.visitInsn(Opcodes.ICONST_0);
+            else 
+            {
+                mv.visitInsn(Opcodes.D2I);
+                mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "abs", "(I)I");
+            }
 
-			mv.visitVarInsn(Opcodes.ILOAD, 4);
-			mv.visitInsn(Opcodes.IREM);
-			mv.visitInsn(Opcodes.AALOAD);
-		} 
-		'[' expr 
-		{ 
-			mv.visitInsn(Opcodes.D2I); 
-		} 
-		',' expr 
-		{ 
-			mv.visitInsn(Opcodes.D2I); 
-		} 
-		']' '.' spec=('r'|'g'|'b'|'t'|'s') 
-		{
-			String s = $spec.text; 
-			mv.visitLdcInsn(Character.valueOf(s.charAt(0))); 
-			mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getValue", "(IIC)D" );
-		} 
-	| 	'x' 
-		{
-			mv.visitVarInsn(Opcodes.ILOAD, 2); 
-			mv.visitInsn(Opcodes.I2D);
-		}
-	| 	'y' 
-		{
-			mv.visitVarInsn(Opcodes.ILOAD, 3); 
-			mv.visitInsn(Opcodes.I2D);
-		}
-	|	'width' 
-		{
-			mv.visitVarInsn(Opcodes.ALOAD, 0);
-			mv.visitFieldInsn(Opcodes.GETFIELD, clz, "width", "I");
-			mv.visitInsn(Opcodes.I2D);
-		}
-	|	'height' 
-		{
-			mv.visitVarInsn(Opcodes.ALOAD, 0);
-			mv.visitFieldInsn(Opcodes.GETFIELD, clz, "height", "I");
-			mv.visitInsn(Opcodes.I2D);
-		}
-	|	'abs' '(' expr ')' 
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "abs", "(D)D");
-		}
-	|	'max' '(' expr ',' expr ')' 
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "max", "(DD)D");
-		}
-	|	'min' '(' expr ',' expr ')' 
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "min", "(DD)D");
-		} 
-	|	'pow' '(' expr ',' expr ')' 
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "pow", "(DD)D");
-		} 
-	|	'sqrt' '(' expr ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "sqrt", "(D)D");
-		} 
-	|	'sin' '(' expr ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "sin", "(D)D");
-		} 
-	|	'cos' '(' expr ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "cos", "(D)D");
-		} 
-	|	'tan' '(' expr ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "tan", "(D)D");
-		} 
-	|	'asin' '(' expr ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "asin", "(D)D");
-		} 
-	|	'acos' '(' expr ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "acos", "(D)D");
-		} 
-	|	'atan' '(' expr ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "atan", "(D)D");
-		} 
-	|	'log' '(' expr ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "log", "(D)D");
-		} 
-	|	'exp' '(' expr ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "exp", "(D)D");
-		} 
-	|	'e' '(' ')'
-		{
-			mv.visitLdcInsn(Double.valueOf(Math.E));
-		}
-	|	'pi' '(' ')'
-		{
-			mv.visitLdcInsn(Double.valueOf(Math.PI));
-		}
-	|	'random' '(' ')'
-		{
-			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "random", "()D");
-		} ;
+            mv.visitVarInsn(Opcodes.ILOAD, 4);
+            mv.visitInsn(Opcodes.IREM);
+            mv.visitInsn(Opcodes.AALOAD);
+        } 
+        '[' expr 
+        { 
+            mv.visitInsn(Opcodes.D2I); 
+        } 
+        ',' expr 
+        { 
+            mv.visitInsn(Opcodes.D2I); 
+        } 
+        ']' '.' spec=(R|G|B|T|S) 
+        {
+            String s = $spec.text; 
+            mv.visitLdcInsn(Character.valueOf(s.charAt(0))); 
+            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getValue", "(IIC)D" );
+        };
+        
+locationExpr
+    :   X
+        {
+            mv.visitVarInsn(Opcodes.ILOAD, 2); 
+            mv.visitInsn(Opcodes.I2D);
+        }
+    |   Y 
+        {
+            mv.visitVarInsn(Opcodes.ILOAD, 3); 
+            mv.visitInsn(Opcodes.I2D);
+        }
+    |   WIDTH
+        {
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "width", "I");
+            mv.visitInsn(Opcodes.I2D);
+        }
+    |   HEIGHT 
+        {
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "height", "I");
+            mv.visitInsn(Opcodes.I2D);
+        }; 
+        
+functionExpr
+    :   ABS '(' expr ')' 
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "abs", "(D)D");
+        }
+    |   MAX '(' expr ',' expr ')' 
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "max", "(DD)D");
+        }
+    |   MIN '(' expr ',' expr ')' 
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "min", "(DD)D");
+        } 
+    |   POW '(' expr ',' expr ')' 
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "pow", "(DD)D");
+        } 
+    |   SQRT '(' expr ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "sqrt", "(D)D");
+        } 
+    |   SIN '(' expr ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "sin", "(D)D");
+        } 
+    |   COS '(' expr ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "cos", "(D)D");
+        } 
+    |   TAN '(' expr ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "tan", "(D)D");
+        } 
+    |   ASIN '(' expr ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "asin", "(D)D");
+        } 
+    |   ACOS '(' expr ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "acos", "(D)D");
+        } 
+    |   ATAN '(' expr ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "atan", "(D)D");
+        } 
+    |   LOG '(' expr ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "log", "(D)D");
+        } 
+    |   EXP '(' expr ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "exp", "(D)D");
+        } 
+    |   E '(' ')'
+        {
+            mv.visitLdcInsn(Double.valueOf(Math.E));
+        }
+    |   PI '(' ')'
+        {
+            mv.visitLdcInsn(Double.valueOf(Math.PI));
+        }
+    |   RANDOM '(' ')'
+        {
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "random", "()D");
+        } ;
+        
+specialExpr
+    @init
+    {
+        Label leftLabel = null;
+        Label rightLabel = null;        
+        Label topLabel = null;
+        Label bottomLabel = null;
+        Label failureLabel = null;
+        Label successLabel = null;
+        Label exitLabel = null;
+    }
+    :   PIXELINRECT '(' expr ',' expr ',' expr ',' expr ')'
+        {
+            exitLabel = new Label();
+            leftLabel = new Label();
+            rightLabel = new Label();
+            topLabel = new Label();
+            bottomLabel = new Label();
+            successLabel = new Label();
+                
+            mv.visitLabel(rightLabel);        
+            mv.visitVarInsn(Opcodes.ILOAD, 3);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DCMPG);
+            mv.visitJumpInsn(Opcodes.IFGE, bottomLabel);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.DCONST_0);
+            mv.visitJumpInsn(Opcodes.GOTO, exitLabel);
+            
+            mv.visitLabel(bottomLabel);                    
+            mv.visitVarInsn(Opcodes.ILOAD, 2);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DCMPG);
+            mv.visitJumpInsn(Opcodes.IFGE, leftLabel);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.DCONST_0);
+            mv.visitJumpInsn(Opcodes.GOTO, exitLabel);
+            
+            mv.visitLabel(leftLabel);  
+            mv.visitVarInsn(Opcodes.ILOAD, 3);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DCMPG);
+            mv.visitJumpInsn(Opcodes.IFLT, topLabel);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.DCONST_0);
+            mv.visitJumpInsn(Opcodes.GOTO, exitLabel);
+                        
+            mv.visitLabel(topLabel);  
+            mv.visitVarInsn(Opcodes.ILOAD, 2);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DCMPG);
+            mv.visitJumpInsn(Opcodes.IFLT, successLabel);
+            mv.visitInsn(Opcodes.DCONST_0);
+            mv.visitJumpInsn(Opcodes.GOTO, exitLabel);           
+            
+            mv.visitLabel(successLabel); 
+            mv.visitInsn(Opcodes.DCONST_1);
+            mv.visitLabel(exitLabel);
+        }
+    |   PIXELINCIRCLE '(' expr ',' expr ',' expr ')'
+        {
+            successLabel = new Label();
+            exitLabel = new Label();
+
+            mv.visitInsn(Opcodes.DUP2);
+            mv.visitInsn(Opcodes.DMUL);
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP_X2);
+            mv.visitInsn(Opcodes.POP);
+            mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Double", "valueOf", "(D)Ljava/lang/Double;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "add", "(Ljava/lang/Object;)Z");
+            mv.visitInsn(Opcodes.POP);
+            
+            mv.visitVarInsn(Opcodes.ILOAD, 3);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DSUB);
+            mv.visitInsn(Opcodes.DUP2);
+            mv.visitInsn(Opcodes.DMUL);
+            mv.visitInsn(Opcodes.DUP2_X2);
+            mv.visitInsn(Opcodes.POP2);
+            
+            mv.visitVarInsn(Opcodes.ILOAD, 2);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DSUB);
+            mv.visitInsn(Opcodes.DUP2);
+            mv.visitInsn(Opcodes.DMUL);
+            mv.visitInsn(Opcodes.DADD);
+            
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "stack", "Ljava/util/List;");
+            mv.visitInsn(Opcodes.DUP);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
+            mv.visitInsn(Opcodes.ICONST_1);
+            mv.visitInsn(Opcodes.ISUB);
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "remove", "(I)Ljava/lang/Object;");
+            mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
+            mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
+            mv.visitInsn(Opcodes.DCMPG);
+            mv.visitJumpInsn(Opcodes.IFLT, successLabel);
+            mv.visitInsn(Opcodes.DCONST_0);
+            mv.visitJumpInsn(Opcodes.GOTO, exitLabel);
+            
+            mv.visitLabel(successLabel);
+            mv.visitInsn(Opcodes.DCONST_1);         
+            mv.visitLabel(exitLabel);
+        }
+    |   PIXELONEDGE '(' expr ')'
+        {
+            exitLabel = new Label();
+            leftLabel = new Label();
+            rightLabel = new Label();
+            topLabel = new Label();
+            bottomLabel = new Label();
+            failureLabel = new Label();
+            
+            mv.visitLabel(leftLabel);
+            mv.visitInsn(Opcodes.DUP2);
+            mv.visitVarInsn(Opcodes.ILOAD, 2);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DCMPG);
+            mv.visitJumpInsn(Opcodes.IFLE, rightLabel);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.DCONST_1);
+            mv.visitJumpInsn(Opcodes.GOTO, exitLabel);
+            
+            mv.visitLabel(rightLabel);
+            mv.visitInsn(Opcodes.DUP2);
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "width", "I");
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DSUB);
+            mv.visitInsn(Opcodes.DNEG);
+            mv.visitVarInsn(Opcodes.ILOAD, 2);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DCMPG);
+            mv.visitJumpInsn(Opcodes.IFGE, topLabel);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.DCONST_1);
+            mv.visitJumpInsn(Opcodes.GOTO, exitLabel);
+            
+            mv.visitLabel(topLabel);
+            mv.visitInsn(Opcodes.DUP2);
+            mv.visitVarInsn(Opcodes.ILOAD, 3);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DCMPG);
+            mv.visitJumpInsn(Opcodes.IFLE, bottomLabel);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.DCONST_1);
+            mv.visitJumpInsn(Opcodes.GOTO, exitLabel);
+              
+            mv.visitLabel(bottomLabel);
+            mv.visitInsn(Opcodes.DUP2);
+            mv.visitVarInsn(Opcodes.ALOAD, 0);
+            mv.visitFieldInsn(Opcodes.GETFIELD, clz, "height", "I");
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DSUB);
+            mv.visitInsn(Opcodes.DNEG);
+            mv.visitVarInsn(Opcodes.ILOAD, 3);
+            mv.visitInsn(Opcodes.I2D);
+            mv.visitInsn(Opcodes.DCMPG);
+            mv.visitJumpInsn(Opcodes.IFGE, failureLabel);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.DCONST_1);
+            mv.visitJumpInsn(Opcodes.GOTO, exitLabel);
+            
+            mv.visitLabel(failureLabel);
+            mv.visitInsn(Opcodes.POP2);
+            mv.visitInsn(Opcodes.DCONST_0);  
+                       
+            mv.visitLabel(exitLabel);
+        }
+    |   PIXELAVERAGE '(' expr ',' expr ',' expr ')'
+        {
+            mv.visitInsn(Opcodes.POP);
+            mv.visitInsn(Opcodes.POP);
+            mv.visitInsn(Opcodes.POP);
+            mv.visitInsn(Opcodes.DCONST_0);
+        } ;
+
+
+ABS             : 'ABS';
+MAX             : 'MAX';
+MIN             : 'MIN';
+POW             : 'POW';
+SQRT            : 'SQRT';
+SIN             : 'SIN';
+COS             : 'COS';
+TAN             : 'TAN';
+ASIN            : 'ASIN';
+ACOS            : 'ACOS';
+ATAN            : 'ATAN';
+LOG             : 'LOG';    
+EXP             : 'EXP';
+E               : 'E';
+PI              : 'PI';
+RANDOM          : 'RANDOM';
+PIXELINRECT     : 'PIXELINRECT';
+PIXELINCIRCLE   : 'PIXELINCIRCLE';
+PIXELONEDGE     : 'PIXELONEDGE';
+PIXELAVERAGE    : 'PIXELAVERAGE';
+X               : 'X';
+Y               : 'Y';
+WIDTH           : 'WIDTH';
+HEIGHT          : 'HEIGHT';
+P               : 'P';
+R               : 'R';
+G               : 'G';
+B               : 'B';
+T               : 'T';
+S               : 'S';
+
 	
 NUMBER :   '0'..'9'+ ( '.' ('0'..'9'+))?;
 

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java	2012-03-11 17:06:02 UTC (rev 319)
@@ -42,6 +42,7 @@
 			String title = MessageFormat.format(PixelleBundle.getString(PixelleBundle.TITLE), PixelleBundle.getString(PixelleBundle.UNTITLED));
 			pf.setTitle(title);
 			Rectangle bounds = GuiUtils.getScreenBounds();
+			bounds.grow(-200, -200);
 			pf.setBounds(bounds);
 			pf.setVisible(true);
 		} catch (PixelleTransformException pte) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2012-03-11 17:06:02 UTC (rev 319)
@@ -142,6 +142,11 @@
 	public static final String E = "label.e";
 	public static final String PI = "label.pi";
 	public static final String RANDOM = "label.random";
+	public static final String SPECIAL = "label.special";
+	public static final String PIXEL_IN_RECT = "label.pixelInRect";
+	public static final String PIXEL_IN_CIRCLE = "label.pixelInCircle";
+	public static final String PIXEL_ON_EDGE = "label.pixelOnEdge";
+	public static final String PIXEL_AVERAGE = "label.pixelAverage";
 
 
 	private static ResourceBundle rb = ResourceBundle.getBundle("com/mebigfatguy/pixelle/resources/pixelle");

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2012-03-11 17:06:02 UTC (rev 319)
@@ -276,6 +276,10 @@
 		}
 	}
 	
+	public ZoomLevel getZoom() {
+	    return panel.getZoom();
+	}
+	
 	public final void setZoom(final ZoomLevel zoom) {
 		panel.setZoom(zoom);
 		panel.invalidate();
@@ -373,6 +377,10 @@
 			}
 		}
 		
+		public ZoomLevel getZoom() {
+		    return zoom;
+		}
+		
 		public void setZoom(ZoomLevel zoomLevel) {
 			zoom = zoomLevel;
 		}

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java	2012-03-11 17:06:02 UTC (rev 319)
@@ -116,7 +116,7 @@
 				currentComponent = entry.getKey().name();
 				currentAlgorithm = entry.getValue();
 
-				CharStream cs = new ANTLRStringStream(currentAlgorithm);
+				CharStream cs = new ANTLRCaseInsensitiveStringStream(currentAlgorithm);
 				PixelleLexer pl = new PixelleLexer(cs);
 				CommonTokenStream tokens = new CommonTokenStream();
 				tokens.setTokenSource(pl);
@@ -179,5 +179,27 @@
 			}
 		}
 	}
+	
+	class ANTLRCaseInsensitiveStringStream extends ANTLRStringStream
+	{
+	    public ANTLRCaseInsensitiveStringStream(String text) throws IOException {
+	        super(text);
+	    }
+	    
+	    public int LA(int i) {
+	        if ( i==0 ) {
+	            return 0;
+	        }
+	        if ( i<0 ) {
+	            i++;
+	        }
+	 
+	        if ( (p+i-1) >= n ) {
+	 
+	            return CharStream.EOF;
+	        }
+	        return Character.toUpperCase(data[p+i-1]);
+	    }
+	}
 
 }

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java	2012-03-11 17:06:02 UTC (rev 319)
@@ -18,6 +18,7 @@
  */
 package com.mebigfatguy.pixelle.actions;
 
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
@@ -45,7 +46,9 @@
 	public void actionPerformed(ActionEvent e) {
 		try {
 			PixelleFrame pf = new PixelleFrame();
-			pf.setBounds(GuiUtils.getScreenBounds());
+			Rectangle bounds = GuiUtils.getScreenBounds();
+			bounds.grow(-200, -200);
+			pf.setBounds(bounds);
 			pf.setVisible(true);
 			FrameMgr.getInstance().add(pf);
 		} catch (PixelleTransformException pte) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java	2012-03-11 17:06:02 UTC (rev 319)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,6 +18,7 @@
  */
 package com.mebigfatguy.pixelle.actions;
 
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.util.Locale;
@@ -80,7 +81,9 @@
 				lastDir = f.getParentFile();
 				PixelleFrame pf = new PixelleFrame();
 				pf.openFile(f);
-				pf.setBounds(GuiUtils.getScreenBounds());
+				Rectangle bounds = GuiUtils.getScreenBounds();
+	            bounds.grow(-200, -200);
+	            pf.setBounds(bounds);
 				pf.setVisible(true);
 				FrameMgr.getInstance().add(pf);
 			} catch (PixelleTransformException pte) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java	2012-03-11 17:06:02 UTC (rev 319)
@@ -18,6 +18,7 @@
  */
 package com.mebigfatguy.pixelle.actions;
 
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.text.MessageFormat;
 
@@ -59,6 +60,12 @@
 				if (dstImage != null) {
 					if (frame.createNewWindow()) {
 						PixelleFrame f = new PixelleFrame(dstImage);
+						f.setSize(frame.getSize());
+						Point location = frame.getLocation();
+						location.x += 20;
+						location.y += 20;
+						f.setLocation(location);
+						f.setZoom(((PixelleFrame) frame).getZoom());
 						String title = MessageFormat.format(PixelleBundle.getString(PixelleBundle.TITLE), PixelleBundle.getString(PixelleBundle.UNTITLED));
 						f.setTitle(title);
 						f.setVisible(true);

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2012-03-11 17:06:02 UTC (rev 319)
@@ -248,6 +248,19 @@
 		functionMenu.add(randomItem);
 
 		shortcuts.add(functionMenu);
+		
+		JMenu specialMenu = new JMenu(PixelleBundle.getString(PixelleBundle.SPECIAL));
+        JMenuItem pixelInRectItem = new JMenuItem(PixelleBundle.getString(PixelleBundle.PIXEL_IN_RECT));
+        JMenuItem pixelInCircleItem = new JMenuItem(PixelleBundle.getString(PixelleBundle.PIXEL_IN_CIRCLE));
+        JMenuItem pixelOnEdgeItem = new JMenuItem(PixelleBundle.getString(PixelleBundle.PIXEL_ON_EDGE));
+        JMenuItem pixelAverageItem = new JMenuItem(PixelleBundle.getString(PixelleBundle.PIXEL_AVERAGE));
+        
+        specialMenu.add(pixelInRectItem);
+        specialMenu.add(pixelInCircleItem);
+        specialMenu.add(pixelOnEdgeItem);
+        specialMenu.add(pixelAverageItem);
+        
+        shortcuts.add(specialMenu);
 
 		addSimpleShortCutListener(redSpecItem, "p(0)[x,y].r");
 		addSimpleShortCutListener(greenSpecItem, "p(0)[x,y].g");
@@ -294,6 +307,11 @@
 		addSimpleShortCutListener(eItem, "e()");
 		addSimpleShortCutListener(piItem, "pi()");
 		addSimpleShortCutListener(randomItem, "random()");
+		
+		addSimpleShortCutListener(pixelInRectItem, "pixelInRect(t,l,b.r)");
+		addSimpleShortCutListener(pixelInCircleItem, "pixelInCircle(x,y,r)");
+		addSimpleShortCutListener(pixelOnEdgeItem, "pixelOnEdge(e)");
+		addSimpleShortCutListener(pixelOnEdgeItem, "pixelAverage(x,y,s)");
 	}
 
 	private void addSimpleShortCutListener(JMenuItem mi, final String sc) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java	2012-03-11 17:06:02 UTC (rev 319)
@@ -31,10 +31,11 @@
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JColorChooser;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.border.EmptyBorder;
 
 import com.mebigfatguy.pixelle.ColorOutOfBoundsOption;
 import com.mebigfatguy.pixelle.IndexOutOfBoundsOption;
@@ -46,14 +47,14 @@
 
 	private static final long serialVersionUID = -2593224982080676492L;
 	
-	private JCheckBox colorBox = new JCheckBox(PixelleBundle.getString(PixelleBundle.STATIC_COLOR));
-	private JCheckBox borderColorBox = new JCheckBox(PixelleBundle.getString(PixelleBundle.BORDER_COLOR));
-	private JCheckBox wrappedColorBox = new JCheckBox(PixelleBundle.getString(PixelleBundle.WRAPPED_COLOR));
+	private JRadioButton colorRadio = new JRadioButton(PixelleBundle.getString(PixelleBundle.STATIC_COLOR));
+	private JRadioButton borderColorRadio = new JRadioButton(PixelleBundle.getString(PixelleBundle.BORDER_COLOR));
+	private JRadioButton wrappedColorRadio = new JRadioButton(PixelleBundle.getString(PixelleBundle.WRAPPED_COLOR));
 	private ColorButton colorButton = new ColorButton(Color.WHITE);
 	
-	private JCheckBox clipBox = new JCheckBox(PixelleBundle.getString(PixelleBundle.CLIP_COLOR));
-	private JCheckBox rollBox = new JCheckBox(PixelleBundle.getString(PixelleBundle.ROLL_COLOR));
-	private JCheckBox waveBox = new JCheckBox(PixelleBundle.getString(PixelleBundle.WAVE_COLOR));
+	private JRadioButton clipRadio = new JRadioButton(PixelleBundle.getString(PixelleBundle.CLIP_COLOR));
+	private JRadioButton rollRadio = new JRadioButton(PixelleBundle.getString(PixelleBundle.ROLL_COLOR));
+	private JRadioButton waveRadio = new JRadioButton(PixelleBundle.getString(PixelleBundle.WAVE_COLOR));
 	
 	private JButton ok = new JButton(PixelleBundle.getString(PixelleBundle.OK));
 	private JButton cancel = new JButton(PixelleBundle.getString(PixelleBundle.CANCEL));
@@ -73,18 +74,18 @@
 	}
 	
 	public boolean isOK() {
-		if (clipBox.isSelected())
+		if (clipRadio.isSelected())
 			coobOption = ColorOutOfBoundsOption.Clip;
-		else if (rollBox.isSelected())
+		else if (rollRadio.isSelected())
 			coobOption = ColorOutOfBoundsOption.Roll;
 		else
 			coobOption = ColorOutOfBoundsOption.Wave;
 		
-		if (colorBox.isSelected()) {
+		if (colorRadio.isSelected()) {
 			ioobOption = IndexOutOfBoundsOption.SpecifiedColor;
 			ioobOption.setColor(color);
 		}
-		else if (borderColorBox.isSelected())
+		else if (borderColorRadio.isSelected())
 			ioobOption = IndexOutOfBoundsOption.BorderColor;
 		else
 			ioobOption = IndexOutOfBoundsOption.WrapColor;
@@ -101,90 +102,93 @@
 	
 	private void initComponents() {
 		Container cp = getContentPane();
-		cp.setLayout(new BoxLayout(cp, BoxLayout.Y_AXIS));
 		
-		cp.add(Box.createVerticalStrut(5));
+		JPanel mainPanel = new JPanel();
+		mainPanel.setBorder(new EmptyBorder(10, 10, 5, 10));
+		mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+		
+		mainPanel.add(Box.createVerticalStrut(5));
 
 		{
 			JPanel p = new JPanel();
 			p.setLayout(new GridLayout(3, 1));
 			p.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), PixelleBundle.getString(PixelleBundle.COLOR_OUT_OF_BOUNDS_PIXELS)));
 
-			GuiUtils.sizeUniformly(GuiUtils.Sizing.Height, clipBox, rollBox, waveBox);
+			GuiUtils.sizeUniformly(GuiUtils.Sizing.Height, clipRadio, rollRadio, waveRadio);
 			
-			p.add(clipBox);
-			p.add(rollBox);
-			p.add(waveBox);
+			p.add(clipRadio);
+			p.add(rollRadio);
+			p.add(waveRadio);
 			
 			ButtonGroup g = new ButtonGroup();
-			g.add(clipBox);
-			g.add(rollBox);
-			g.add(waveBox);
+			g.add(clipRadio);
+			g.add(rollRadio);
+			g.add(waveRadio);
 			
 			switch (coobOption) {
 				case Clip:
-					clipBox.setSelected(true);
+					clipRadio.setSelected(true);
 				break;
 				
 				case Roll:
-					rollBox.setSelected(true);
+					rollRadio.setSelected(true);
 				break;
 				
 				case Wave:
-					waveBox.setSelected(true);
+					waveRadio.setSelected(true);
 				break;
 			}
 			
-			cp.add(p);
+			mainPanel.add(p);
 		}
 	
-		cp.add(Box.createVerticalStrut(5));
-		cp.add(Box.createVerticalGlue());
+		mainPanel.add(Box.createVerticalStrut(5));
+		mainPanel.add(Box.createVerticalGlue());
 		
 		{
 			JPanel p = new JPanel();
 			p.setLayout(new GridLayout(3, 1));
 			p.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), PixelleBundle.getString(PixelleBundle.INDEX_OUT_OF_BOUNDS_PIXELS)));
 			
-			GuiUtils.sizeUniformly(GuiUtils.Sizing.Height, colorBox, colorButton, borderColorBox, wrappedColorBox);
+			GuiUtils.sizeUniformly(GuiUtils.Sizing.Height, colorRadio, colorButton, borderColorRadio, wrappedColorRadio);
 			
 			colorButton.setColor(color);
 			
 			JPanel colorP = new JPanel();
 			colorP.setLayout(new BoxLayout(colorP, BoxLayout.X_AXIS));
-			colorP.add(colorBox);
+			colorP.add(colorRadio);
 			colorP.add(Box.createHorizontalStrut(5));
 			colorP.add(colorButton);
 			colorP.add(Box.createHorizontalGlue());
 			
 			p.add(colorP);
-			p.add(borderColorBox);
-			p.add(wrappedColorBox);
+			p.add(borderColorRadio);
+			p.add(wrappedColorRadio);
 			
 			ButtonGroup g = new ButtonGroup();
-			g.add(colorBox);
-			g.add(borderColorBox);
-			g.add(wrappedColorBox);
+			g.add(colorRadio);
+			g.add(borderColorRadio);
+			g.add(wrappedColorRadio);
 			
 			switch (ioobOption) {
 				case SpecifiedColor:
-					colorBox.setSelected(true);
+					colorRadio.setSelected(true);
 				break;
 				
 				case BorderColor:
-					borderColorBox.setSelected(true);
+					borderColorRadio.setSelected(true);
 				break;
 				
 				case WrapColor:
-					wrappedColorBox.setSelected(true);
+					wrappedColorRadio.setSelected(true);
 				break;
 			}
 			
-			cp.add(p);
+			mainPanel.add(p);
 		}
 		
-		cp.add(Box.createVerticalStrut(5));
-		cp.add(Box.createVerticalGlue());
+		mainPanel.add(Box.createVerticalStrut(5));
+		mainPanel.add(Box.createVerticalGlue());
 		
 		{
 			JPanel p = new JPanel();
@@ -197,10 +201,12 @@
 			p.add(Box.createHorizontalStrut(10));
 			p.add(cancel);
 			p.add(Box.createHorizontalGlue());
-			cp.add(p);
+			mainPanel.add(p);
 		}
 		
-		cp.add(Box.createVerticalStrut(5));
+		mainPanel.add(Box.createVerticalStrut(5));
+		
+		cp.add(mainPanel);
 	}
 	
 	private void initListeners() {
@@ -228,7 +234,7 @@
 		
 		colorButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent ae) {
-				colorBox.setSelected(true);
+				colorRadio.setSelected(true);
 				Color chosenColor = JColorChooser.showDialog(PixelleOptionsDialog.this, PixelleBundle.getString(PixelleBundle.PICK_COLOR), color);
 				if (chosenColor != null) {
 					color = chosenColor;

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties	2012-01-16 00:00:58 UTC (rev 318)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties	2012-03-11 17:06:02 UTC (rev 319)
@@ -94,7 +94,6 @@
 
 label.x = x
 label.y = y
-label.color = color
 
 tooltip.inspector = Click in the frame's window to freeze the inspector value, and click again to unfreeze
 
@@ -156,4 +155,12 @@
 label.pi = pi()
 label.random = random()
 
+label.special = Special
+label.pixelInRect = pixelInRect(t, l, b, r)
+label.pixelInCircle = pixelInCircle(cx, cy, r)
+label.pixelOnEdge = pixelOnEdge(e)
+label.pixelAverage = pixelAverage(x, y, s)
 
+
+
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[318] trunk/pixelle

From: <dbr...@us...> - 2012-01-16 00:01:05

Revision: 318
          http://pixelle.svn.sourceforge.net/pixelle/?rev=318&view=rev
Author:   dbrosius
Date:     2012-01-16 00:00:58 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
update from git repo

Modified Paths:
--------------
    trunk/pixelle/.classpath
    trunk/pixelle/build.xml
    trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/SelectionOutliner.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/EditorFontFactory.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
    trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle_de.properties
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java

Modified: trunk/pixelle/.classpath
===================================================================
--- trunk/pixelle/.classpath	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/.classpath	2012-01-16 00:00:58 UTC (rev 318)
@@ -2,10 +2,10 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="lib/antlr-2.7.7.jar"/>
-	<classpathentry kind="lib" path="lib/antlr-3.1b1.jar"/>
-	<classpathentry kind="lib" path="lib/antlr-runtime-3.1b1.jar"/>
 	<classpathentry kind="lib" path="lib/asm-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/stringtemplate-3.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/antlr-3.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-runtime-3.1.3.jar"/>
+	<classpathentry kind="lib" path="lib/stringtemplate-3.2.1.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Modified: trunk/pixelle/build.xml
===================================================================
--- trunk/pixelle/build.xml	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/build.xml	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,7 +1,7 @@
 <!--
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -38,6 +38,23 @@
 	
 	<property name="pixelle.version" value="1.1.0"/>
 	
+	<property name="antlr-old.version" value="2.7.7"/>
+	<property name="antlr.version" value="3.1.3"/>
+	<property name="antlr-runtime.version" value="3.1.3"/>
+	<property name="stringtemplate.version" value="3.2.1"/>
+	<property name="asm.version" value="3.1"/>
+	
+    <property name="antlr-old-url" value="http://repo1.maven.org/maven2/antlr/antlr/${antlr-old.version}/antlr-${antlr-old.version}.jar"/> 
+    <property name="antlr-url" value="http://repo1.maven.org/maven2/org/antlr/antlr/${antlr.version}/antlr-${antlr.version}.jar"/> 
+    <property name="antlr-runtime-url" value="http://repo1.maven.org/maven2/org/antlr/antlr-runtime/${antlr-runtime.version}/antlr-runtime-${antlr-runtime.version}.jar"/> 
+    <property name="stringtemplate-url" value="http://repo1.maven.org/maven2/org/antlr/stringtemplate/${stringtemplate.version}/stringtemplate-${stringtemplate.version}.jar"/> 
+    <property name="asm-url" value="http://repo1.maven.org/maven2/asm/asm/${asm.version}/asm-${asm.version}.jar"/> 
+
+	<path id="pixelle.classpath">
+		<pathelement location="${lib.dir}/antlr-runtime-${antlr-runtime.version}.jar"/>
+		<pathelement location="${lib.dir}/asm-${asm.version}.jar"/>
+	</path>
+	
 	<target name="clean" description="removes all generated collateral">
 		<delete dir="${classes.dir}"/>
 		<delete dir="${antlr.gen.dir}"/>
@@ -51,21 +68,60 @@
 	
 	<target name="-init" description="prepares repository for a build">
 		<mkdir dir="${classes.dir}"/>
+		<mkdir dir="${lib.dir}"/>
 		<mkdir dir="${antlr.gen.dir}"/>
 		<mkdir dir="${src.dir}/com/mebigfatguy"/>
 		<mkdir dir="${javadoc.dir}"/>
 		<mkdir dir="${jnlp.dir}"/>
-		<path id="pixelle.classpath">
-			<pathelement location="${lib.dir}/antlr-runtime-3.1b1.jar"/>
-			<pathelement location="${lib.dir}/asm-3.1.jar"/>
-		</path>
 		<echo message="pixelle.version = ${pixelle.version}" file="${src.dir}/com/mebigfatguy/pixelle/resources/version.properties"/>
 	</target>
 	
-	<target name="-gen" description="generate antlr files">
+	<target name="antlr-old-check">
+        <available file="${basedir}/lib/antlr-${antlr-old.version}.jar" property="antlr-old-exists"/>
+    </target>
+
+	<target name="antlr-check">
+        <available file="${basedir}/lib/antlr-${antlr.version}.jar" property="antlr-exists"/>
+    </target>
+
+	<target name="antlr-runtime-check">
+        <available file="${basedir}/lib/antlr-runtime-${antlr-runtime.version}.jar" property="antlr-runtime-exists"/>
+    </target>
+
+	<target name="stringtemplate-check">
+        <available file="${basedir}/lib/stringtemplate-${stringtemplate.version}.jar" property="stringtemplate-exists"/>
+    </target>
+
+	<target name="asm-check">
+        <available file="${basedir}/lib/asm-${asm.version}.jar" property="asm-exists"/>
+    </target>
+
+    <target name="install-antlr-old" depends="antlr-old-check" unless="antlr-old-exists" description="installs antlr-old.jar into lib">
+        <get src="${antlr-old-url}" dest="${basedir}/lib/antlr-${antlr-old.version}.jar" verbose="true" ignoreerrors="true"/>
+    </target>
+
+	<target name="install-antlr" depends="antlr-check" unless="antlr-exists" description="installs antlr.jar into lib">
+        <get src="${antlr-url}" dest="${basedir}/lib/antlr-${antlr.version}.jar" verbose="true" ignoreerrors="true"/>
+    </target>
+	
+    <target name="install-antlr-runtime" depends="antlr-runtime-check" unless="antlr-runtime-exists" description="installs antlr-runtime.jar into lib">
+        <get src="${antlr-runtime-url}" dest="${basedir}/lib/antlr-runtime-${antlr-runtime.version}.jar" verbose="true" ignoreerrors="true"/>
+    </target>
+
+    <target name="install-stringtemplate" depends="stringtemplate-check" unless="stringtemplate-exists" description="installs stringtemplate.jar into lib">
+        <get src="${stringtemplate-url}" dest="${basedir}/lib/stringtemplate-${stringtemplate.version}.jar" verbose="true" ignoreerrors="true"/>
+    </target>
+
+    <target name="install-asm" depends="asm-check" unless="asm-exists" description="installs asm.jar into lib">
+        <get src="${asm-url}" dest="${basedir}/lib/asm-${asm.version}.jar" verbose="true" ignoreerrors="true"/>
+    </target>
+
+	<target name="pull" depends="install-antlr-old, install-antlr, install-antlr-runtime, install-stringtemplate, install-asm" description="pull 3rdparty jars to the lib directory"/>
+
+	<target name="-gen" depends="pull" description="generate antlr files">
 		<exec executable="java" failonerror="true">
 		    <arg value="-classpath"/>
-		    <arg value="${lib.dir}/antlr-2.7.7.jar:${lib.dir}/antlr-3.1b1.jar:${lib.dir}/antlr-runtime-3.1b1.jar:${lib.dir}/stringtemplate-3.1.jar"/>
+		    <arg value="${lib.dir}/antlr-${antlr-old.version}.jar:${lib.dir}/antlr-${antlr.version}.jar:${lib.dir}/antlr-runtime-${antlr-runtime.version}.jar:${lib.dir}/stringtemplate-${stringtemplate.version}.jar"/>
 		    <arg value="org.antlr.Tool"/>
 		    <arg value="-target"/>
 		    <arg value="${etc.dir}/Pixelle.g"/>
@@ -104,7 +160,8 @@
 				source="${javac.source}"
 				target="${javac.target}"
 				deprecation="${javac.deprecation}"
-				debug="${javac.debug}">
+				debug="${javac.debug}"
+				includeantruntime="false">
 			<classpath refid="pixelle.classpath"/>
 		</javac>
 	</target>
@@ -155,7 +212,7 @@
 				 destdir="${javadoc.dir}"
 				 windowtitle="pixelle api">
 		    <doctitle><![CDATA[<h1>pixelle javadoc</h1>]]></doctitle>
-		    <bottom><![CDATA[<i>Copyright &#169; 2008-2010 MeBigFatGuy.com. All Rights Reserved.</i>]]></bottom>
+		    <bottom><![CDATA[<i>Copyright &#169; 2008-2012 MeBigFatGuy.com. All Rights Reserved.</i>]]></bottom>
 		</javadoc>
 	</target>
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/SelectionOutliner.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/SelectionOutliner.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/SelectionOutliner.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/EditorFontFactory.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/EditorFontFactory.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/EditorFontFactory.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,5 +1,5 @@
 # * pixelle - Graphics algorithmic editor
-# * Copyright (C) 2008-2010 Dave Brosius
+# * Copyright (C) 2008-2012 Dave Brosius
 # * 
 # * This library is free software; you can redistribute it and/or
 # * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle_de.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle_de.properties	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle_de.properties	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,5 +1,5 @@
 # * pixelle - Graphics algorithmic editor
-# * Copyright (C) 2008-2010 Dave Brosius
+# * Copyright (C) 2008-2012 Dave Brosius
 # * 
 # * This library is free software; you can redistribute it and/or
 # * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java	2012-01-15 23:59:02 UTC (rev 317)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java	2012-01-16 00:00:58 UTC (rev 318)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2010 Dave Brosius
+ * Copyright (C) 2008-2012 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[317] trunk/pixelle/lib

From: <dbr...@us...> - 2012-01-15 23:59:08

Revision: 317
          http://pixelle.svn.sourceforge.net/pixelle/?rev=317&view=rev
Author:   dbrosius
Date:     2012-01-15 23:59:02 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
remove libraries from the repo

Removed Paths:
-------------
    trunk/pixelle/lib/antlr-2.7.7.jar
    trunk/pixelle/lib/antlr-3.1b1.jar
    trunk/pixelle/lib/antlr-runtime-3.1b1.jar
    trunk/pixelle/lib/asm-3.1.jar
    trunk/pixelle/lib/stringtemplate-3.1.jar

Deleted: trunk/pixelle/lib/antlr-2.7.7.jar
===================================================================
(Binary files differ)

Deleted: trunk/pixelle/lib/antlr-3.1b1.jar
===================================================================
(Binary files differ)

Deleted: trunk/pixelle/lib/antlr-runtime-3.1b1.jar
===================================================================
(Binary files differ)

Deleted: trunk/pixelle/lib/asm-3.1.jar
===================================================================
(Binary files differ)

Deleted: trunk/pixelle/lib/stringtemplate-3.1.jar
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[316] trunk/pixelle/src/com/mebigfatguy/pixelle

From: <dbr...@us...> - 2010-06-12 05:43:27

Revision: 316
          http://pixelle.svn.sourceforge.net/pixelle/?rev=316&view=rev
Author:   dbrosius
Date:     2010-06-12 05:43:20 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
warnings

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/CloseFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/InspectorAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/PrintAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/QuitAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAsAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformNewWindowAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/actions/ZoomAction.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/CloseFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/CloseFileAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/CloseFileAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.FrameMgr;
@@ -34,7 +35,7 @@
 	
 	public CloseFileAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.CLOSE_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/InspectorAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/InspectorAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/InspectorAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -33,7 +34,7 @@
 	
 	public InspectorAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.INSPECTOR_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('I', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('I', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/NewFileAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
@@ -37,7 +38,7 @@
 	
 	public NewFileAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.NEW_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('N', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('N', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OpenFileAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -24,6 +24,7 @@
 
 import javax.imageio.ImageIO;
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
@@ -43,7 +44,7 @@
 	
 	public OpenFileAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.OPEN_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/OptionsAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -36,7 +37,7 @@
 	
 	public OptionsAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.OPTIONS_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', ActionEvent.SHIFT_MASK | ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', ActionEvent.SHIFT_MASK | ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/PrintAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/PrintAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/PrintAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -32,7 +33,7 @@
 
 	public PrintAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.PRINT_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('P', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('P', ActionEvent.CTRL_MASK));
 	}
 	
 	public void actionPerformed(ActionEvent e) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/QuitAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/QuitAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/QuitAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -22,6 +22,7 @@
 import java.util.Set;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JFrame;
 import javax.swing.KeyStroke;
 
@@ -34,7 +35,7 @@
 
 	public QuitAction() {
 		super(PixelleBundle.getString(PixelleBundle.QUIT_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Q', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Q', ActionEvent.CTRL_MASK));
 	}
 	
 	public void actionPerformed(ActionEvent e) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -24,6 +24,7 @@
 
 import javax.imageio.ImageIO;
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
@@ -34,12 +35,12 @@
 	
 	private static final long serialVersionUID = -8339987202623985741L;
 	
-	private PixelleFrame frame;
-	private SaveFileAsAction saveAsAction;
+	private final PixelleFrame frame;
+	private final SaveFileAsAction saveAsAction;
 
 	public SaveFileAction(PixelleFrame pf, SaveFileAsAction action) {
 		super(PixelleBundle.getString(PixelleBundle.SAVE_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('S', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('S', ActionEvent.CTRL_MASK));
 		frame = pf;
 		saveAsAction = action;
 	}

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAsAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAsAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/SaveFileAsAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -26,6 +26,7 @@
 
 import javax.imageio.ImageIO;
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
@@ -38,11 +39,11 @@
 	
 	private static final long serialVersionUID = 548030636198842553L;
 	 
-	private PixelleFrame frame;
+	private final PixelleFrame frame;
 
 	public SaveFileAsAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.SAVEAS_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('A', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('A', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -22,6 +22,7 @@
 import java.text.MessageFormat;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
@@ -40,7 +41,7 @@
 	
 	public TransformAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.TRANSFORM_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('T', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('T', ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformNewWindowAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformNewWindowAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/TransformNewWindowAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -33,7 +34,7 @@
 	
 	public TransformNewWindowAction(PixelleFrame pf) {
 		super(PixelleBundle.getString(PixelleBundle.TRANSFORM_NEW_ITEM));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', ActionEvent.SHIFT_MASK | ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', ActionEvent.SHIFT_MASK | ActionEvent.CTRL_MASK));
 		frame = pf;
 	}
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/actions/ZoomAction.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/actions/ZoomAction.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/actions/ZoomAction.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -21,6 +21,7 @@
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.KeyStroke;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
@@ -35,7 +36,7 @@
 	
 	public ZoomAction(PixelleFrame pf, ZoomLevel level) {
 		super(PixelleBundle.getString(level.getKey()));
-		putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Z', ActionEvent.CTRL_MASK));
+		putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Z', ActionEvent.CTRL_MASK));
 		frame = pf;
 		zoom = level;
 	}

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -39,6 +39,7 @@
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
+import javax.swing.WindowConstants;
 
 import com.mebigfatguy.pixelle.PixelleBundle;
 import com.mebigfatguy.pixelle.PixelleComponent;
@@ -113,7 +114,7 @@
 	}
 
 	private void initListeners() {
-		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
 		ok.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent ae) {

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -53,6 +53,7 @@
 import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
@@ -77,7 +78,7 @@
 		for (PixelleComponent comp : PixelleComponent.rgbValues()) {
 			rgbLHS.put(comp, new JLabel(PixelleBundle.getString("formula." + comp.name().toLowerCase()) + " = "));
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JTextField> rgbEditor = new EnumMap<PixelleComponent, JTextField>(PixelleComponent.class);
 	{
@@ -86,21 +87,21 @@
 			tf.setFont(EditorFontFactory.getEditorFont());
 			rgbEditor.put(comp, tf);
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JLabel> rgbLabels = new EnumMap<PixelleComponent, JLabel>(PixelleComponent.class);
 	{
 		for (PixelleComponent comp : PixelleComponent.rgbValues()) {
 			rgbLabels.put(comp, new JLabel(PixelleBundle.getString("label." + comp.name().toLowerCase())));
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JLabel> gsLHS = new EnumMap<PixelleComponent, JLabel>(PixelleComponent.class);
 	{
 		for (PixelleComponent comp : PixelleComponent.gsValues()) {
 			gsLHS.put(comp, new JLabel(PixelleBundle.getString("formula." + comp.name().toLowerCase()) + " = "));
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JTextField> gsEditor = new EnumMap<PixelleComponent, JTextField>(PixelleComponent.class);
 	{
@@ -109,16 +110,15 @@
 			tf.setFont(EditorFontFactory.getEditorFont());
 			gsEditor.put(comp, tf);
 		}
-	};
+	}
 
 	private final Map<PixelleComponent, JLabel> gsLabels = new EnumMap<PixelleComponent, JLabel>(PixelleComponent.class);
 	{
 		for (PixelleComponent comp : PixelleComponent.gsValues()) {
 			gsLabels.put(comp, new JLabel(PixelleBundle.getString("label." + comp.name().toLowerCase())));
 		}
-	};
+	}
 
-
 	PixelleFrame frame;
 	JButton ok;
 	JButton cancel;
@@ -474,7 +474,7 @@
 				}
 			}
 		});
-		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 	}
 
 	static class FocusExpansionListener extends FocusAdapter
@@ -577,10 +577,10 @@
 			addButton.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent ae) {
 					Set<JFrame> frames = FrameMgr.getInstance().getFrames();
-					PixelleFrame frame = (PixelleFrame)JOptionPane.showInputDialog(SourcePanel.this, PixelleBundle.getString(PixelleBundle.PICK_SOURCE_LABEL), PixelleBundle.getString(PixelleBundle.TITLE), JOptionPane.QUESTION_MESSAGE, null, frames.toArray(new JFrame[frames.size()]), null);
-					if (frame != null) {
+					PixelleFrame pixFrame = (PixelleFrame)JOptionPane.showInputDialog(SourcePanel.this, PixelleBundle.getString(PixelleBundle.PICK_SOURCE_LABEL), PixelleBundle.getString(PixelleBundle.TITLE), JOptionPane.QUESTION_MESSAGE, null, frames.toArray(new JFrame[frames.size()]), null);
+					if (pixFrame != null) {
 						int id = sourceTable.getRowCount();
-						sourceModel.addRow(new Object[] { Integer.valueOf(id), frame });
+						sourceModel.addRow(new Object[] { Integer.valueOf(id), pixFrame });
 					}
 				}
 			});

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -35,6 +35,7 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import javax.swing.WindowConstants;
 
 import com.mebigfatguy.pixelle.AlgorithmArchiver;
 import com.mebigfatguy.pixelle.ImageType;
@@ -121,7 +122,7 @@
 	}
 	
 	private void initListeners() {
-		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		
 		addWindowListener(new WindowAdapter() {
 			@Override

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java	2010-06-10 03:26:15 UTC (rev 315)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java	2010-06-12 05:43:20 UTC (rev 316)
@@ -27,7 +27,7 @@
 import javax.swing.JComponent;
 
 public class GuiUtils {
-	public enum Sizing {Width, Height, Both};
+	public enum Sizing {Width, Height, Both}
 	
 	private GuiUtils() {}
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[315] trunk/pixelle/src/com/mebigfatguy/pixelle/ resources/version.properties

From: <dbr...@us...> - 2010-06-10 03:26:21

Revision: 315
          http://pixelle.svn.sourceforge.net/pixelle/?rev=315&view=rev
Author:   dbrosius
Date:     2010-06-10 03:26:15 +0000 (Thu, 10 Jun 2010)

Log Message:
-----------
resources strings

Added Paths:
-----------
    trunk/pixelle/src/com/mebigfatguy/pixelle/resources/version.properties

Added: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/version.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/version.properties	                        (rev 0)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/version.properties	2010-06-10 03:26:15 UTC (rev 315)
@@ -0,0 +1 @@
+pixelle.version = 1.1.0
\ No newline at end of file


Property changes on: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/version.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[314] trunk/pixelle/htdocs/mbfg_menu.shtml

From: <dbr...@us...> - 2010-06-07 02:57:22

Revision: 314
          http://pixelle.svn.sourceforge.net/pixelle/?rev=314&view=rev
Author:   dbrosius
Date:     2010-06-07 02:57:15 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
fat fingers

Modified Paths:
--------------
    trunk/pixelle/htdocs/mbfg_menu.shtml

Modified: trunk/pixelle/htdocs/mbfg_menu.shtml
===================================================================
--- trunk/pixelle/htdocs/mbfg_menu.shtml	2010-06-07 02:30:58 UTC (rev 313)
+++ trunk/pixelle/htdocs/mbfg_menu.shtml	2010-06-07 02:57:15 UTC (rev 314)
@@ -12,7 +12,7 @@
 			    		<li><a href="http://schemalizer.sf.net">Schemalizer</a></li>	
 			    		<li><a href="http://tomailer.sf.net">ToMailer</a></li>
 			    		<li><a href="http://jd4a.sf.net">JavaDoc for Android</a></li>	
-			    		<il><a href="http://damus.sf.net">Damus</a></il>
+			    		<li><a href="http://damus.sf.net">Damus</a></li>
 			    		<li><a href="http://www.heartofgoldfarm.com">Heart of Gold Farm</a></li>
 			    	</ul>
 			    </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[313] trunk/pixelle/htdocs/mbfg_menu.shtml

From: <dbr...@us...> - 2010-06-07 02:31:05

Revision: 313
          http://pixelle.svn.sourceforge.net/pixelle/?rev=313&view=rev
Author:   dbrosius
Date:     2010-06-07 02:30:58 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
more projects

Modified Paths:
--------------
    trunk/pixelle/htdocs/mbfg_menu.shtml

Modified: trunk/pixelle/htdocs/mbfg_menu.shtml
===================================================================
--- trunk/pixelle/htdocs/mbfg_menu.shtml	2010-01-11 05:15:48 UTC (rev 312)
+++ trunk/pixelle/htdocs/mbfg_menu.shtml	2010-06-07 02:30:58 UTC (rev 313)
@@ -10,7 +10,9 @@
 			    		<li><a href="http://pixelle.sf.net">Pixelle</a></li>
 			    		<li><a href="http://polycasso.sf.net">Polycasso</a></li>	
 			    		<li><a href="http://schemalizer.sf.net">Schemalizer</a></li>	
-			    		<li><a href="http://tomailer.sf.net">ToMailer</a></li>	
+			    		<li><a href="http://tomailer.sf.net">ToMailer</a></li>
+			    		<li><a href="http://jd4a.sf.net">JavaDoc for Android</a></li>	
+			    		<il><a href="http://damus.sf.net">Damus</a></il>
 			    		<li><a href="http://www.heartofgoldfarm.com">Heart of Gold Farm</a></li>
 			    	</ul>
 			    </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[312] trunk/pixelle/etc/Pixelle.g

From: <dbr...@us...> - 2010-01-11 05:15:55

Revision: 312
          http://pixelle.svn.sourceforge.net/pixelle/?rev=312&view=rev
Author:   dbrosius
Date:     2010-01-11 05:15:48 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
format

Modified Paths:
--------------
    trunk/pixelle/etc/Pixelle.g

Modified: trunk/pixelle/etc/Pixelle.g
===================================================================
--- trunk/pixelle/etc/Pixelle.g	2010-01-01 00:59:52 UTC (rev 311)
+++ trunk/pixelle/etc/Pixelle.g	2010-01-11 05:15:48 UTC (rev 312)
@@ -46,9 +46,9 @@
 		cw.visitField(Opcodes.ACC_PRIVATE, "height", "I", null, Integer.valueOf(0));
 		
 		mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, new String[0]);
-        mv.visitVarInsn(Opcodes.ALOAD, 0);
-        mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
-        mv.visitInsn(Opcodes.RETURN);
+		mv.visitVarInsn(Opcodes.ALOAD, 0);
+		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
+		mv.visitInsn(Opcodes.RETURN);
 		mv.visitMaxs(0,0);
 		
 		mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "setOutputSize", "(II)V", null, new String[0]);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[311] trunk/pixelle

From: <dbr...@us...> - 2010-01-01 01:00:04

Revision: 311
          http://pixelle.svn.sourceforge.net/pixelle/?rev=311&view=rev
Author:   dbrosius
Date:     2010-01-01 00:59:52 +0000 (Fri, 01 Jan 2010)

Log Message:
-----------
(c) 2010

Modified Paths:
--------------
    trunk/pixelle/build.xml
    trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/SelectionOutliner.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/EditorFontFactory.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
    trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle_de.properties
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java
    trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java

Modified: trunk/pixelle/build.xml
===================================================================
--- trunk/pixelle/build.xml	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/build.xml	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,7 +1,7 @@
 <!--
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -155,7 +155,7 @@
 				 destdir="${javadoc.dir}"
 				 windowtitle="pixelle api">
 		    <doctitle><![CDATA[<h1>pixelle javadoc</h1>]]></doctitle>
-		    <bottom><![CDATA[<i>Copyright &#169; 2008 MeBigFatGuy.com. All Rights Reserved.</i>]]></bottom>
+		    <bottom><![CDATA[<i>Copyright &#169; 2008-2010 MeBigFatGuy.com. All Rights Reserved.</i>]]></bottom>
 		</javadoc>
 	</target>
 	

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/ColorOutOfBoundsOption.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/FrameMgr.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/ImageType.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/IndexOutOfBoundsOption.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/Pixelle.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleBundle.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleClassLoader.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleComponent.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEval.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleEvalFactory.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleExpr.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleFrame.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleImage.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformException.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/PixelleTransformer.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/SelectionOutliner.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/SelectionOutliner.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/SelectionOutliner.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/AlgorithmEditor.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/ColorButton.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/EditorFontFactory.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/EditorFontFactory.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/EditorFontFactory.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelInspector.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleExpressionDialog.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/PixelleOptionsDialog.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/dialogs/SaveAlgorithmDialog.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval4ByteABGR.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalByteGray.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIndexed.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle.properties	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,5 +1,5 @@
 # * pixelle - Graphics algorithmic editor
-# * Copyright (C) 2008-2009 Dave Brosius
+# * Copyright (C) 2008-2010 Dave Brosius
 # * 
 # * This library is free software; you can redistribute it and/or
 # * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle_de.properties
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle_de.properties	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/resources/pixelle_de.properties	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,5 +1,5 @@
 # * pixelle - Graphics algorithmic editor
-# * Copyright (C) 2008-2009 Dave Brosius
+# * Copyright (C) 2008-2010 Dave Brosius
 # * 
 # * This library is free software; you can redistribute it and/or
 # * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/Closer.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/GuiUtils.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/IntegerDocument.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/XMLEncoder.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java	2009-12-28 06:53:35 UTC (rev 310)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/utils/ZoomLevel.java	2010-01-01 00:59:52 UTC (rev 311)
@@ -1,6 +1,6 @@
 /*
  * pixelle - Graphics algorithmic editor
- * Copyright (C) 2008-2009 Dave Brosius
+ * Copyright (C) 2008-2010 Dave Brosius
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[310] trunk/pixelle/.project

From: <dbr...@us...> - 2009-12-28 06:53:49

Revision: 310
          http://pixelle.svn.sourceforge.net/pixelle/?rev=310&view=rev
Author:   dbrosius
Date:     2009-12-28 06:53:35 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
initial checkin

Added Paths:
-----------
    trunk/pixelle/.project

Added: trunk/pixelle/.project
===================================================================
--- trunk/pixelle/.project	                        (rev 0)
+++ trunk/pixelle/.project	2009-12-28 06:53:35 UTC (rev 310)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pixelle</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>


Property changes on: trunk/pixelle/.project
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[309] trunk/pixelle/.classpath

From: <dbr...@us...> - 2009-12-28 06:52:55

Revision: 309
          http://pixelle.svn.sourceforge.net/pixelle/?rev=309&view=rev
Author:   dbrosius
Date:     2009-12-28 06:52:45 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
initial checkin

Added Paths:
-----------
    trunk/pixelle/.classpath

Added: trunk/pixelle/.classpath
===================================================================
--- trunk/pixelle/.classpath	                        (rev 0)
+++ trunk/pixelle/.classpath	2009-12-28 06:52:45 UTC (rev 309)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="lib/antlr-2.7.7.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-3.1b1.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-runtime-3.1b1.jar"/>
+	<classpathentry kind="lib" path="lib/asm-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/stringtemplate-3.1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="classes"/>
+</classpath>


Property changes on: trunk/pixelle/.classpath
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[308] trunk/pixelle/htdocs

From: <dbr...@us...> - 2009-12-28 06:48:59

Revision: 308
          http://pixelle.svn.sourceforge.net/pixelle/?rev=308&view=rev
Author:   dbrosius
Date:     2009-12-28 06:48:49 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
rename index.html to .shtml for ssi

Added Paths:
-----------
    trunk/pixelle/htdocs/index.shtml

Removed Paths:
-------------
    trunk/pixelle/htdocs/index.html

Deleted: trunk/pixelle/htdocs/index.html
===================================================================
--- trunk/pixelle/htdocs/index.html	2009-12-28 06:48:06 UTC (rev 307)
+++ trunk/pixelle/htdocs/index.html	2009-12-28 06:48:49 UTC (rev 308)
@@ -1,149 +0,0 @@
-<html>
-	<head>
-		<title>Pixelle - A Bitmap transformation tool</title>
-		<meta name="Keywords" content="bitmap image pixel transform convolution mebigfatguy">
-		<script src="mbfg.js">
-		</script>
-		<link rel="stylesheet" type="text/css" href="mbfg.css" />
-	</head>
-	<body background>
-		<div style="position:absolute;top:0;left:0;width:256;height:65535;z-index:1;background-image:url(blend.jpg);">
-		</div>
-		<div style="position:absolute;top:20;left:20;z-index:3;">
-			<h1>Pixelle</h1>
-			<hr/>
-			<a href="http://www.sourceforge.net/projects/pixelle">Project Page</a>
-			<img src="vbar.gif" height="12"/>
-			<a href="javadoc/index.html">JavaDoc</a>
-			<img src="vbar.gif" height="12"/>
-			<a href="jnlp/pixelle.jnlp?v=1.1.0">Web Start</a>
-			<!--#include virtual="mbfg_menu.shtml" --> 
-			<hr/>
-
-			<p>Thanks for your interest in Pixelle.</p>
-			
-			<p>Version 1.0.0 has just been released! Please report bugs or suggestions on the project pages.</p>
-
-			<p>The web start link should work, give it a try.</p>
-
-			<p>There are many image editing projects out there, and many are very good. But most of
-			these follow the point and click transformation style, and in some instances it can be
-			tedious to edit a bitmap if you have specific ways you want to change it. This tools works
-			differently. It allows you to apply arbitrary expressions to the red, green, blue, transparent
-			and selection pieces of a bitmap. Each expression can take as input the value of any other
-			value.</p>
-
-			<p>At the heart of this program is the transform dialog, shown here:</p>
-			<img src="algodlg.png"/>
-			<p>It shows five input fields for specifying how to transform
-			the red, green, blue and transparent parts of the bitmap, as well as the selection
-			attribute of each pixel. The default values for these algorithms is the value that will 
-			produce an exact copy of the source image. In this way you can just change one field, or
-			all fields, and get what you expect. Each algorithm may include the following items.</p>
-			<ul>
-				<li>p[x,y].r, p[x,y].g, p[x,y].b, p[x,y].t, p[x,y].s<br/>
-				The pixel value for the red, green, blue, transparency and selection at a 
-				particular location.</li>
-				<li>x<br/>
-				The current x coordinate of the pixel location from left to right.</li>
-				<li>y<br/>
-				The current y coordinate of the pixel location from top to bottom.</li>
-				<li>width<br/>
-				The width in pixels of the image.</li>				
-				<li>height<br/>
-				The height in pixels of the image.</li>
-				<li>abs(e)<br/>
-				The absolute value of an expression.</li>
-				<li>min(e, f)<br/>
-				The minimum value of two expressions.</li>
-				<li>max(e, f)<br/>
-				The maximum value of two expressions.</li>
-				<li>pow(e, f)<br/>
-				One expression raised to the second expression's power</li>
-				<li>sqrt(e)<br/>
-				The square root of an expression</li>
-				<li>sin(e)<br/>
-				The sine of an expression</li>
-				<li>cos(e)<br/>
-				The cosine of an expression</li>
-				<li>tan(e)<br/>
-				The tangent of an expression</li>
-				<li>asin(e)<br/>
-				The arc sine of an expression</li>
-				<li>acos(e)<br/>
-				The arc cosine of an expression</li>
-				<li>atan(e)<br/>
-				The arc tangent of an expression</li>
-				<li>log(e)<br/>
-				The log of an expression</li>
-				<li>exp(e)<br/>
-				The euler number (e) raised to an expression's power.</li>
-				<li>random(e)<br/>
-				A random number between 0 and 1</li>
-				<li>pi()<br/>
-				The number pi, the ratio of the circumference of a circle to its diameter</li>
-				<li>e()<br/>
-				The number e, the base of the natural logarithms</li>
-			</ul>				
-			
-			<p><pre>As of June 14, simple expressions should work. Some examples:
-
-			p[x,y].r = <b>(x + y) == 100 ? 255 : p[x,y].r</b>
-
-			This sets all red pixels to the same value as the input, except those pixels
-			that form a diagonal line where x + y == 100, and those pixes are converted to white.
-
-			p[x,y].r = <b>p[x,y].g</b>
-
-			This sets all the red pixels to the value of all the green pixels.
-
-			p[x,y].b = <b>p[y,x].b</b>
-
-			This rotates the blue component 90 degrees.
-
-			p[x,y].g = <b>(p[x,y].g*3 + p[x+1,y].g + p[x,y+1].g)/5</b>
-
-			This performs a simple convolution operation on the green pixels.
-
-			p[x,y].t = <b>((x == y) || (x == (width - y))) ? 0 : p[x,y].t</b>
-
-			Sets the transparency to fully transparent in an x shape.
-
-			p[x,y].s = <b>(p[x,y].r == p[x,y].g) || (p[x,y].r == p[x,y].b)</b>
-
-			Sets the selection to any pixels where the red component equals either
-			the green or blue component.
-			
-			p[x,y].b = <b>(p[x,y].s || (p[x,y].r < p[x,y].g) ? 0 : 255</b>
-
-			Sets the blue pixel to full blue if the pixel is selected or if the red component
-			is less than the green component, or else it sets it to black.
-
-			</pre></p>
-
-			<p>As of November 14, a pixel inspector window has been added, which helps determine input for the transformations</p>
-
-			<p>As of November 21, transformations can be done to grayscale. Prototypical example is color separations. Also
-			The output size can be specified in the transform dialog</p>
-
-			<p><pre>As of February 18, multiple input sources can be processed. So
-			
-			p[x,y].r = <b>p(x/10)[x,y].r</b>
-			
-			Copies 10 pixel bands from a series of images into the destination
-			Note that if the value in the parenthesis is larger then the number of images,
-			the value is moded to fall into the appropriate range.</pre></p>
-			
-			<p>Still to be done is recognition of more image types, more options handling such as fractional pixels, 
-			a bunch of bugs, and a bunch of stuff I have yet to think about.</p>
-		</div>
-
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-_uacct = "UA-249537-4";
-urchinTracker();
-</script>
-
-	</body>
-</html>

Copied: trunk/pixelle/htdocs/index.shtml (from rev 307, trunk/pixelle/htdocs/index.html)
===================================================================
--- trunk/pixelle/htdocs/index.shtml	                        (rev 0)
+++ trunk/pixelle/htdocs/index.shtml	2009-12-28 06:48:49 UTC (rev 308)
@@ -0,0 +1,149 @@
+<html>
+	<head>
+		<title>Pixelle - A Bitmap transformation tool</title>
+		<meta name="Keywords" content="bitmap image pixel transform convolution mebigfatguy">
+		<script src="mbfg.js">
+		</script>
+		<link rel="stylesheet" type="text/css" href="mbfg.css" />
+	</head>
+	<body background>
+		<div style="position:absolute;top:0;left:0;width:256;height:65535;z-index:1;background-image:url(blend.jpg);">
+		</div>
+		<div style="position:absolute;top:20;left:20;z-index:3;">
+			<h1>Pixelle</h1>
+			<hr/>
+			<a href="http://www.sourceforge.net/projects/pixelle">Project Page</a>
+			<img src="vbar.gif" height="12"/>
+			<a href="javadoc/index.html">JavaDoc</a>
+			<img src="vbar.gif" height="12"/>
+			<a href="jnlp/pixelle.jnlp?v=1.1.0">Web Start</a>
+			<!--#include virtual="mbfg_menu.shtml" --> 
+			<hr/>
+
+			<p>Thanks for your interest in Pixelle.</p>
+			
+			<p>Version 1.0.0 has just been released! Please report bugs or suggestions on the project pages.</p>
+
+			<p>The web start link should work, give it a try.</p>
+
+			<p>There are many image editing projects out there, and many are very good. But most of
+			these follow the point and click transformation style, and in some instances it can be
+			tedious to edit a bitmap if you have specific ways you want to change it. This tools works
+			differently. It allows you to apply arbitrary expressions to the red, green, blue, transparent
+			and selection pieces of a bitmap. Each expression can take as input the value of any other
+			value.</p>
+
+			<p>At the heart of this program is the transform dialog, shown here:</p>
+			<img src="algodlg.png"/>
+			<p>It shows five input fields for specifying how to transform
+			the red, green, blue and transparent parts of the bitmap, as well as the selection
+			attribute of each pixel. The default values for these algorithms is the value that will 
+			produce an exact copy of the source image. In this way you can just change one field, or
+			all fields, and get what you expect. Each algorithm may include the following items.</p>
+			<ul>
+				<li>p[x,y].r, p[x,y].g, p[x,y].b, p[x,y].t, p[x,y].s<br/>
+				The pixel value for the red, green, blue, transparency and selection at a 
+				particular location.</li>
+				<li>x<br/>
+				The current x coordinate of the pixel location from left to right.</li>
+				<li>y<br/>
+				The current y coordinate of the pixel location from top to bottom.</li>
+				<li>width<br/>
+				The width in pixels of the image.</li>				
+				<li>height<br/>
+				The height in pixels of the image.</li>
+				<li>abs(e)<br/>
+				The absolute value of an expression.</li>
+				<li>min(e, f)<br/>
+				The minimum value of two expressions.</li>
+				<li>max(e, f)<br/>
+				The maximum value of two expressions.</li>
+				<li>pow(e, f)<br/>
+				One expression raised to the second expression's power</li>
+				<li>sqrt(e)<br/>
+				The square root of an expression</li>
+				<li>sin(e)<br/>
+				The sine of an expression</li>
+				<li>cos(e)<br/>
+				The cosine of an expression</li>
+				<li>tan(e)<br/>
+				The tangent of an expression</li>
+				<li>asin(e)<br/>
+				The arc sine of an expression</li>
+				<li>acos(e)<br/>
+				The arc cosine of an expression</li>
+				<li>atan(e)<br/>
+				The arc tangent of an expression</li>
+				<li>log(e)<br/>
+				The log of an expression</li>
+				<li>exp(e)<br/>
+				The euler number (e) raised to an expression's power.</li>
+				<li>random(e)<br/>
+				A random number between 0 and 1</li>
+				<li>pi()<br/>
+				The number pi, the ratio of the circumference of a circle to its diameter</li>
+				<li>e()<br/>
+				The number e, the base of the natural logarithms</li>
+			</ul>				
+			
+			<p><pre>As of June 14, simple expressions should work. Some examples:
+
+			p[x,y].r = <b>(x + y) == 100 ? 255 : p[x,y].r</b>
+
+			This sets all red pixels to the same value as the input, except those pixels
+			that form a diagonal line where x + y == 100, and those pixes are converted to white.
+
+			p[x,y].r = <b>p[x,y].g</b>
+
+			This sets all the red pixels to the value of all the green pixels.
+
+			p[x,y].b = <b>p[y,x].b</b>
+
+			This rotates the blue component 90 degrees.
+
+			p[x,y].g = <b>(p[x,y].g*3 + p[x+1,y].g + p[x,y+1].g)/5</b>
+
+			This performs a simple convolution operation on the green pixels.
+
+			p[x,y].t = <b>((x == y) || (x == (width - y))) ? 0 : p[x,y].t</b>
+
+			Sets the transparency to fully transparent in an x shape.
+
+			p[x,y].s = <b>(p[x,y].r == p[x,y].g) || (p[x,y].r == p[x,y].b)</b>
+
+			Sets the selection to any pixels where the red component equals either
+			the green or blue component.
+			
+			p[x,y].b = <b>(p[x,y].s || (p[x,y].r < p[x,y].g) ? 0 : 255</b>
+
+			Sets the blue pixel to full blue if the pixel is selected or if the red component
+			is less than the green component, or else it sets it to black.
+
+			</pre></p>
+
+			<p>As of November 14, a pixel inspector window has been added, which helps determine input for the transformations</p>
+
+			<p>As of November 21, transformations can be done to grayscale. Prototypical example is color separations. Also
+			The output size can be specified in the transform dialog</p>
+
+			<p><pre>As of February 18, multiple input sources can be processed. So
+			
+			p[x,y].r = <b>p(x/10)[x,y].r</b>
+			
+			Copies 10 pixel bands from a series of images into the destination
+			Note that if the value in the parenthesis is larger then the number of images,
+			the value is moded to fall into the appropriate range.</pre></p>
+			
+			<p>Still to be done is recognition of more image types, more options handling such as fractional pixels, 
+			a bunch of bugs, and a bunch of stuff I have yet to think about.</p>
+		</div>
+
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-249537-4";
+urchinTracker();
+</script>
+
+	</body>
+</html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[307] trunk/pixelle/htdocs/index.html

From: <dbr...@us...> - 2009-12-28 06:48:16

Revision: 307
          http://pixelle.svn.sourceforge.net/pixelle/?rev=307&view=rev
Author:   dbrosius
Date:     2009-12-28 06:48:06 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
add ssi for mbfg other projects menu

Modified Paths:
--------------
    trunk/pixelle/htdocs/index.html

Modified: trunk/pixelle/htdocs/index.html
===================================================================
--- trunk/pixelle/htdocs/index.html	2009-12-28 06:47:02 UTC (rev 306)
+++ trunk/pixelle/htdocs/index.html	2009-12-28 06:48:06 UTC (rev 307)
@@ -2,6 +2,9 @@
 	<head>
 		<title>Pixelle - A Bitmap transformation tool</title>
 		<meta name="Keywords" content="bitmap image pixel transform convolution mebigfatguy">
+		<script src="mbfg.js">
+		</script>
+		<link rel="stylesheet" type="text/css" href="mbfg.css" />
 	</head>
 	<body background>
 		<div style="position:absolute;top:0;left:0;width:256;height:65535;z-index:1;background-image:url(blend.jpg);">
@@ -14,6 +17,7 @@
 			<a href="javadoc/index.html">JavaDoc</a>
 			<img src="vbar.gif" height="12"/>
 			<a href="jnlp/pixelle.jnlp?v=1.1.0">Web Start</a>
+			<!--#include virtual="mbfg_menu.shtml" --> 
 			<hr/>
 
 			<p>Thanks for your interest in Pixelle.</p>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[306] trunk/pixelle/htdocs

From: <dbr...@us...> - 2009-12-28 06:47:09

Revision: 306
          http://pixelle.svn.sourceforge.net/pixelle/?rev=306&view=rev
Author:   dbrosius
Date:     2009-12-28 06:47:02 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
add files for mbfg other projects

Added Paths:
-----------
    trunk/pixelle/htdocs/mbfg.css
    trunk/pixelle/htdocs/mbfg.js
    trunk/pixelle/htdocs/mbfg_menu.shtml

Added: trunk/pixelle/htdocs/mbfg.css
===================================================================
--- trunk/pixelle/htdocs/mbfg.css	                        (rev 0)
+++ trunk/pixelle/htdocs/mbfg.css	2009-12-28 06:47:02 UTC (rev 306)
@@ -0,0 +1,32 @@
+#mbfg_div {
+	float:right;
+}
+			
+#mbfg_menu {
+	margin-right: 20px;
+}
+			
+#mbfg_projects {
+	position: absolute;
+	display: none;
+	z-order: 2;
+}
+			
+#mbfg_projects ul li {
+	list-style-type: none;
+}
+			
+#mbfg_projects ul li a {
+	display:block;
+	border-color: #404040;
+	border-width: 1px;	
+	border-style: solid;
+	padding: 6px 40px 6px 40px;
+	background-color: #DDDDFF;
+	margin-right: 20px;
+	text-decoration: none;
+}
+			
+#mbfg_projects ul li a:hover {
+	background-color: #FFDDDD;
+}


Property changes on: trunk/pixelle/htdocs/mbfg.css
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/pixelle/htdocs/mbfg.js
===================================================================
--- trunk/pixelle/htdocs/mbfg.js	                        (rev 0)
+++ trunk/pixelle/htdocs/mbfg.js	2009-12-28 06:47:02 UTC (rev 306)
@@ -0,0 +1,9 @@
+
+function toggleDiv(divId)
+{
+	var dv = document.getElementById(divId);
+	if (dv.style.display == 'block')
+		dv.style.display = 'none';
+	else
+		dv.style.display = 'block';
+}
\ No newline at end of file


Property changes on: trunk/pixelle/htdocs/mbfg.js
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/pixelle/htdocs/mbfg_menu.shtml
===================================================================
--- trunk/pixelle/htdocs/mbfg_menu.shtml	                        (rev 0)
+++ trunk/pixelle/htdocs/mbfg_menu.shtml	2009-12-28 06:47:02 UTC (rev 306)
@@ -0,0 +1,17 @@
+			<div id="mbfg_div" onMouseover="javascript:toggleDiv('mbfg_projects')" onMouseout="javascript:toggleDiv('mbfg_projects')">
+			    <a id="mbfg_menu" href="#" >Other MeBigFatGuy Projects</a>
+			    <div id="mbfg_projects">
+			    	<ul>
+			    		<li><a href="http://beansource.sf.net">Beansource</a></li>
+			    		<li><a href="http://fb-contrib.sf.net">FB-Contrib</a></li>
+			    		<li><a href="http://mongobrowser.sf.net">MongoBrowser</a></li>
+			    		<li><a href="http://mysfstats.sf.net">MySFStats</a></li>
+			    		<li><a href="http://patchanim.sf.net">PatchAnim</a></li>
+			    		<li><a href="http://pixelle.sf.net">Pixelle</a></li>
+			    		<li><a href="http://polycasso.sf.net">Polycasso</a></li>	
+			    		<li><a href="http://schemalizer.sf.net">Schemalizer</a></li>	
+			    		<li><a href="http://tomailer.sf.net">ToMailer</a></li>	
+			    		<li><a href="http://www.heartofgoldfarm.com">Heart of Gold Farm</a></li>
+			    	</ul>
+			    </div>
+			</div>


Property changes on: trunk/pixelle/htdocs/mbfg_menu.shtml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[305] trunk/pixelle/src/com/mebigfatguy/pixelle/eval/ PixelleEvalIntRGB.java

From: <dbr...@us...> - 2009-09-05 21:47:25

Revision: 305
          http://pixelle.svn.sourceforge.net/pixelle/?rev=305&view=rev
Author:   dbrosius
Date:     2009-09-05 21:47:17 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
unnecessary cast

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java	2009-09-05 21:46:45 UTC (rev 304)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntRGB.java	2009-09-05 21:47:17 UTC (rev 305)
@@ -36,16 +36,16 @@
 	
 	@Override
 	public double getBlueValue(int x, int y) {
-		return (double)(buffer.getElem(y * width + x)  & 0x00FF);
+		return (buffer.getElem(y * width + x)  & 0x00FF);
 	}
 
 	@Override
 	public double getGreenValue(int x, int y) {
-		return (double)((buffer.getElem(y * width + x) >> 8) & 0x00FF);
+		return ((buffer.getElem(y * width + x) >> 8) & 0x00FF);
 	}
 
 	@Override
 	public double getRedValue(int x, int y) {
-		return (double)((buffer.getElem(y * width + x) >> 16) & 0x00FF);
+		return ((buffer.getElem(y * width + x) >> 16) & 0x00FF);
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[304] trunk/pixelle/src/com/mebigfatguy/pixelle/eval/ PixelleEvalIntBGR.java

From: <dbr...@us...> - 2009-09-05 21:46:51

Revision: 304
          http://pixelle.svn.sourceforge.net/pixelle/?rev=304&view=rev
Author:   dbrosius
Date:     2009-09-05 21:46:45 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
unnecessary cast

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java	2009-09-05 21:46:15 UTC (rev 303)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntBGR.java	2009-09-05 21:46:45 UTC (rev 304)
@@ -36,16 +36,16 @@
 	
 	@Override
 	public double getBlueValue(int x, int y) {
-		return (double)((buffer.getElem(y * width + x) >> 16)  & 0x00FF);
+		return ((buffer.getElem(y * width + x) >> 16)  & 0x00FF);
 	}
 
 	@Override
 	public double getGreenValue(int x, int y) {
-		return (double)((buffer.getElem(y * width + x) >> 8) & 0x00FF);
+		return ((buffer.getElem(y * width + x) >> 8) & 0x00FF);
 	}
 
 	@Override
 	public double getRedValue(int x, int y) {
-		return (double)(buffer.getElem(y * width + x) & 0x00FF);
+		return (buffer.getElem(y * width + x) & 0x00FF);
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[303] trunk/pixelle/src/com/mebigfatguy/pixelle/eval/ PixelleEvalIntARGB.java

From: <dbr...@us...> - 2009-09-05 21:46:23

Revision: 303
          http://pixelle.svn.sourceforge.net/pixelle/?rev=303&view=rev
Author:   dbrosius
Date:     2009-09-05 21:46:15 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
unnecessary cast

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java	2009-09-05 21:45:35 UTC (rev 302)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalIntARGB.java	2009-09-05 21:46:15 UTC (rev 303)
@@ -31,21 +31,21 @@
 	
 	@Override
 	public double getTransparencyValue(int x, int y) {
-		return (double)((buffer.getElem(y * width + x) >> 24) & 0x00FF);
+		return ((buffer.getElem(y * width + x) >> 24) & 0x00FF);
 	}
 	
 	@Override
 	public double getBlueValue(int x, int y) {
-		return (double)(buffer.getElem(y * width + x)  & 0x00FF);
+		return (buffer.getElem(y * width + x)  & 0x00FF);
 	}
 
 	@Override
 	public double getGreenValue(int x, int y) {
-		return (double)((buffer.getElem(y * width + x) >> 8) & 0x00FF);
+		return ((buffer.getElem(y * width + x) >> 8) & 0x00FF);
 	}
 
 	@Override
 	public double getRedValue(int x, int y) {
-		return (double)((buffer.getElem(y * width + x) >> 16) & 0x00FF);
+		return ((buffer.getElem(y * width + x) >> 16) & 0x00FF);
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[302] trunk/pixelle/src/com/mebigfatguy/pixelle/eval/ PixelleEvalCustom.java

From: <dbr...@us...> - 2009-09-05 21:45:41

Revision: 302
          http://pixelle.svn.sourceforge.net/pixelle/?rev=302&view=rev
Author:   dbrosius
Date:     2009-09-05 21:45:35 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
unnecessary cast

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java	2009-09-05 21:45:03 UTC (rev 301)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEvalCustom.java	2009-09-05 21:45:35 UTC (rev 302)
@@ -34,17 +34,17 @@
 	
 	@Override
 	public double getBlueValue(int x, int y) {
-		return (double)buffer.getElem(y * width * 3 + x * 3 + 2);
+		return buffer.getElem(y * width * 3 + x * 3 + 2);
 	}
 
 	@Override
 	public double getGreenValue(int x, int y) {
-		return (double)buffer.getElem(y * width * 3 + x * 3 + 1);
+		return buffer.getElem(y * width * 3 + x * 3 + 1);
 	}
 
 	@Override
 	public double getRedValue(int x, int y) {
-		return (double)buffer.getElem(y * width * 3 + x * 3);
+		return buffer.getElem(y * width * 3 + x * 3);
 	}
 
 	@Override


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[301] trunk/pixelle/src/com/mebigfatguy/pixelle/eval/ PixelleEval3ByteBGR.java

From: <dbr...@us...> - 2009-09-05 21:45:14

Revision: 301
          http://pixelle.svn.sourceforge.net/pixelle/?rev=301&view=rev
Author:   dbrosius
Date:     2009-09-05 21:45:03 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
unnecessary cast

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java	2009-09-05 21:44:13 UTC (rev 300)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/eval/PixelleEval3ByteBGR.java	2009-09-05 21:45:03 UTC (rev 301)
@@ -31,17 +31,17 @@
 	
 	@Override
 	public double getBlueValue(int x, int y) {
-		return (double)buffer.getElem(y * width * 3 + x * 3);
+		return buffer.getElem(y * width * 3 + x * 3);
 	}
 
 	@Override
 	public double getGreenValue(int x, int y) {
-		return (double)buffer.getElem(y * width * 3 + x * 3 + 1);
+		return buffer.getElem(y * width * 3 + x * 3 + 1);
 	}
 
 	@Override
 	public double getRedValue(int x, int y) {
-		return (double)buffer.getElem(y * width * 3 + x * 3 + 2);
+		return buffer.getElem(y * width * 3 + x * 3 + 2);
 	}
 
 	@Override


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[300] trunk/pixelle/src/com/mebigfatguy/pixelle/ AlgorithmArchiver.java

From: <dbr...@us...> - 2009-09-05 21:44:19

Revision: 300
          http://pixelle.svn.sourceforge.net/pixelle/?rev=300&view=rev
Author:   dbrosius
Date:     2009-09-05 21:44:13 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
don't declare throwing what isn't thrown

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2009-09-05 21:41:22 UTC (rev 299)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2009-09-05 21:44:13 UTC (rev 300)
@@ -224,7 +224,7 @@
 
 	}
 
-	private void writeAlgorithms(OutputStream is, Map<ImageType, Map<String, Map<String, Map<PixelleComponent, String>>>> algorithms) throws IOException {
+	private void writeAlgorithms(OutputStream is, Map<ImageType, Map<String, Map<String, Map<PixelleComponent, String>>>> algorithms) {
 		PrintWriter pw = null;
 		try {
 			pw = new PrintWriter(new OutputStreamWriter(is));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[299] trunk/pixelle/src/com/mebigfatguy/pixelle/ AlgorithmArchiver.java

From: <dbr...@us...> - 2009-09-05 21:41:31

Revision: 299
          http://pixelle.svn.sourceforge.net/pixelle/?rev=299&view=rev
Author:   dbrosius
Date:     2009-09-05 21:41:22 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
make sure streams get closed

Modified Paths:
--------------
    trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java

Modified: trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java
===================================================================
--- trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2009-08-18 00:28:31 UTC (rev 298)
+++ trunk/pixelle/src/com/mebigfatguy/pixelle/AlgorithmArchiver.java	2009-09-05 21:41:22 UTC (rev 299)
@@ -255,7 +255,7 @@
 			pw.flush();
 		}
 		finally {
-			pw.close();
+			Closer.close(pw);
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pixelle-commit] SF.net SVN: pixelle:[298] trunk/pixelle/build.xml

From: <dbr...@us...> - 2009-08-18 00:28:45

Revision: 298
          http://pixelle.svn.sourceforge.net/pixelle/?rev=298&view=rev
Author:   dbrosius
Date:     2009-08-18 00:28:31 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
fix up for nix

Modified Paths:
--------------
    trunk/pixelle/build.xml

Modified: trunk/pixelle/build.xml
===================================================================
--- trunk/pixelle/build.xml	2009-07-22 06:02:47 UTC (rev 297)
+++ trunk/pixelle/build.xml	2009-08-18 00:28:31 UTC (rev 298)
@@ -65,7 +65,7 @@
 	<target name="-gen" description="generate antlr files">
 		<exec executable="java" failonerror="true">
 		    <arg value="-classpath"/>
-		    <arg value="${lib.dir}\antlr-2.7.7.jar;${lib.dir}\antlr-3.1b1.jar;${lib.dir}\antlr-runtime-3.1b1.jar;${lib.dir}\stringtemplate-3.1.jar"/>
+		    <arg value="${lib.dir}/antlr-2.7.7.jar:${lib.dir}/antlr-3.1b1.jar:${lib.dir}/antlr-runtime-3.1b1.jar:${lib.dir}/stringtemplate-3.1.jar"/>
 		    <arg value="org.antlr.Tool"/>
 		    <arg value="-target"/>
 		    <arg value="${etc.dir}/Pixelle.g"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

1 2 3 .. 13 > >> (Page 1 of 13)

2008	Jan	Feb	Mar	Apr	May	Jun (129)	Jul (39)	Aug	Sep	Oct	Nov (63)	Dec
2009	Jan (1)	Feb (24)	Mar	Apr	May	Jun	Jul (41)	Aug (1)	Sep (7)	Oct	Nov	Dec (5)
2010	Jan (2)	Feb	Mar	Apr	May	Jun (4)	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan (2)	Feb	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec