[sword-cvs] r15 - in trunk/app: . src/org/crosswire/flashcards
src/org/crosswire/modedit
Apache
apache at crosswire.org
Thu Sep 9 14:15:02 MST 2004
Author:
Date: 2004-09-09 14:15:02 -0700 (Thu, 09 Sep 2004)
New Revision: 15
Modified:
trunk/app/GNUmakefile
trunk/app/src/org/crosswire/flashcards/Editor.java
trunk/app/src/org/crosswire/modedit/CGreekIM.java
trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java
trunk/app/src/org/crosswire/modedit/UniTextEdit.java
Log:
Works with java 1.5.0 beta on Linux (and webstart).
Commented out line 355 in UniTextEdit.java.
Modified: trunk/app/GNUmakefile
===================================================================
--- trunk/app/GNUmakefile 2004-09-09 19:02:02 UTC (rev 14)
+++ trunk/app/GNUmakefile 2004-09-09 21:15:02 UTC (rev 15)
@@ -29,7 +29,7 @@
clean :
rm -rf classes
-flashcards :
+flashcards : clean
@$(CHECK_CLASSES_DIRECTORY)
$(JAVAC) -g -d $(CLASSES_DIRECTORY) `find . -type f -name '*.java'`
cd src ; \
@@ -39,8 +39,5 @@
cd $(CLASSES_DIRECTORY) ; \
jar cvmf org/crosswire/flashcards/flashcards.manifest flashcards.jar org lessons
-Editor :
- java -classpath classes org.crosswire.flashcards.Editor &
-
-Quiz :
- java -classpath classes org.crosswire.flashcards.Quiz &
+run :
+ java -jar classes/flashcards.jar &
Modified: trunk/app/src/org/crosswire/flashcards/Editor.java
===================================================================
--- trunk/app/src/org/crosswire/flashcards/Editor.java 2004-09-09 19:02:02 UTC (rev 14)
+++ trunk/app/src/org/crosswire/flashcards/Editor.java 2004-09-09 21:15:02 UTC (rev 15)
@@ -40,23 +40,23 @@
//Center the window
- Dimension screenSize = Toolkit.getDefaultToolkit( ).getScreenSize( );
- Dimension frameSize = frame.getSize( );
+ //Dimension screenSize = Toolkit.getDefaultToolkit( ).getScreenSize( );
+ //Dimension frameSize = frame.getSize( );
- if( frameSize.height > screenSize.height ) {
+ //if( frameSize.height > screenSize.height ) {
+ //
+ // frameSize.height = screenSize.height;
+ //
+ //}
+ //
+ //if( frameSize.width > screenSize.width ) {
+ //
+ // frameSize.width = screenSize.width;
+ //
+ //}
- frameSize.height = screenSize.height;
-
- }
-
- if( frameSize.width > screenSize.width ) {
-
- frameSize.width = screenSize.width;
-
- }
-
- frame.setLocation( ( screenSize.width - frameSize.width ) / 2,
- ( screenSize.height - frameSize.height ) / 2 );
+ //frame.setLocation( ( screenSize.width - frameSize.width ) / 2,
+ // ( screenSize.height - frameSize.height ) / 2 );
frame.setVisible( true );
}
Modified: trunk/app/src/org/crosswire/modedit/CGreekIM.java
===================================================================
--- trunk/app/src/org/crosswire/modedit/CGreekIM.java 2004-09-09 19:02:02 UTC (rev 14)
+++ trunk/app/src/org/crosswire/modedit/CGreekIM.java 2004-09-09 21:15:02 UTC (rev 15)
@@ -12,6 +12,61 @@
import java.util.*;
+///////////////////////////////////////////////////////////////////////////
+//
+// Mimics 'cgreek - Classical Greek with Emacs'
+// See http://m17n.org/cgreek/index.en.html
+//
+// This is the default mode, see Ibycus4IM.java for the
+// alternative greek-ibycus4 mode.
+//
+// N.B. Does not include sampi, diagamma, stigma or qoppa.
+//
+// alpha - lower: a upper: A
+// beta - lower: b upper: B
+// gamma - lower: g upper: G
+// delta - lower: d upper: D
+// epsilon - lower: e upper: E
+// zeta - lower: z upper: Z
+// eta - lower: h upper: h
+// theta - lower: q upper: Q
+// iota - lower: i upper: I
+// kappa - lower: k upper: K
+// lambda - lower: l upper: L
+// mu - lower: m upper: M
+// nu - lower: n upper: N
+// xi - lower: x upper: X
+// omicron - lower: o upper: O
+// pi - lower: p upper: P
+// rho - lower: r upper: R
+// sigma - lower: s upper: S
+// terminal sigma - lower: j
+// tau - lower: t upper: T
+// upsilon - lower: u upper: U
+// phi - lower: f upper: F
+// chi - lower: c upper: C
+// psi - lower: y upper: Y
+// omega - lower: w upper: W
+//
+// The breathing is entered after the vowel.
+//
+// ',v - smooth
+// `,V - rough
+//
+// Iota subscript is entered by typing 'J' after
+// the vowel.
+//
+// After entering the breathing (if any),
+// the letter and the iota subscript (if present),
+// accents may be added as follows.
+//
+// / - acute
+// ? - grave
+// ^ - circumflex
+// " - trema (diaeresis)
+//
+///////////////////////////////////////////////////////////////////////////
+
public class CGreekIM extends SWInputMethod {
//
@@ -129,33 +184,12 @@
// trema (diaeresis)
characterMap.put( new Integer( '"' ), new String( new char [ ] { 0x0308 } ) );
- // comma
- characterMap.put( new Integer( ',' ), new String( new char [ ] { 0x002c } ) );
-
// full stop
characterMap.put( new Integer( '.' ), new String( new char [ ] { 0x0387 } ) );
// question mark
characterMap.put( new Integer( ';' ), new String( new char [ ] { 0x037e } ) );
- // colon
- characterMap.put( new Integer( ':' ), new String( new char [ ] { 0x003a } ) );
-
- // sampi (upper case 0x3e0, lower case 0x3e1)
- characterMap.put( new Integer( '!' ), new String( new char [ ] { 0x03e0 } ) );
-
- // diagamma (upper case 0x3dc, lower case 0x3dd)
- characterMap.put( new Integer( '#' ), new String( new char [ ] { 0x03dc } ) );
-
- // stigma (upper case 0x3da, lower case 0x3db)
- characterMap.put( new Integer( '$' ), new String( new char [ ] { 0x03da } ) );
-
- // qoppa (lower case)
- characterMap.put( new Integer( '%' ), new String( new char [ ] { 0x03df } ) );
-
- // qoppa (upper case)
- characterMap.put( new Integer( '&' ), new String( new char [ ] { 0x03de } ) );
-
}
}
Modified: trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java
===================================================================
--- trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java 2004-09-09 19:02:02 UTC (rev 14)
+++ trunk/app/src/org/crosswire/modedit/Gtk2ClassicalGreekIM.java 2004-09-09 21:15:02 UTC (rev 15)
@@ -118,7 +118,6 @@
characterMap.put( new Integer( 'Z' ), new String( new char [ ] { 0x0396 } ) );
characterMap.put( new Integer( 'q' ), new String( new char [ ] { 0x03b7 } ) );
characterMap.put( new Integer( 'Q' ), new String( new char [ ] { 0x0397 } ) );
-
characterMap.put( new Integer( 'i' ), new String( new char [ ] { 0x03b9 } ) );
characterMap.put( new Integer( 'I' ), new String( new char [ ] { 0x0399 } ) );
characterMap.put( new Integer( 'k' ), new String( new char [ ] { 0x03ba } ) );
@@ -182,18 +181,12 @@
// trema (diaeresis)
characterMap.put( new Integer( '"' ), new String( new char [ ] { 0x0308 } ) );
- // comma
- characterMap.put( new Integer( ',' ), new String( new char [ ] { 0x002c } ) );
-
// full stop
characterMap.put( new Integer( '.' ), new String( new char [ ] { 0x0387 } ) );
// question mark
characterMap.put( new Integer( ';' ), new String( new char [ ] { 0x037e } ) );
- // colon
- characterMap.put( new Integer( ':' ), new String( new char [ ] { 0x003a } ) );
-
}
}
Modified: trunk/app/src/org/crosswire/modedit/UniTextEdit.java
===================================================================
--- trunk/app/src/org/crosswire/modedit/UniTextEdit.java 2004-09-09 19:02:02 UTC (rev 14)
+++ trunk/app/src/org/crosswire/modedit/UniTextEdit.java 2004-09-09 21:15:02 UTC (rev 15)
@@ -80,7 +80,7 @@
JMenu jMenu2 = new JMenu();
JMenuItem jMenuItem4 = new JMenuItem();
JMenuItem jMenuItem5 = new JMenuItem();
-BorderLayout borderLayout6 = new BorderLayout();
+ BorderLayout borderLayout6 = new BorderLayout();
/**Construct the frame*/
public UniTextEdit() {
@@ -352,7 +352,7 @@
public void addPropertyChangeListener(PropertyChangeListener l) {
- jTextArea1.addPropertyChangeListener(l);
+ //jTextArea1.addPropertyChangeListener(l);
}
More information about the sword-cvs
mailing list