Moved java files to correct hierarchy

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@244 d0cd1f9f-072b-0410-8dd7-cf729c803f20
allen8807 · Jun 3, 2009 · 8131b0f · 8131b0f
1 parent c82051a
commit 8131b0f
Show file tree

Hide file tree

Showing 22 changed files with 48 additions and 348 deletions.
diff --git a/java/Makefile.am b/java/Makefile.am
@@ -1,9 +1,4 @@
-SUBDIRS =
+SUBDIRS = com
 
 EXTRA_DIST = \
-    test.lua makefile SVAbstractMenuItem.java \
-    SVCheckboxMenuItem.java SVEmptyMenuItem.java \
-    SVEvent.java SVEventHandler.java \
-    SVEventType.java SVImageHandler.java SVMenuBar.java \
-    SVMenuItem.java SVPopupMenu.java SVSubMenuItem.java SVWindow.java \
-    ScrollView.java
+    makefile
diff --git a/java/Makefile.in b/java/Makefile.in
diff --git a/java/com/Makefile.am b/java/com/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = google
diff --git a/java/com/google/Makefile.am b/java/com/google/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = scrollview
diff --git a/java/com/google/scrollview/Makefile.am b/java/com/google/scrollview/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = events ui
+
+EXTRA_DIST = \
+    ScrollView.java
diff --git a/java/ScrollView.java → java/com/google/scrollview/ScrollView.java b/java/ScrollView.java → java/com/google/scrollview/ScrollView.java
diff --git a/java/com/google/scrollview/events/Makefile.am b/java/com/google/scrollview/events/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS =
+
+EXTRA_DIST = \
+    SVEvent.java SVEventHandler.java \
+    SVEventType.java
diff --git a/java/SVEvent.java → ...com/google/scrollview/events/SVEvent.java b/java/SVEvent.java → ...com/google/scrollview/events/SVEvent.java
diff --git a/java/SVEventHandler.java → ...gle/scrollview/events/SVEventHandler.java b/java/SVEventHandler.java → ...gle/scrollview/events/SVEventHandler.java
diff --git a/java/SVEventType.java → ...google/scrollview/events/SVEventType.java b/java/SVEventType.java → ...google/scrollview/events/SVEventType.java
diff --git a/java/com/google/scrollview/ui/Makefile.am b/java/com/google/scrollview/ui/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS =
+
+EXTRA_DIST = \
+    SVAbstractMenuItem.java \
+    SVCheckboxMenuItem.java SVEmptyMenuItem.java \
+    SVImageHandler.java SVMenuBar.java \
+    SVMenuItem.java SVPopupMenu.java SVSubMenuItem.java SVWindow.java
diff --git a/java/SVAbstractMenuItem.java → ...gle/scrollview/ui/SVAbstractMenuItem.java b/java/SVAbstractMenuItem.java → ...gle/scrollview/ui/SVAbstractMenuItem.java
diff --git a/java/SVCheckboxMenuItem.java → ...gle/scrollview/ui/SVCheckboxMenuItem.java b/java/SVCheckboxMenuItem.java → ...gle/scrollview/ui/SVCheckboxMenuItem.java
diff --git a/java/SVEmptyMenuItem.java → ...google/scrollview/ui/SVEmptyMenuItem.java b/java/SVEmptyMenuItem.java → ...google/scrollview/ui/SVEmptyMenuItem.java
diff --git a/java/SVImageHandler.java → .../google/scrollview/ui/SVImageHandler.java b/java/SVImageHandler.java → .../google/scrollview/ui/SVImageHandler.java
diff --git a/java/SVMenuBar.java → java/com/google/scrollview/ui/SVMenuBar.java b/java/SVMenuBar.java → java/com/google/scrollview/ui/SVMenuBar.java
diff --git a/java/SVMenuItem.java → .../com/google/scrollview/ui/SVMenuItem.java b/java/SVMenuItem.java → .../com/google/scrollview/ui/SVMenuItem.java
diff --git a/java/SVPopupMenu.java → ...com/google/scrollview/ui/SVPopupMenu.java b/java/SVPopupMenu.java → ...com/google/scrollview/ui/SVPopupMenu.java
diff --git a/java/SVSubMenuItem.java → ...m/google/scrollview/ui/SVSubMenuItem.java b/java/SVSubMenuItem.java → ...m/google/scrollview/ui/SVSubMenuItem.java
diff --git a/java/SVWindow.java → java/com/google/scrollview/ui/SVWindow.java b/java/SVWindow.java → java/com/google/scrollview/ui/SVWindow.java
diff --git a/java/makefile b/java/makefile
@@ -2,34 +2,34 @@ JAVAC = javac
 JAR = jar
 
 SCROLLVIEW_FILES = \
-SVAbstractMenuItem.java \
-SVCheckboxMenuItem.java \
-SVEmptyMenuItem.java \
-SVEvent.java \
-SVEventHandler.java \
-SVEventType.java \
-SVImageHandler.java \
-SVMenuBar.java \
-SVMenuItem.java \
-SVPopupMenu.java \
-SVSubMenuItem.java \
-SVWindow.java \
-ScrollView.java
+com/google/scrollview/ui/SVAbstractMenuItem.java \
+com/google/scrollview/ui/SVCheckboxMenuItem.java \
+com/google/scrollview/ui/SVEmptyMenuItem.java \
+com/google/scrollview/events/SVEvent.java \
+com/google/scrollview/events/SVEventHandler.java \
+com/google/scrollview/events/SVEventType.java \
+com/google/scrollview/ui/SVImageHandler.java \
+com/google/scrollview/ui/SVMenuBar.java \
+com/google/scrollview/ui/SVMenuItem.java \
+com/google/scrollview/ui/SVPopupMenu.java \
+com/google/scrollview/ui/SVSubMenuItem.java \
+com/google/scrollview/ui/SVWindow.java \
+com/google/scrollview/ScrollView.java
 
 SCROLLVIEW_CLASSES = \
-SVAbstractMenuItem.class \
-SVCheckboxMenuItem.class \
-SVEmptyMenuItem.class \
-SVEvent.class \
-SVEventHandler.class \
-SVEventType.class \
-SVImageHandler.class \
-SVMenuBar.class \
-SVMenuItem.class \
-SVPopupMenu.class \
-SVSubMenuItem.class \
-SVWindow.class \
-ScrollView.class
+com/google/scrollview/ui/SVAbstractMenuItem.class \
+com/google/scrollview/ui/SVCheckboxMenuItem.class \
+com/google/scrollview/ui/SVEmptyMenuItem.class \
+com/google/scrollview/events/SVEvent.class \
+com/google/scrollview/events/SVEventHandler.class \
+com/google/scrollview/events/SVEventType.class \
+com/google/scrollview/ui/SVImageHandler.class \
+com/google/scrollview/ui/SVMenuBar.class \
+com/google/scrollview/ui/SVMenuItem.class \
+com/google/scrollview/ui/SVPopupMenu.class \
+com/google/scrollview/ui/SVSubMenuItem.class \
+com/google/scrollview/ui/SVWindow.class \
+com/google/scrollview/ScrollView.class
 
 SCROLLVIEW_LIBS = \
 piccolo-1.2.jar \
@@ -38,7 +38,8 @@ piccolox-1.2.jar
 CLASSPATH = ./piccolo-1.2.jar:./piccolox-1.2.jar
 
 ScrollView.jar : $(SCROLLVIEW_CLASSES)
-	$(JAR) -c -f $@ $(SCROLLVIEW_CLASSES)
+	$(JAR) cf $@ com/google/scrollview/*.class \
+           com/google/scrollview/events/*.class com/google/scrollview/ui/*.class
 
 $(SCROLLVIEW_CLASSES) : $(SCROLLVIEW_FILES)
 	$(JAVAC) -encoding UTF8 -classpath $(CLASSPATH) $(SCROLLVIEW_FILES)