[Java-link-svn] SF.net SVN: java-link: [9] trunk
Status: Pre-Alpha
Brought to you by:
welterde0
Menu
▾
▴
[Java-link-svn] SF.net SVN: java-link: [9] trunk
|
From: <wel...@us...> - 2006-09-02 19:01:18
|
Revision: 9
http://svn.sourceforge.net/java-link/?rev=9&view=rev
Author: welterde0
Date: 2006-09-02 11:54:25 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
added build file for unix(which installs ant and maven) and an ant buildfile(which may also work on windows)
written some test case code
added some Share::net::hl code
added some Share::net::ll code
written some Share::net::ll::xml code
updated images and fonts
updated world system
added missing sflogo tags in the site code of share and server
updated pom of client, share and server(all: removed root, tag; client: added compile scope to the deps(Bugfix)
updated client nbproject
updated laf code in client
updated gui code in client
Modified Paths:
--------------
trunk/client/nbproject/project.xml
trunk/client/pom.xml
trunk/client/src/main/java/org/jlink/ClientFrontend.java
trunk/server/pom.xml
trunk/share/pom.xml
trunk/share/src/main/java/org/jlink/net/hl/HLHandler.java
trunk/share/src/main/java/org/jlink/net/hl/HLProtocol.java
trunk/share/src/main/java/org/jlink/net/hl/HLRegistry.java
trunk/share/src/main/java/org/jlink/net/ll/xml/XMLConfiguration.java
trunk/share/src/main/java/org/jlink/world/Session.java
trunk/share/src/test/java/org/jlink/net/ll/LLEventTest.java
trunk/templates/maven2/pom.xml
Added Paths:
-----------
trunk/build.xml
trunk/build_unix.sh
trunk/client/src/main/java/org/jlink/client/Core.java
trunk/client/src/main/java/org/jlink/client/Main.java
trunk/client/src/main/java/org/jlink/gui/net/
trunk/client/src/main/java/org/jlink/gui/net/ll/
trunk/client/src/main/java/org/jlink/gui/net/ll/ConfigurationWrapper.java
trunk/server/src/site/
trunk/server/src/site/site.xml
trunk/share/src/main/java/org/jlink/ControllerSupport.java
trunk/share/src/main/java/org/jlink/net/hl/HLEvent.java
trunk/share/src/main/java/org/jlink/net/hl/sys/
trunk/share/src/main/java/org/jlink/net/ll/LLProtocol.java
trunk/share/src/main/java/org/jlink/net/ll/xml/XMLProtocol.java
trunk/share/src/main/java/org/jlink/world/AvatarController.java
trunk/share/src/main/resources/
trunk/share/src/main/resources/org/
trunk/share/src/main/resources/org/jlink/
trunk/share/src/main/resources/org/jlink/resources/
trunk/share/src/main/resources/org/jlink/resources/fonts/
trunk/share/src/main/resources/org/jlink/resources/fonts/battle3.ttf
trunk/share/src/main/resources/org/jlink/resources/theme/
trunk/share/src/main/resources/org/jlink/resources/theme/account-register.png
trunk/share/src/main/resources/org/jlink/resources/theme/system-change_server.png
trunk/share/src/main/resources/org/jlink/resources/theme/system-exit.png
trunk/share/src/site/
trunk/share/src/site/site.xml
trunk/util/
trunk/util/apache-ant-1.6.5-bin.tar.bz2
trunk/util/maven-2.0.4-bin.tar.bz2
Removed Paths:
-------------
trunk/client/src/main/java/org/jlink/client/gui/Colors.java
trunk/client/src/main/java/org/jlink/client/gui/MenuBean.java
trunk/client/src/main/java/org/jlink/gui/JInternalFrameFactory.java
trunk/client/src/main/java/org/jlink/gui/laf/
trunk/share/src/main/java/org/jlink/resources/fonts/
trunk/share/src/main/java/org/jlink/resources/theme/
Added: trunk/build.xml
===================================================================
--- trunk/build.xml (rev 0)
+++ trunk/build.xml 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * build.xml
+ *
+ * Created on 04. August 2006, 14:53
+ *
+ * JLink: An Introversion Uplink Clone with multiplayer support.
+ * Copyright (C) 2006 Tassilo Schweyer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-->
+<project name="jlink" default="default" basedir=".">
+ <!--Global-->
+
+ <!--Targets-->
+ <target name="share">
+ <exec executable="mvn" dir="share" output="share.build.log" failonerror="true">
+ <arg value="compile"/>
+ </exec>
+ <exec executable="mvn" dir="share" output="share.build.log" failonerror="true">
+ <arg value="install"/>
+ </exec>
+ </target>
+
+
+
+ <target name="server" depends="share">
+ <exec executable="mvn" dir="server" output="server.build.log">
+ <arg value="compile"/>
+ </exec>
+ <exec executable="mvn" dir="server" output="server.build.log">
+ <arg value="assembly:assembly"/>
+ </exec>
+ </target>
+
+ <target name="client-deps" depends="share">
+ <mkdir dir="tmp"/>
+
+ <echo message="downloading dep client/lafplugin.jar"/>
+ <get src="http://dl.sourceforge.net/java-link/lafplugin-0.1.jar" dest="tmp/lafplugin.jar"/>
+ <echo message="installing it"/>
+ <exec executable="mvn">
+ <arg line="install:install-file -DgroupId=org.jvnet -DartifactId=lafplugin -Dversion=0.1 -Dpackaging=jar -Dfile=tmp/lafplugin.jar"/>
+ </exec>
+ <echo message="[done]"/>
+
+ <echo message="downloading dep client/nanoxml.jar"/>
+ <get src="http://dl.sourceforge.net/java-link/nanoxml_lite-2.2.3.jar" dest="tmp/nanoxml.jar"/>
+ </target>
+
+ <target name="client" depends="client-deps">
+ <exec executable="mvn" dir="client" output="client.build.log">
+ <arg value="compile"/>
+ </exec>
+ <exec executable="mvn" dir="client" output="client.build.log">
+ <arg value="assembly:assembly"/>
+ </exec>
+ </target>
+
+
+
+ <target name="default" depends="client, server">
+
+ </target>
+</project>
Added: trunk/build_unix.sh
===================================================================
--- trunk/build_unix.sh (rev 0)
+++ trunk/build_unix.sh 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+export MVN_VERSION=2.0.4
+export MVN_FILE=maven-$MVN_VERSION-bin.tar.bz2
+
+export ANT_VERSION=1.6.5
+export ANT_FILE=apache-ant-$ANT_VERSION-bin.tar.bz2
+export ANT_HOME=`pwd`/util/apache-ant-$ANT_VERSION
+
+export PATH=`pwd`/util/maven-$MVN_VERSION/bin:`pwd`/util/apache-ant-$ANT_VERSION/bin:$PATH
+
+function fail_mvn() {
+ echo "couldnt find maven and couldnt install it"
+ exit 1
+}
+
+function install_mvn() {
+ tar -xjC util -f util/$MVN_FILE
+}
+
+function check_mvn() {
+ echo "checking maven2...."
+ mvn -version &> /dev/null || install_mvn
+ mvn -version &> /dev/null || fail_mvn
+ set_color GREEN && echo "[ok]" && set_color NORMAL
+ #TODO add color and right positon
+}
+
+function fail_ant() {
+ echo "couldnt find ant and couldnt install it"
+ exit 1
+}
+
+function install_ant() {
+ tar -xjC util -f util/$ANT_FILE
+}
+
+function check_ant() {
+ echo "checking ant...."
+ ant -version &> /dev/null || install_ant
+ ant -version &> /dev/null || fail_ant
+ set_color GREEN && echo "[ok]" && set_color NORMAL
+ #TODO add color and right positon
+}
+
+
+
+
+
+
+##The main code
+check_mvn
+check_ant
+
+ant
Property changes on: trunk/build_unix.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/client/nbproject/project.xml
===================================================================
--- trunk/client/nbproject/project.xml 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/client/nbproject/project.xml 2006-09-02 18:54:25 UTC (rev 9)
@@ -1,121 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <name>JLink Client</name>
- <properties>
- <property name="ant.script">nbproject/mavencall.xml</property>
- <property-file>nbproject/project.properties</property-file>
- </properties>
- <folders>
- <source-folder>
- <label>src/main/java</label>
- <type>java</type>
- <location>src/main/java</location>
- </source-folder>
- <source-folder>
- <label>src/test/java</label>
- <type>java</type>
- <location>src/test/java</location>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <script>${ant.script}</script>
- <target>build</target>
- </action>
- <action name="clean">
- <script>${ant.script}</script>
- <target>clean</target>
- </action>
- <action name="rebuild">
- <script>${ant.script}</script>
- <target>clean</target>
- <target>build</target>
- </action>
- <action name="javadoc">
- <script>${ant.script}</script>
- <target>javadoc</target>
- </action>
- <action name="run">
- <script>${ant.script}</script>
- <target>run</target>
- </action>
- <action name="test">
- <script>${ant.script}</script>
- <target>test</target>
- </action>
- </ide-actions>
- <view>
- <items>
- <source-file>
- <label>pom</label>
- <location>pom.xml</location>
- </source-file>
- <source-file>
- <label>mavencall</label>
- <location>nbproject/mavencall.xml</location>
- </source-file>
- <source-folder style="packages">
- <label>src/main/java</label>
- <location>src/main/java</location>
- </source-folder>
- <source-folder style="packages">
- <label>src/test/java</label>
- <location>src/test/java</location>
- </source-folder>
- <source-folder style="tree">
- <label>src/main/resources</label>
- <location>src/main/resources</location>
- </source-folder>
- <source-folder style="tree">
- <label>src/test/resources</label>
- <location>src/test/resources</location>
- </source-folder>
- <source-folder style="tree">
- <label>src/site</label>
- <location>src/site</location>
- </source-folder>
- <source-folder style="tree">
- <label>target</label>
- <location>target</location>
- </source-folder>
- </items>
- <context-menu>
- <action>
- <script>${ant.script}</script>
- <label>Refresh Project</label>
- <target>refresh-project</target>
- </action>
- <ide-action name="build"/>
- <ide-action name="clean"/>
- <ide-action name="rebuild"/>
- <ide-action name="javadoc"/>
- <ide-action name="run"/>
- <ide-action name="test"/>
- <action>
- <script>${ant.script}</script>
- <label>Format Code</label>
- <target>jalopy</target>
- </action>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
- <compilation-unit>
- <package-root>src/main/java</package-root>
- <classpath mode="compile">${local.repository}/org/jvnet/substance/core/2.2.02/core-2.2.02.jar:${local.repository}/jdom/jdom/1.0/jdom-1.0.jar:${local.repository}/org/jlink/share/0.0.1-SNAPSHOT/share-0.0.1-SNAPSHOT.jar:${local.repository}/org/jvnet/swing-layout/core/1.0/core-1.0.jar:${local.repository}/log4j/log4j/1.2.13/log4j-1.2.13.jar</classpath>
- <built-to>target/classes</built-to>
- <source-level>1.4</source-level>
- </compilation-unit>
- <compilation-unit>
- <package-root>src/test/java</package-root>
- <unit-tests/>
- <classpath mode="compile">target/classes:${local.repository}/org/jvnet/substance/core/2.2.02/core-2.2.02.jar:${local.repository}/junit/junit/3.8.1/junit-3.8.1.jar:${local.repository}/jdom/jdom/1.0/jdom-1.0.jar:${local.repository}/org/jlink/share/0.0.1-SNAPSHOT/share-0.0.1-SNAPSHOT.jar:${local.repository}/org/jvnet/swing-layout/core/1.0/core-1.0.jar:${local.repository}/log4j/log4j/1.2.13/log4j-1.2.13.jar</classpath>
- <built-to>target/test-classes</built-to>
- <source-level>1.4</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
\ No newline at end of file
+ <type>org.netbeans.modules.ant.freeform</type>
+ <configuration>
+ <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+ <name>JLink Client</name>
+ <properties>
+ <property name="ant.script">nbproject/mavencall.xml</property>
+ <property-file>nbproject/project.properties</property-file>
+ </properties>
+ <folders>
+ <source-folder>
+ <label>src/main/java</label>
+ <type>java</type>
+ <location>src/main/java</location>
+ </source-folder>
+ <source-folder>
+ <label>src/test/java</label>
+ <type>java</type>
+ <location>src/test/java</location>
+ </source-folder>
+ </folders>
+ <ide-actions>
+ <action name="build">
+ <script>${ant.script}</script>
+ <target>build</target>
+ </action>
+ <action name="clean">
+ <script>${ant.script}</script>
+ <target>clean</target>
+ </action>
+ <action name="rebuild">
+ <script>${ant.script}</script>
+ <target>clean</target>
+ <target>build</target>
+ </action>
+ <action name="javadoc">
+ <script>${ant.script}</script>
+ <target>javadoc</target>
+ </action>
+ <action name="run">
+ <script>${ant.script}</script>
+ <target>run</target>
+ </action>
+ <action name="test">
+ <script>${ant.script}</script>
+ <target>test</target>
+ </action>
+ </ide-actions>
+ <export>
+ <type>folder</type>
+ <location>target/classes</location>
+ <script>${ant.script}</script>
+ <build-target>build</build-target>
+ </export>
+ <export>
+ <type>folder</type>
+ <location>target/test-classes</location>
+ <script>${ant.script}</script>
+ <build-target>build</build-target>
+ </export>
+ <view>
+ <items>
+ <source-folder style="packages">
+ <label>src/main/java</label>
+ <location>src/main/java</location>
+ </source-folder>
+ <source-folder style="packages">
+ <label>src/test/java</label>
+ <location>src/test/java</location>
+ </source-folder>
+ <source-file>
+ <label>pom</label>
+ <location>pom.xml</location>
+ </source-file>
+ <source-file>
+ <label>mavencall</label>
+ <location>nbproject/mavencall.xml</location>
+ </source-file>
+ <source-folder style="tree">
+ <label>src/main/resources</label>
+ <location>src/main/resources</location>
+ </source-folder>
+ <source-folder style="tree">
+ <label>src/test/resources</label>
+ <location>src/test/resources</location>
+ </source-folder>
+ <source-folder style="tree">
+ <label>src/site</label>
+ <location>src/site</location>
+ </source-folder>
+ <source-folder style="tree">
+ <label>target</label>
+ <location>target</location>
+ </source-folder>
+ </items>
+ <context-menu>
+ <action>
+ <script>${ant.script}</script>
+ <label>Refresh Project</label>
+ <target>refresh-project</target>
+ </action>
+ <ide-action name="build"/>
+ <ide-action name="clean"/>
+ <ide-action name="rebuild"/>
+ <ide-action name="javadoc"/>
+ <ide-action name="run"/>
+ <ide-action name="test"/>
+ <action>
+ <script>${ant.script}</script>
+ <label>Format Code</label>
+ <target>jalopy</target>
+ </action>
+ </context-menu>
+ </view>
+ <subprojects/>
+ </general-data>
+ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
+ <compilation-unit>
+ <package-root>src/main/java</package-root>
+ <classpath mode="compile">${local.repository}/org/jvnet/substance/core/2.2.02/core-2.2.02.jar:${local.repository}/jdom/jdom/1.0/jdom-1.0.jar:${local.repository}/org/jlink/share/0.0.1-SNAPSHOT/share-0.0.1-SNAPSHOT.jar:${local.repository}/org/jvnet/swing-layout/core/1.0/core-1.0.jar:${local.repository}/log4j/log4j/1.2.13/log4j-1.2.13.jar</classpath>
+ <built-to>target/classes</built-to>
+ <source-level>1.5</source-level>
+ </compilation-unit>
+ <compilation-unit>
+ <package-root>src/test/java</package-root>
+ <unit-tests/>
+ <classpath mode="compile">target/classes:${local.repository}/org/jvnet/substance/core/2.2.02/core-2.2.02.jar:${local.repository}/junit/junit/3.8.1/junit-3.8.1.jar:${local.repository}/jdom/jdom/1.0/jdom-1.0.jar:${local.repository}/org/jlink/share/0.0.1-SNAPSHOT/share-0.0.1-SNAPSHOT.jar:${local.repository}/org/jvnet/swing-layout/core/1.0/core-1.0.jar:${local.repository}/log4j/log4j/1.2.13/log4j-1.2.13.jar</classpath>
+ <built-to>target/test-classes</built-to>
+ <source-level>1.5</source-level>
+ </compilation-unit>
+ </java-data>
+ </configuration>
+</project>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/client/pom.xml 2006-09-02 18:54:25 UTC (rev 9)
@@ -2,11 +2,6 @@
<!--////////////////////////////////////////
/////////////General////////////////////
/////////////////////////////////////-->
- <parent>
- <artifactId>yamd-root</artifactId>
- <groupId>org.welterde.yamd</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlink</groupId>
<artifactId>client</artifactId>
@@ -25,31 +20,37 @@
<groupId>org.jlink</groupId>
<artifactId>share</artifactId>
<version>0.0.1-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jvnet.substance</groupId>
<artifactId>core</artifactId>
<version>2.2.02</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>saxpath</groupId>
<artifactId>saxpath</artifactId>
<version>1.0-FCS</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.0-FCS</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jvnet.swing-layout</groupId>
<artifactId>core</artifactId>
<version>1.0</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
<!--////////////////////////////////////////
Modified: trunk/client/src/main/java/org/jlink/ClientFrontend.java
===================================================================
--- trunk/client/src/main/java/org/jlink/ClientFrontend.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/client/src/main/java/org/jlink/ClientFrontend.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -32,8 +32,6 @@
import org.jlink.client.frontend.menu.MainMenuListener;
import org.jlink.client.frontend.theme.ThemeManager;
import org.jlink.client.frontend.theme.Theme;
-//import::own::gui
-import org.jlink.client.gui.MenuBean;
//import::sys
//import::sys::io
import java.io.File;
Added: trunk/client/src/main/java/org/jlink/client/Core.java
===================================================================
--- trunk/client/src/main/java/org/jlink/client/Core.java (rev 0)
+++ trunk/client/src/main/java/org/jlink/client/Core.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,93 @@
+/*
+ * Core.java
+ *
+ * Created on 1. Juni 2006, 16:29
+ *
+ * JLink: An Introversion Uplink Clone with multiplayer support.
+ * Copyright (C) 2006 Tassilo Schweyer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.jlink.client;
+
+import org.jlink.Controller;
+import org.jlink.ControllerSupport;
+
+/**
+ *
+ * @author tassilo
+ */
+public class Core implements Controller {
+
+ /** Creates a new instance of Core */
+ public Core() {
+ }
+
+ public void init() {
+ }
+
+ public void start() {
+ if(!this.statInit)
+ this.init();
+ this.statRun = true;
+ this.run();
+ }
+
+ public void join() {
+ synchronized(this.callStop) {
+ try {
+ this.callStop.wait();
+ } catch(InterruptedException exc) {
+
+ }
+ }
+ }
+
+ private void run() {
+ if(!this.statRun)
+ this.start();
+ while(!this.doStop) {
+ try {
+
+
+ Thread.sleep(100);
+ } catch(InterruptedException exc) {
+
+ } finally {
+
+ }
+ }
+ //wake up all threads in join()
+ synchronized(this.callStop) {
+ this.callStop.notifyAll();
+ }
+ }
+
+ public void stop() {
+ this.doStop = true;
+ }
+
+ public void destroy() {
+ }
+
+
+ private boolean doStop = false;
+
+ private boolean statInit = false;
+ private boolean statRun = false;
+
+ private Object callStop = new Object();//lock
+}
Added: trunk/client/src/main/java/org/jlink/client/Main.java
===================================================================
--- trunk/client/src/main/java/org/jlink/client/Main.java (rev 0)
+++ trunk/client/src/main/java/org/jlink/client/Main.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,43 @@
+/*
+ * Main.java
+ *
+ * Created on 27. Mai 2006, 17:19
+ *
+ * JLink: An Introversion Uplink Clone with multiplayer support.
+ * Copyright (C) 2006 Tassilo Schweyer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.jlink.client;
+
+/**
+ *
+ * @author tassilo
+ */
+public class Main {
+
+ /** Creates a new instance of Main */
+ public Main() {
+ }
+
+ /**
+ * @param args the command line arguments
+ */
+ public static void main(String[] args) {
+ // TODO code application logic here
+ }
+
+}
Deleted: trunk/client/src/main/java/org/jlink/client/gui/Colors.java
===================================================================
--- trunk/client/src/main/java/org/jlink/client/gui/Colors.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/client/src/main/java/org/jlink/client/gui/Colors.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -1,40 +0,0 @@
-/*
- * Colors.java
- *
- * Created on 19. Februar 2006, 20:45
- *
- * JLink: An Introversion Uplink Clone with multiplayer support.
- * Copyright (C) 2006 Tassilo Schweyer
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-package org.jlink.client.gui;
-
-//import::sys
-//import::sys::awt
-import java.awt.Color;
-
-/**
- *
- * @author tassilo
- */
-public class Colors {
- private Colors() {
- }
-
- public static final Color MAIN_MENU_BACKGROUND = Color.WHITE;
-
-}
Deleted: trunk/client/src/main/java/org/jlink/client/gui/MenuBean.java
===================================================================
--- trunk/client/src/main/java/org/jlink/client/gui/MenuBean.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/client/src/main/java/org/jlink/client/gui/MenuBean.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -1,131 +0,0 @@
-/*
- * MenuBean.java
- *
- * Created on 27. Februar 2006, 14:47
- *
- * JLink: An Introversion Uplink Clone with multiplayer support.
- * Copyright (C) 2006 Tassilo Schweyer
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-package org.jlink.client.gui;
-
-//import
-//import::sys
-//import::sys::awt
-import java.awt.Color;
-import java.awt.event.ActionListener;
-//import::sys::swing
-import javax.swing.JComponent;
-import javax.swing.JButton;
-import javax.swing.Icon;
-//import::sys::util
-import java.util.Map;
-import java.util.HashMap;
-//import::sys::log4j
-import org.apache.log4j.Logger;
-
-
-
-/**
- *
- * @author tassilo
- */
-public class MenuBean {
-
- /** Creates a new instance of MenuBean */
- public MenuBean(double mx, double my) {
- this.c = new JComponent(){};
- this.c.setVisible(true);
- this.db_buttons = new HashMap<String, JButton>();
-
- this.mx = mx;
- this.my = my;
- }
- public JComponent getComponent() {
- return this.c;
- }
-
- ///////////////////////
- ////Core Operations////
- ///////////////////////
- //Buttons
- public void addButton(String id, Icon ico, int x, int y, int w, int h, String tooltip) {
- Logger log = Logger.getLogger("jlink.gui.beans.menu");
- log.debug("addButton(...) called id=" + id);
- JButton b = new JButton(ico);
- b.setActionCommand(id);
- log.debug("calculating");
- int x0 = (int) (x * mx);
- log.debug("x, pre=" + x + ", suf=" + x0);
- int x1 = (int) (w * mx);
- log.debug("w pre=" + w + ", suf=" + x1);
- int y0 = (int) (y * my);
- log.debug("y pre=" + y + ", suf=" + y0);
- int y1 = (int) (h * my);
- log.debug("h pre=" + h + ", suf="+ y1);
- b.setBounds(x0, y0, x1, y1);
- b.setToolTipText(tooltip);
- this.c.add(b);
- this.c.validate();
- this.c.repaint();
- this.db_buttons.put(id, b);
- // TODO: write remove Methode , on demand
- }
-
- public void addButtonListener(String id, ActionListener l) {
- JButton b = this.db_buttons.get(id);
- b.addActionListener(l);
- }
-
- //Style
- public void setBGColor(Color c) {
- this.c.setBackground(c);
- this.c.repaint();
- this.c_bg = c;
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- //Variables
- private JComponent c = null;
- private Color c_bg = Color.WHITE;
- private Map<String, JButton> db_buttons = null;
- private double mx = 1;
- private double my = 1;
-}
Deleted: trunk/client/src/main/java/org/jlink/gui/JInternalFrameFactory.java
===================================================================
--- trunk/client/src/main/java/org/jlink/gui/JInternalFrameFactory.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/client/src/main/java/org/jlink/gui/JInternalFrameFactory.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -1,47 +0,0 @@
-/*
- * JInternalFrameFactory.java
- *
- * Created on 23. März 2006, 21:51
- *
- * JLink: An Introversion Uplink Clone with multiplayer support.
- * Copyright (C) 2006 Tassilo Schweyer
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-package org.jlink.gui;
-
-import javax.swing.JInternalFrame;
-import javax.swing.JPopupMenu;
-import javax.swing.JComponent;
-import javax.swing.plaf.basic.BasicInternalFrameUI;
-
-/**
- *
- * @author tassilo
- */
-public class JInternalFrameFactory {
-
- public static void addPUMenuToIFrame(JInternalFrame f, JPopupMenu m) {
- JComponent c = ((BasicInternalFrameUI) f.getUI()).getNorthPane();
- c.setComponentPopupMenu(m);
-
- }
-
-
-
- private JInternalFrameFactory() {
- }
-}
Added: trunk/client/src/main/java/org/jlink/gui/net/ll/ConfigurationWrapper.java
===================================================================
--- trunk/client/src/main/java/org/jlink/gui/net/ll/ConfigurationWrapper.java (rev 0)
+++ trunk/client/src/main/java/org/jlink/gui/net/ll/ConfigurationWrapper.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,57 @@
+/*
+ * ConfigurationWrapper.java
+ *
+ * Created on 27. Mai 2006, 14:12
+ *
+ * JLink: An Introversion Uplink Clone with multiplayer support.
+ * Copyright (C) 2006 Tassilo Schweyer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.jlink.gui.net.ll;
+
+//import
+//import::own
+import org.jlink.net.ll.LLConfiguration;
+//import::sys
+import javax.swing.JPanel;
+
+
+/**
+ *
+ * @author tassilo
+ */
+public class ConfigurationWrapper {
+ public static ConfigurationWrapper create(LLConfiguration conf) {
+
+ //TODO: write creation code
+ return null;
+ }
+ public LLConfiguration getConfig() {
+ return this.data_conf;
+ }
+
+
+
+
+
+
+ /** Creates a new instance of ConfigurationWrapper */
+ private ConfigurationWrapper() {
+ }
+
+ private LLConfiguration data_conf = null;
+}
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/server/pom.xml 2006-09-02 18:54:25 UTC (rev 9)
@@ -2,11 +2,6 @@
<!--////////////////////////////////////////
/////////////General////////////////////
/////////////////////////////////////-->
- <parent>
- <artifactId>yamd-root</artifactId>
- <groupId>org.welterde.yamd</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlink</groupId>
<artifactId>server</artifactId>
Added: trunk/server/src/site/site.xml
===================================================================
--- trunk/server/src/site/site.xml (rev 0)
+++ trunk/server/src/site/site.xml 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="JLink Client">
+ <bannerRight>
+ <src>http://sflogo.sourceforge.net/sflogo.php?group_id=162264&type=3</src>
+ </bannerRight>
+ <body>
+ ${reports}
+ </body>
+</project>
Modified: trunk/share/pom.xml
===================================================================
--- trunk/share/pom.xml 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/share/pom.xml 2006-09-02 18:54:25 UTC (rev 9)
@@ -2,11 +2,6 @@
<!--////////////////////////////////////////
/////////////General////////////////////
/////////////////////////////////////-->
- <parent>
- <artifactId>yamd-root</artifactId>
- <groupId>org.welterde.yamd</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlink</groupId>
<artifactId>share</artifactId>
Added: trunk/share/src/main/java/org/jlink/ControllerSupport.java
===================================================================
--- trunk/share/src/main/java/org/jlink/ControllerSupport.java (rev 0)
+++ trunk/share/src/main/java/org/jlink/ControllerSupport.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,79 @@
+/*
+ * ControllerSupport.java
+ *
+ * Created on 1. Juni 2006, 16:29
+ *
+ * JLink: An Introversion Uplink Clone with multiplayer support.
+ * Copyright (C) 2006 Tassilo Schweyer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.jlink;
+
+/**
+ *
+ * @author tassilo
+ */
+public class ControllerSupport implements Controller {
+
+ /** Creates a new instance of ControllerSupport */
+ public ControllerSupport() {
+ }
+
+ public void init() {
+ if(this.valid)
+ ;//TODO: exception
+ this.valid = true;
+ }
+
+ public void start() {
+ if(this.running)
+ ;//TODO: exception
+ this.running = true;
+ }
+
+ public void join() {
+ synchronized(this.obj) {
+ try {
+ this.obj.wait();
+ } catch(InterruptedException e) {
+
+ }
+ }
+ }
+
+ public void stop() {
+ if(!this.running)
+ ;//TODO: exception
+ this.running = false;
+ synchronized(this.obj) {
+ this.obj.notify();
+ }
+ }
+
+ public void destroy() {
+ if(!this.valid)
+ ;//TODO: exception
+ if(this.running)
+ ;//TODO: exception
+ this.valid = false;
+ }
+
+
+ private boolean valid = false;
+ private boolean running = false;
+ private Object obj = "sadfsd";
+}
Added: trunk/share/src/main/java/org/jlink/net/hl/HLEvent.java
===================================================================
--- trunk/share/src/main/java/org/jlink/net/hl/HLEvent.java (rev 0)
+++ trunk/share/src/main/java/org/jlink/net/hl/HLEvent.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,32 @@
+/*
+ * HLEvent.java
+ *
+ * Created on 27. Mai 2006, 12:41
+ *
+ * JLink: An Introversion Uplink Clone with multiplayer support.
+ * Copyright (C) 2006 Tassilo Schweyer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.jlink.net.hl;
+
+/**
+ *
+ * @author tassilo
+ */
+public interface HLEvent {
+
+}
Modified: trunk/share/src/main/java/org/jlink/net/hl/HLHandler.java
===================================================================
--- trunk/share/src/main/java/org/jlink/net/hl/HLHandler.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/share/src/main/java/org/jlink/net/hl/HLHandler.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -23,10 +23,17 @@
package org.jlink.net.hl;
+import org.jlink.net.ll.LLEvent;
+
/**
*
* @author tassilo
*/
public interface HLHandler {
+ public LLEvent encode(HLEvent evt);
+ public HLEvent decode(LLEvent evt);
+ public boolean handles(LLEvent evt);
+ public boolean handles(HLEvent evt);
+ public HLHandler getParent();
}
Modified: trunk/share/src/main/java/org/jlink/net/hl/HLProtocol.java
===================================================================
--- trunk/share/src/main/java/org/jlink/net/hl/HLProtocol.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/share/src/main/java/org/jlink/net/hl/HLProtocol.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -23,6 +23,8 @@
package org.jlink.net.hl;
+import org.jlink.net.ll.LLEvent;
+
/**
*
* @author tassilo
Modified: trunk/share/src/main/java/org/jlink/net/hl/HLRegistry.java
===================================================================
--- trunk/share/src/main/java/org/jlink/net/hl/HLRegistry.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/share/src/main/java/org/jlink/net/hl/HLRegistry.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -33,4 +33,6 @@
public HLRegistry() {
}
+
+
}
Added: trunk/share/src/main/java/org/jlink/net/ll/LLProtocol.java
===================================================================
--- trunk/share/src/main/java/org/jlink/net/ll/LLProtocol.java (rev 0)
+++ trunk/share/src/main/java/org/jlink/net/ll/LLProtocol.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,34 @@
+/*
+ * LLProtocol.java
+ *
+ * Created on 27. Mai 2006, 13:02
+ *
+ * JLink: An Introversion Uplink Clone with multiplayer support.
+ * Copyright (C) 2006 Tassilo Schweyer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.jlink.net.ll;
+
+/**
+ *
+ * @author tassilo
+ */
+public interface LLProtocol {
+ public LLFactory createClient();
+
+ public LLServerFactory createServer();
+}
Modified: trunk/share/src/main/java/org/jlink/net/ll/xml/XMLConfiguration.java
===================================================================
--- trunk/share/src/main/java/org/jlink/net/ll/xml/XMLConfiguration.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/share/src/main/java/org/jlink/net/ll/xml/XMLConfiguration.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -37,26 +37,45 @@
}
public String[] getNames() {
- return null;
+ return this.dat_names;
}
public String getDefault(int id) {
- return null;
+ return this.dat_default[id];
}
public String getValue(int id) {
- return null;
+ return this.dat_values[id];
}
- public String getDescription(int id, Locale l) {
- return null;
+ public String getDescription(int id, final Locale l) {
+ return this.getDescription(id);
}
public String getDescription(int id) {
- return null;
+ return this.dat_descs[id];
}
public void setValue(int id, String val) {
+ this.dat_values[id] = val;
}
+
+
+ private String[] dat_names = new String[] {
+ "Host",
+ "Port",
+ "compress"
+ };
+ private String[] dat_default = new String[] {
+ "localhost",
+ "4236",
+ "true"
+ };
+ private String[] dat_values = new String[3];
+ private String[] dat_descs = new String[] {
+ "The Hostname of the remote host",
+ "The Port of the remote host",
+ "Should the Data be compressed(true/false)"
+ };
}
Added: trunk/share/src/main/java/org/jlink/net/ll/xml/XMLProtocol.java
===================================================================
--- trunk/share/src/main/java/org/jlink/net/ll/xml/XMLProtocol.java (rev 0)
+++ trunk/share/src/main/java/org/jlink/net/ll/xml/XMLProtocol.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,48 @@
+/*
+ * XMLProtocol.java
+ *
+ * Created on 27. Mai 2006, 13:05
+ *
+ * JLink: An Introversion Uplink Clone with multiplayer support.
+ * Copyright (C) 2006 Tassilo Schweyer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.jlink.net.ll.xml;
+
+import org.jlink.net.ll.LLFactory;
+import org.jlink.net.ll.LLProtocol;
+import org.jlink.net.ll.LLServerFactory;
+
+/**
+ *
+ * @author tassilo
+ */
+public class XMLProtocol implements LLProtocol {
+
+ /** Creates a new instance of XMLProtocol */
+ public XMLProtocol() {
+ }
+
+ public LLFactory createClient() {
+ return new XMLFactory();
+ }
+
+ public LLServerFactory createServer() {
+ return null;
+ }
+
+}
Added: trunk/share/src/main/java/org/jlink/world/AvatarController.java
===================================================================
--- trunk/share/src/main/java/org/jlink/world/AvatarController.java (rev 0)
+++ trunk/share/src/main/java/org/jlink/world/AvatarController.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,35 @@
+/*
+ * AvatarController.java
+ *
+ * Created on 25. Juni 2006, 15:13
+ *
+ * JLink: An Introversion Uplink Clone with multiplayer support.
+ * Copyright (C) 2006 Tassilo Schweyer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.jlink.world;
+
+/**
+ *
+ * @author tassilo
+ */
+public interface AvatarController {
+ public Avatar get(String name) throws SessionException;
+ public Avatar[] list() throws SessionException;
+ public Avatar create(String name) throws SessionException;
+ public void delete(String name) throws SessionException;
+}
Modified: trunk/share/src/main/java/org/jlink/world/Session.java
===================================================================
--- trunk/share/src/main/java/org/jlink/world/Session.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/share/src/main/java/org/jlink/world/Session.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -37,4 +37,8 @@
public Avatar[] avatarList() throws SessionException;
public Avatar avatarCreate(String name) throws SessionException;
public void avatarDelete(String name) throws SessionException;
+
+ //lookup
+ public Object lookup(String name);
+ public Object lookup(Class c);
}
Added: trunk/share/src/main/resources/org/jlink/resources/fonts/battle3.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/share/src/main/resources/org/jlink/resources/fonts/battle3.ttf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/share/src/main/resources/org/jlink/resources/theme/account-register.png
===================================================================
(Binary files differ)
Property changes on: trunk/share/src/main/resources/org/jlink/resources/theme/account-register.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/share/src/main/resources/org/jlink/resources/theme/system-change_server.png
===================================================================
(Binary files differ)
Property changes on: trunk/share/src/main/resources/org/jlink/resources/theme/system-change_server.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/share/src/main/resources/org/jlink/resources/theme/system-exit.png
===================================================================
(Binary files differ)
Property changes on: trunk/share/src/main/resources/org/jlink/resources/theme/system-exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/share/src/site/site.xml
===================================================================
--- trunk/share/src/site/site.xml (rev 0)
+++ trunk/share/src/site/site.xml 2006-09-02 18:54:25 UTC (rev 9)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="JLink Client">
+ <bannerRight>
+ <src>http://sflogo.sourceforge.net/sflogo.php?group_id=162264&type=3</src>
+ </bannerRight>
+ <body>
+ ${reports}
+ </body>
+</project>
Modified: trunk/share/src/test/java/org/jlink/net/ll/LLEventTest.java
===================================================================
--- trunk/share/src/test/java/org/jlink/net/ll/LLEventTest.java 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/share/src/test/java/org/jlink/net/ll/LLEventTest.java 2006-09-02 18:54:25 UTC (rev 9)
@@ -41,12 +41,9 @@
LLEvent instance = new LLEvent();
- int expResult = 0;
+ int expResult = -1;
int result = instance.getMsgClass();
assertEquals(expResult, result);
-
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
}
/**
@@ -59,9 +56,7 @@
LLEvent instance = new LLEvent();
instance.setMsgClass(c);
-
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
+ assertEquals(c, instance.getMsgClass());
}
/**
@@ -72,12 +67,9 @@
LLEvent instance = new LLEvent();
- long expResult = 0L;
+ long expResult = -1L;
long result = instance.getMsgID();
assertEquals(expResult, result);
-
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
}
/**
@@ -90,9 +82,13 @@
LLEvent instance = new LLEvent();
instance.setMsgID(id);
-
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
+ assertEquals(id, instance.getMsgID());
+ id = 1L;
+ instance.setMsgID(id);
+ assertEquals(id, instance.getMsgID());
+ id = -1L;
+ instance.setMsgID(id);
+ assertEquals(id, instance.getMsgID());
}
/**
@@ -103,12 +99,9 @@
LLEvent instance = new LLEvent();
- long expResult = 0L;
+ long expResult = -1L;
long result = instance.getMsgReply();
assertEquals(expResult, result);
-
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
}
/**
@@ -121,9 +114,13 @@
LLEvent instance = new LLEvent();
instance.setMsgReply(reply);
-
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
+ assertEquals(reply, instance.getMsgReply());
+ reply = 1L;
+ instance.setMsgReply(reply);
+ assertEquals(reply, instance.getMsgReply());
+ reply = -1L;
+ instance.setMsgReply(reply);
+ assertEquals(reply, instance.getMsgReply());
}
/**
@@ -149,14 +146,12 @@
*/
public void testSetInt() {
System.out.println("setInt");
-
- int val = 0;
LLEvent instance = new LLEvent();
- instance.setInt(val);
-
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
+ instance.setInt(1);
+ assertEquals(1, instance.getInt());
+ instance.setInt(-1);
+ assertEquals(-1, instance.getInt());
}
/**
@@ -166,28 +161,22 @@
System.out.println("getMap");
LLEvent instance = new LLEvent();
-
- Map expResult = null;
- Map result = instance.getMap();
- assertEquals(expResult, result);
-
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
+ Map r1 = instance.getMap();
+ assertNotNull(r1);
+ Map r2 = instance.getMap();
+ assertEquals(r1, r2);
}
-
/**
* Test of setMap method, of class org.jlink.net.ll.LLEvent.
*/
public void testSetMap() {
System.out.println("setMap");
- Map m = null;
+ Map m = new HashMap();
LLEvent instance = new LLEvent();
instance.setMap(m);
-
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
+ assertEquals(m, instance.getMap());
}
/**
Modified: trunk/templates/maven2/pom.xml
===================================================================
--- trunk/templates/maven2/pom.xml 2006-05-15 18:34:32 UTC (rev 8)
+++ trunk/templates/maven2/pom.xml 2006-09-02 18:54:25 UTC (rev 9)
@@ -2,11 +2,6 @@
<!--////////////////////////////////////////
/////////////General////////////////////
/////////////////////////////////////-->
- <parent>
- <artifactId>yamd-root</artifactId>
- <groupId>org.welterde.yamd</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jlink</groupId>
<artifactId>${name}</artifactId>
Added: trunk/util/apache-ant-1.6.5-bin.tar.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/util/apache-ant-1.6.5-bin.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/util/maven-2.0.4-bin.tar.bz2
===================================================================
(Binary files differ)
Property changes on: trunk/util/maven-2.0.4-bin.tar.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
