[tuxdroid-svn] r5045 - in software_suite_v3/software/tool/tool-tux-controller/trunk: . resources s
Status: Beta
Brought to you by:
ks156
|
From: remi <c2m...@c2...> - 2009-07-03 17:51:37
|
Author: remi
Date: 2009-07-03 19:51:30 +0200 (Fri, 03 Jul 2009)
New Revision: 5045
Added:
software_suite_v3/software/tool/tool-tux-controller/trunk/resources/
software_suite_v3/software/tool/tool-tux-controller/trunk/resources/help.wiki
software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.png
software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.pot
software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.xml
Modified:
software_suite_v3/software/tool/tool-tux-controller/trunk/pom.xml
software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/mainWindow.java
software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle.java
software_suite_v3/software/tool/tool-tux-controller/trunk/src/tuxController/main.java
Log:
* Tux Controller is now embedded into a plugin.
* TODO : Adaptations according to the tux API V3.
Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/pom.xml
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/pom.xml 2009-07-03 17:23:19 UTC (rev 5044)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/pom.xml 2009-07-03 17:51:30 UTC (rev 5045)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.kysoh</groupId>
- <artifactId>tux_controller</artifactId>
+ <artifactId>tool-tux-controller</artifactId>
<packaging>jar</packaging>
<version>0.0.2</version>
<name>Tux Controller</name>
@@ -32,7 +32,7 @@
<dependency>
<groupId>com.tuxisalive</groupId>
<artifactId>tuxdroid-java-api</artifactId>
- <version>0.0.2</version>
+ <version>0.0.3</version>
</dependency>
<dependency>
<groupId>com.l2fprod</groupId>
@@ -40,8 +40,8 @@
<version>6.7</version>
</dependency>
<dependency>
- <groupId>com.tuxdroid</groupId>
- <artifactId>tuxdroid-installer-paths</artifactId>
+ <groupId>com.kysoh</groupId>
+ <artifactId>smart-core-paths</artifactId>
<version>0.0.1</version>
</dependency>
</dependencies>
@@ -63,6 +63,7 @@
</resources>
<sourceDirectory>src</sourceDirectory>
<plugins>
+ <!--This section copy the dependencies into ./libraries-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -74,28 +75,60 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/</outputDirectory>
+ <outputDirectory>./libraries</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
+ <!--This plugin run small ant scripts to pack and clean the plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <!--Set the manifest : mainclass and classpath-->
- <manifest>
- <mainClass>tuxController.main</mainClass>
- <packageName>tuxController</packageName>
- </manifest>
- <manifestEntries>
- <Class-Path>./tuxdroid-api.jar ./skinlf.jar ./tuxdroid-installer-paths.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+
+ <!--This section create the .scp file during the package lifecycle-->
+ <execution>
+ <phase>package</phase>
+ <id>package</id>
+ <configuration>
+ <tasks>
+ <mkdir dir="./libraries"/>
+ <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+ todir="./libraries" />
+ <zip destfile="./${project.artifactId}.scp">
+ <zipfileset dir="." includes="resources/*" />
+ <zipfileset dir="." includes="libraries/*" >
+ <exclude name="libraries/tuxdroid-java-api*" />
+ <exclude name="libraries/smart-core-paths*" />
+ </zipfileset>
+ <zipfileset dir="." includes="executables/*" />
+ </zip>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <!--This section clean the ./libraries and the SCP file during the 'clean' lifecycle-->
+ <execution>
+ <phase>clean</phase>
+ <configuration>
+ <tasks>
+ <delete dir="./libraries"/>
+ <delete file="./${project.artifactId}.scp"></delete>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+
+ <!--This plugin compile the project-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Added: software_suite_v3/software/tool/tool-tux-controller/trunk/resources/help.wiki
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/resources/help.wiki (rev 0)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/resources/help.wiki 2009-07-03 17:51:30 UTC (rev 5045)
@@ -0,0 +1,2 @@
+= Synopsis =
+Tux Droid Controller tool.
Added: software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.png
===================================================================
(Binary files differ)
Property changes on: software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.pot
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.pot (rev 0)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.pot 2009-07-03 17:51:30 UTC (rev 5045)
@@ -0,0 +1,8 @@
+msgid "Tux Droid Controller"
+msgstr ""
+
+msgid "Tux Droid Controller tool"
+msgstr ""
+
+msgid "Start the tool"
+msgstr ""
Added: software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.xml
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.xml (rev 0)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/resources/plugin.xml 2009-07-03 17:51:30 UTC (rev 5045)
@@ -0,0 +1,23 @@
+<plugin>
+ <interpreter
+ kind="java">
+ <executable>tuxController.main</executable>
+ </interpreter>
+ <description>
+ <name>Tux Droid Controller</name>
+ <ttsName>Tux Droid Controller.</ttsName>
+ <description>Tux Droid Controller tool</description>
+ <author>Paul Rathgeb</author>
+ <version>0.0.2</version>
+ <iconFile>resources/plugin.png</iconFile>
+ <uuid>548f7a77-567d-773e-a0ef-321fe63a1c88</uuid>
+ <platform>all</platform>
+ </description>
+ <parameters/>
+ <commands>
+ <command
+ name="run"
+ description="Start the tool" />
+ </commands>
+ <tasks/>
+</plugin>
Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/mainWindow.java
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/mainWindow.java 2009-07-03 17:23:19 UTC (rev 5044)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/src/GUI/mainWindow.java 2009-07-03 17:51:30 UTC (rev 5045)
@@ -73,6 +73,9 @@
java.awt.EventQueue.invokeLater(new Runnable() {
public void run() {
setVisible(true);
+ /* Force the frame to be on the top in the os */
+ setAlwaysOnTop(true);
+ setAlwaysOnTop(false);
}
});
control = new controlTux(this);
Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle.java
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle.java 2009-07-03 17:23:19 UTC (rev 5044)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/src/i18n/bundle.java 2009-07-03 17:51:30 UTC (rev 5045)
@@ -30,7 +30,7 @@
private static final ResourceBundle RESOURCE_BUNDLE;
- private static final String ccLang = System.getProperty("CC_SET_LANGUAGE");
+ private static final String ccLang = System.getenv("tgp_language");
static
{
Modified: software_suite_v3/software/tool/tool-tux-controller/trunk/src/tuxController/main.java
===================================================================
--- software_suite_v3/software/tool/tool-tux-controller/trunk/src/tuxController/main.java 2009-07-03 17:23:19 UTC (rev 5044)
+++ software_suite_v3/software/tool/tool-tux-controller/trunk/src/tuxController/main.java 2009-07-03 17:51:30 UTC (rev 5045)
@@ -26,7 +26,7 @@
import GUI.mainWindow;
import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
import com.l2fprod.util.OS;
-import com.tuxdroid.path.InstallerPaths;
+import com.kysoh.SmartCorePaths;
import javax.swing.JDialog;
import javax.swing.JFrame;
@@ -67,7 +67,7 @@
{
SkinLookAndFeel.setSkin(
SkinLookAndFeel.loadThemePack(
- InstallerPaths.tuxSkinlfThempack.getAbsolutePath()));
+ SmartCorePaths.tuxSkinlfThempack.getAbsolutePath()));
UIManager.setLookAndFeel(new SkinLookAndFeel());
if (OS.isOneDotFourOrMore())
@@ -97,7 +97,7 @@
{
SkinLookAndFeel.setSkin(
SkinLookAndFeel.loadThemePack(
- InstallerPaths.tuxSkinlfThempack.getAbsolutePath()));
+ SmartCorePaths.tuxSkinlfThempack.getAbsolutePath()));
UIManager.setLookAndFeel(new SkinLookAndFeel());
}
catch (Exception e) {}
|