diff --git a/java/Makefile.am b/java/Makefile.am index 23334248..4232afe5 100644 --- 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 deleted file mode 100644 index 742ab727..00000000 --- a/java/Makefile.in +++ /dev/null @@ -1,291 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -CC = @CC@ -CXX = @CXX@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ -LTLIB = @LTLIB@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -PACKAGE = @PACKAGE@ -PACKAGE_DATE = @PACKAGE_DATE@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKAGE_YEAR = @PACKAGE_YEAR@ -RANLIB = @RANLIB@ -VERSION = @VERSION@ - -SUBDIRS = - -EXTRA_DIST = test.lua makefile SVEvent.java SVEventHandler.java SVEventType.java SVImageHandler.java SVMenuBar.java SVMenuItem.java SVPopupMenu.java SVWindow.java ScrollView.java - -mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -CONFIG_HEADER = ../config_auto.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu java/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = java - -distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu java/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: -install-exec: install-exec-recursive - -install-data-am: -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: -uninstall: uninstall-recursive -all-am: Makefile -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-tags clean-generic mostlyclean-am - -clean: clean-recursive - -distclean-am: distclean-tags distclean-generic clean-am - -distclean: distclean-recursive - -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/java/com/Makefile.am b/java/com/Makefile.am new file mode 100644 index 00000000..fbd398ee --- /dev/null +++ b/java/com/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = google diff --git a/java/com/google/Makefile.am b/java/com/google/Makefile.am new file mode 100644 index 00000000..93945455 --- /dev/null +++ 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 new file mode 100644 index 00000000..7314b233 --- /dev/null +++ b/java/com/google/scrollview/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = events ui + +EXTRA_DIST = \ + ScrollView.java diff --git a/java/ScrollView.java b/java/com/google/scrollview/ScrollView.java old mode 100755 new mode 100644 similarity index 100% rename from java/ScrollView.java rename to java/com/google/scrollview/ScrollView.java diff --git a/java/com/google/scrollview/events/Makefile.am b/java/com/google/scrollview/events/Makefile.am new file mode 100644 index 00000000..ec3a21ff --- /dev/null +++ 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 b/java/com/google/scrollview/events/SVEvent.java old mode 100755 new mode 100644 similarity index 100% rename from java/SVEvent.java rename to java/com/google/scrollview/events/SVEvent.java diff --git a/java/SVEventHandler.java b/java/com/google/scrollview/events/SVEventHandler.java old mode 100755 new mode 100644 similarity index 100% rename from java/SVEventHandler.java rename to java/com/google/scrollview/events/SVEventHandler.java diff --git a/java/SVEventType.java b/java/com/google/scrollview/events/SVEventType.java old mode 100755 new mode 100644 similarity index 100% rename from java/SVEventType.java rename to java/com/google/scrollview/events/SVEventType.java diff --git a/java/com/google/scrollview/ui/Makefile.am b/java/com/google/scrollview/ui/Makefile.am new file mode 100644 index 00000000..556d8015 --- /dev/null +++ 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 b/java/com/google/scrollview/ui/SVAbstractMenuItem.java similarity index 100% rename from java/SVAbstractMenuItem.java rename to java/com/google/scrollview/ui/SVAbstractMenuItem.java diff --git a/java/SVCheckboxMenuItem.java b/java/com/google/scrollview/ui/SVCheckboxMenuItem.java similarity index 100% rename from java/SVCheckboxMenuItem.java rename to java/com/google/scrollview/ui/SVCheckboxMenuItem.java diff --git a/java/SVEmptyMenuItem.java b/java/com/google/scrollview/ui/SVEmptyMenuItem.java similarity index 100% rename from java/SVEmptyMenuItem.java rename to java/com/google/scrollview/ui/SVEmptyMenuItem.java diff --git a/java/SVImageHandler.java b/java/com/google/scrollview/ui/SVImageHandler.java old mode 100755 new mode 100644 similarity index 100% rename from java/SVImageHandler.java rename to java/com/google/scrollview/ui/SVImageHandler.java diff --git a/java/SVMenuBar.java b/java/com/google/scrollview/ui/SVMenuBar.java old mode 100755 new mode 100644 similarity index 100% rename from java/SVMenuBar.java rename to java/com/google/scrollview/ui/SVMenuBar.java diff --git a/java/SVMenuItem.java b/java/com/google/scrollview/ui/SVMenuItem.java old mode 100755 new mode 100644 similarity index 100% rename from java/SVMenuItem.java rename to java/com/google/scrollview/ui/SVMenuItem.java diff --git a/java/SVPopupMenu.java b/java/com/google/scrollview/ui/SVPopupMenu.java old mode 100755 new mode 100644 similarity index 100% rename from java/SVPopupMenu.java rename to java/com/google/scrollview/ui/SVPopupMenu.java diff --git a/java/SVSubMenuItem.java b/java/com/google/scrollview/ui/SVSubMenuItem.java similarity index 100% rename from java/SVSubMenuItem.java rename to java/com/google/scrollview/ui/SVSubMenuItem.java diff --git a/java/SVWindow.java b/java/com/google/scrollview/ui/SVWindow.java old mode 100755 new mode 100644 similarity index 100% rename from java/SVWindow.java rename to java/com/google/scrollview/ui/SVWindow.java diff --git a/java/makefile b/java/makefile index f3c1cdc1..4828e3a4 100644 --- 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) diff --git a/java/test.lua b/java/test.lua deleted file mode 100755 index 8de8c369..00000000 --- a/java/test.lua +++ /dev/null @@ -1,23 +0,0 @@ -svmain = luajava.bindClass('com.google.scrollview.ScrollView') -w1 = luajava.newInstance('com.google.scrollview.ui.SVWindow','1',1,200,100,0,0,640,480) -w1:brush(255,128,0) -w1:drawEllipse(140,280,40,20) -w1:pen(0,255,0) -w1:drawRectangle(20,40,120,240) -w1:drawRectangle(1,1,10,10) -w1:drawLine(100,200,140,280) -w1:pen(255,0,0) -w1:textAttributes('Times',20,0,0,0) -w1:drawText(20,20,'Plain with Publicité') -w1:drawText(200,20,'Russian:??? Traditional Chinese:????') -w1:textAttributes('Times',20,1,0,0) -w1:drawText(20,40,'Bold with Publicité') -w1:textAttributes('Times',20,0,1,0) -w1:drawText(20,60,'Italic with Publicité') -w1:textAttributes('Times',20,0,0,1) -w1:drawText(20,80,'UL with Publicité') -w1:textAttributes('Times',20,1,1,0) -w1:drawText(20,100,'Bold italic with Publicité') -w1:pen(0,0,255) -w1:drawRectangle(4,4,11,11) -w1:update() \ No newline at end of file