Changeset 25682 for main/trunk

Timestamp:

2012-05-28T23:44:13+12:00 (12 years ago)

Author:

davidb

Message:

Changed to using RSyntaxTextArea to get coloured highlighting and other goodies for the Greenstone3 format manager

Location:

main/trunk/gli

Files:

• gli.bat (modified) (3 diffs)
• makegli.bat (modified) (2 diffs)
• makejar.bat (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/Format4gs3Manager.java (modified) (5 diffs)

main/trunk/gli/gli.bat

@@ -157 +157 @@
 
 :: Run GS3 if version = 3
-if "%_VERSION%" == "3" "%JAVA_EXECUTABLE%" -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "%GSDLHOME%" -gsdlos %GSDLOS% -gsdl3 "%GSDL3HOME%" -gsdl3src "%GSDL3SRCHOME%" -perl "%PERLPATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+if "%_VERSION%" == "3" "%JAVA_EXECUTABLE%" -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar org.greenstone.gatherer.GathererProg -gsdl "%GSDLHOME%" -gsdlos %GSDLOS% -gsdl3 "%GSDL3HOME%" -gsdl3src "%GSDL3SRCHOME%" -perl "%PERLPATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
 if "%_VERSION%" == "3" goto finRun
 
@@ -173 +173 @@
     )
 
-    "%JAVA_EXECUTABLE%" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "%GSDLHOME%" -gsdlos %GSDLOS% -perl "%PERLPATH%" -local_library "%locallib%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+    "%JAVA_EXECUTABLE%" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar org.greenstone.gatherer.GathererProg -gsdl "%GSDLHOME%" -gsdlos %GSDLOS% -perl "%PERLPATH%" -local_library "%locallib%" %1 %2 %3 %4 %5 %6 %7 %8 %9
     if ERRORLEVEL 2 (
         goto localLib
@@ -180 +180 @@
 
 :webLib
-    "%JAVA_EXECUTABLE%" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -gsdl "%GSDLHOME%" -gsdlos %GSDLOS% -perl "%PERLPATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+    "%JAVA_EXECUTABLE%" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar org.greenstone.gatherer.GathererProg -gsdl "%GSDLHOME%" -gsdlos %GSDLOS% -perl "%PERLPATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
     if ERRORLEVEL 2 (
         goto webLib

main/trunk/gli/makegli.bat

@@ -119 +119 @@
     if "%GLILANG%" == "ru" echo Š®¬¯š«šà®¢ ­š¥ %1 š § ¢šáš¬ë¥ ª« ááë...
 
-    "%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar %1
+    "%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar %1
 
     if "%GLILANG%" == "en" echo Done!
@@ -140 +140 @@
 :: Compile the GLI
 :: Sun compiler (tested with 1.5 and 1.6) didn't compile DragTreeSelectionModel.java or MetadataAuditTableModel.java automatically, so we need to put them in explicitly
-"%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar src/org/greenstone/gatherer/GathererProg.java src/org/greenstone/gatherer/util/DragTreeSelectionModel.java src/org/greenstone/gatherer/metadata/MetadataAuditTableModel.java 
-"%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar src/org/greenstone/gatherer/GathererApplet.java
-:: "%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar src/org/greenstone/gatherer/GathererApplet4gs3.java
+"%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar;;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererProg.java src/org/greenstone/gatherer/util/DragTreeSelectionModel.java src/org/greenstone/gatherer/metadata/MetadataAuditTableModel.java 
+"%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar;;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererApplet.java
+:: "%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar;;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererApplet4gs3.java
 
 :: Compile the GEMS
-"%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar src/org/greenstone/gatherer/gems/GEMS.java
+"%JAVACPATH%\javac.exe" -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/qfslib.jar;;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/gems/GEMS.java
 
 :: Compile the standalone programs needed on the server for remote building

main/trunk/gli/makejar.bat

@@ -119 +119 @@
   "!JARPATH!\jar" xf ..\lib\apache.jar com org
   "!JARPATH!\jar" xf ..\lib\qfslib.jar de
-
+  "!JARPATH!\jar" xf ..\lib\rsyntaxtextarea.jar org
   cd ..
 )

main/trunk/gli/src/org/greenstone/gatherer/cdm/Format4gs3Manager.java

@@ -33 +33 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.fife.ui.rsyntaxtextarea.*;
+
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.DebugStream;
@@ -297 +299 @@
 
             editor_textarea = new NumberedJTextArea();
+
+                /* Fields specific to RSyntaxQuery inherited class */
+            editor_textarea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_XML);
+            editor_textarea.setBracketMatchingEnabled(true);
+            editor_textarea.setAnimateBracketMatching(true);
+            editor_textarea.setAntiAliasingEnabled(true);
+            editor_textarea.setAutoIndentEnabled(true);
+            editor_textarea.setPaintMarkOccurrencesBorder(false);
+            
+            /* Standard fields to JTextArea */
             editor_textarea.setOpaque(false);
             editor_textarea.setBackground(Configuration.getColor("coloring.editable_background", false));
@@ -824 +836 @@
          * A textarea with the line number next to each line of the text
          */
-        public class NumberedJTextArea extends JTextArea
+        public class NumberedJTextArea extends RSyntaxTextArea /*JTextArea*/
         {
             public void paintComponent(Graphics g)
@@ -832 +844 @@
                 g.setColor(Color.white);
                 g.fillRect(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
+
+                super.paintComponent(g);
+
                 if (rectangle.x < insets.left)
                 {
@@ -860 +875 @@
                         line_number_start_point++;
                     }
-                }
-                super.paintComponent(g);
+                }               
             }