ajfsp-Link ans GUI uebergeben. " +
+ " Das GUI wird ggf gestartet.");
+ System.out.println();
+ hilfeAusgegeben = true;
+ } else if (curArg.contains("-command=")) {
+ if (linkListener == null) {
+ try {
+ linkListener = new LinkListener();
+ } catch (IOException ex) {
+ //bereits ein GUI vorhanden, also GUI schliessen
+ doubleInstance = true;
+ }
+ }
+
+ if (doubleInstance) {
+ int PORT = OptionsManagerImpl.getInstance().getLinkListenerPort();
+ String passwort = OptionsManagerImpl.getInstance().getRemoteSettings().getOldPassword();
+ Socket socket = new Socket("localhost", PORT);
+ PrintStream out = new PrintStream(socket.getOutputStream());
+ DataInputStream in = new DataInputStream(socket.getInputStream());
+
+ out.println(passwort + "|" + curArg);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+ String line = reader.readLine();
+
+ System.out.println(line);
+ socket.close();
+ System.exit(1);
+ } else {
+ System.out.println("appleJuice-JavaGUI nicht gestartet");
+ System.exit(1);
+ }
+ } else if (curArg.startsWith("ajfsp://") || (curArg.contains("-link=") && curArg.length() > "-link=".length() + 1)) {
+ link = curArg.startsWith("ajfsp://") ? curArg : curArg.substring(curArg.indexOf("-link=") + "-link=".length());
+ link = link.replaceAll("%7C", "|");
+
+ if (linkListener == null) {
+ try {
+ linkListener = new LinkListener();
+ } catch (IOException ex) {
+ //bereits ein GUI vorhanden, also GUI schliessen
+ doubleInstance = true;
+ }
+ }
+
+ if (doubleInstance) {
+ int PORT = OptionsManagerImpl.getInstance().getLinkListenerPort();
+ String passwort = OptionsManagerImpl.getInstance().getRemoteSettings().getOldPassword();
+ Socket socket = new Socket("localhost", PORT);
+ PrintStream out = new PrintStream(socket.getOutputStream());
+
+ out.println(passwort + "|" + curArg);
+ socket.close();
+ //war nur Linkprocessing, also GUI schliessen
+ System.exit(1);
+ } else {
+ linkListener.processLink(link, "");
+ }
+ }
+ }
+ } catch (IOException ioE) {
+ //Keine bisherige GUI-Instanz vorhanden, also GUI oeffnen
+ processLink = true;
+ } catch (Exception e) {
+ System.exit(1);
+ }
+ }
+
+ if (linkListener == null) {
+ try {
+ linkListener = new LinkListener();
+ } catch (IOException ex) {
+ //bereits ein GUI vorhanden, also GUI schliessen
+ doubleInstance = true;
+ }
+ }
+
+ if (doubleInstance) {
+ //bereits ein GUI vorhanden, also GUI schliessen
+ JOptionPane.showMessageDialog(new Frame(), "Eine Instanz des GUIs ist bereits in Verwendung.", "appleJuice Client", JOptionPane.ERROR_MESSAGE);
+ System.exit(1);
+ }
+
+ if (processLink) {
+ linkListener.processLink(link, "");
+ }
+
+ boolean isDebug = System.getProperty("Debug") != null;
+
+ if (isDebug) {
+ ConsoleAppender consoleAppender = new ConsoleAppender(new PatternLayout("%d [%t] %-5p %c - %m%n"));
+
+ Logger.getRootLogger().addAppender(consoleAppender);
+ Logger.getRootLogger().setLevel(Level.DEBUG);
+ } else {
+ Logger rootLogger = Logger.getRootLogger();
+
+ String datum = new SimpleDateFormat("ddMMyyyy_HHmmss").format(new Date(System.currentTimeMillis()));
+ String dateiName;
+
+ dateiName = datum + ".html";
+ layout = new HTMLLayout();
+ layout.setTitle("appleJuice-GUI-Log " + datum);
+ layout.setLocationInfo(true);
+ Level logLevel = OptionsManagerImpl.getInstance().getLogLevel();
+
+ try {
+ String path = getRootDirectory() + File.separator + "logs";
+ File aFile = new File(path);
+
+ if (!aFile.exists()) {
+ aFile.mkdir();
+ }
+
+ fileAppenderPath = path + File.separator + dateiName;
+ if (logLevel != Level.OFF) {
+ FileAppender fileAppender = new FileAppender(layout, fileAppenderPath);
+
+ rootLogger.removeAllAppenders();
+ rootLogger.addAppender(fileAppender);
+ }
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+
+ rootLogger.setLevel(logLevel);
+ }
+
+ if (System.getProperty("os.name").toLowerCase().contains("linux")) {
+ try {
+ Toolkit xToolkit = Toolkit.getDefaultToolkit();
+ java.lang.reflect.Field awtAppClassNameField = xToolkit.getClass().getDeclaredField("awtAppClassName");
+ awtAppClassNameField.setAccessible(true);
+ awtAppClassNameField.set(xToolkit, "AJCoreGUI");
+ } catch (Exception ignored) {
+ }
+ }
+
+ try {
+ String nachricht = "appleJuice-GUI " + AppleJuiceDialog.getVersion() + " wird gestartet...";
+ ConnectFrame connectFrame = new ConnectFrame();
+
+ splash = new Splash(connectFrame, IconManager.getInstance().getIcon("splashscreen").getImage(), 0, 100);
+ KeyStates ks = new KeyStates();
+
+ splash.addKeyListener(ks);
+ splash.setVisible(true);
+ try {
+ if (OptionsManagerImpl.getInstance().isThemesSupported()) {
+ java.lang.reflect.Method method = JFrame.class.getMethod("setDefaultLookAndFeelDecorated",
+ new Class[]{boolean.class});
+
+ method.invoke(null, new Object[]{Boolean.TRUE});
+
+ method = JDialog.class.getMethod("setDefaultLookAndFeelDecorated", new Class[]{boolean.class});
+ method.invoke(null, new Object[]{Boolean.TRUE});
+ }
+ } catch (Exception e) {
+ if (logger.isEnabledFor(Level.FATAL)) {
+ logger.fatal("Programmabbruch", e);
+ }
+ }
+
+ if (logger.isEnabledFor(Level.INFO)) {
+ logger.info(nachricht);
+ }
+
+ System.out.println(nachricht);
+ if (logger.isEnabledFor(Level.INFO)) {
+ nachricht = "erkanntes GUI-OS: " + System.getProperty("os.name");
+ logger.info(nachricht);
+ nachricht = "erkannte Java-Version: " + System.getProperty("java.version");
+ logger.info(nachricht);
+ }
+
+ String titel = null;
+ LanguageSelector languageSelector = LanguageSelector.getInstance();
+ QuickConnectionSettingsDialog remoteDialog;
+
+ splash.setProgress(5, "Lade Themes...");
+ AppleJuiceDialog.initThemes();
+ splash.setProgress(10, "Teste Verbindung...");
+ boolean showDialog = OptionsManagerImpl.getInstance().shouldShowConnectionDialogOnStartup();
+ boolean keyDown = ks.isKeyDown(KeyEvent.VK_SHIFT);
+
+ if (!showDialog) {
+ showDialog = keyDown;
+ }
+
+ boolean firstTry = keyDown ? false : true;
+ int erreichbarkeit = 2;
+
+ if (ajFassade == null) {
+ getAjFassade();
+ }
+ while (showDialog || (erreichbarkeit = ajFassade.isCoreAvailable()) != 0) {
+ splash.setVisible(false);
+ if (!showDialog) {
+ if (erreichbarkeit == 2) {
+ titel = languageSelector.getFirstAttrbuteByTagName("mainform.caption");
+ nachricht = languageSelector.getFirstAttrbuteByTagName("javagui.startup.fehlversuch");
+ SoundPlayer.getInstance().playSound(SoundPlayer.VERWEIGERT);
+ JOptionPane.showMessageDialog(connectFrame, nachricht, titel, JOptionPane.ERROR_MESSAGE);
+ } else {
+ titel = languageSelector.getFirstAttrbuteByTagName("mainform.caption");
+ nachricht = languageSelector.getFirstAttrbuteByTagName("mainform.msgdlgtext3");
+ SoundPlayer.getInstance().playSound(SoundPlayer.VERWEIGERT);
+ JOptionPane.showMessageDialog(connectFrame, nachricht, titel, JOptionPane.ERROR_MESSAGE);
+ }
+ }
+
+ showDialog = false;
+ remoteDialog = new QuickConnectionSettingsDialog(connectFrame);
+ if (firstTry && OptionsManagerImpl.getInstance().isErsterStart()) {
+ firstTry = false;
+ remoteDialog.setNieWiederAnzeigen();
+ remoteDialog.pressOK();
+ } else {
+ remoteDialog.setVisible(true);
+ if (remoteDialog.getResult() == QuickConnectionSettingsDialog.ABGEBROCHEN) {
+ nachricht = languageSelector.getFirstAttrbuteByTagName("javagui.startup.verbindungsfehler");
+ nachricht = nachricht.replaceFirst("%s", OptionsManagerImpl.getInstance().getRemoteSettings().getHost());
+ JOptionPane.showMessageDialog(connectFrame, nachricht, titel, JOptionPane.OK_OPTION);
+ logger.fatal(nachricht);
+ System.out.println("Fehler: " + nachricht);
+ System.exit(-1);
+ }
+ }
+
+ splash.setVisible(true);
+ }
+
+ SoundPlayer.getInstance().playSound(SoundPlayer.ZUGANG_GEWAEHRT);
+
+ splash.setProgress(20, "Lade Hauptdialog...");
+ SwingUtilities.invokeLater(() -> {
+ final AppleJuiceDialog theApp = new AppleJuiceDialog();
+
+ splash.setProgress(100, "GUI geladen...");
+ PositionManager lm = PositionManagerImpl.getInstance();
+
+ if (lm.isLegal()) {
+ theApp.setLocation(lm.getMainXY());
+ theApp.setSize(lm.getMainDimension());
+ } else {
+ Toolkit tk = Toolkit.getDefaultToolkit();
+ Dimension screenSize = tk.getScreenSize();
+ Dimension appScreenSize = new Dimension(screenSize.width, screenSize.height);
+ Insets insets = tk.getScreenInsets(theApp.getGraphicsConfiguration());
+
+ appScreenSize.width -= (insets.left + insets.right);
+ appScreenSize.width = appScreenSize.width / 5 * 4;
+ appScreenSize.height -= (insets.top + insets.bottom);
+ appScreenSize.height = appScreenSize.height / 5 * 4;
+ Point location = new Point((screenSize.width - appScreenSize.width) / 2,
+ (screenSize.height - appScreenSize.height) / 2);
+
+ lm.setMainXY(location);
+ lm.setMainDimension(appScreenSize);
+ theApp.setSize(appScreenSize);
+ theApp.setLocation(location);
+ }
+
+ theApp.setVisible(true);
+ String nachricht1 = "appleJuice-GUI gestartet...";
+
+ if (logger.isEnabledFor(Level.INFO)) {
+ logger.info(nachricht1);
+ }
+
+ System.out.println(nachricht1);
+ splash.dispose();
+ if (OptionsManagerImpl.getInstance().isErsterStart()) {
+ showConnectionWizard(theApp);
+ }
+
+ boolean UpdateInfo = OptionsManagerImpl.getInstance().getUpdateInfo();
+
+ if (UpdateInfo) {
+ VersionChecker.check();
+ }
+ });
+
+ } catch (Exception e) {
+ if (logger.isEnabledFor(Level.FATAL)) {
+ logger.fatal("Programmabbruch", e);
+ }
+
+ System.exit(-1);
+ }
+ }
+
+ private static String getRootDirectory() {
+ if (rootDirectory == null) {
+ rootDirectory = System.getProperty("user.home") + File.separator + "appleJuice" + File.separator + "gui";
+ }
+
+ return rootDirectory;
+ }
+
+ public static void showConnectionWizard(JFrame frame) throws HeadlessException {
+ WizardDialog wizardDialog = new WizardDialog(frame, true);
+ Dimension appDimension = wizardDialog.getSize();
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+
+ wizardDialog.setLocation((screenSize.width - appDimension.width) / 2, (screenSize.height - appDimension.height) / 2);
+ wizardDialog.setVisible(true);
+ }
+
+ public static boolean showConnectionWizard(JDialog dialog, AJSettings ajSettings)
+ throws HeadlessException {
+ WizardDialog wizardDialog = new WizardDialog(dialog, true, ajSettings);
+ Dimension appDimension = wizardDialog.getSize();
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+
+ wizardDialog.setLocation((screenSize.width - appDimension.width) / 2, (screenSize.height - appDimension.height) / 2);
+ wizardDialog.setVisible(true);
+ return wizardDialog.isRegularClosed();
+ }
+
+ public static String getPropertiesPath() {
+ String dir = System.getProperty("user.home") + File.separator + "appleJuice";
+ File directory = new File(dir);
+
+ if (!directory.isDirectory()) {
+ directory.mkdir();
+ }
+
+ dir += File.separator + "gui";
+ directory = new File(dir);
+ if (!directory.isDirectory()) {
+ directory.mkdir();
+ }
+
+ dir += File.separator + "ajgui.properties";
+ return dir;
+ }
+}
diff --git a/AJClientGUI/src/de/applejuicenet/client/AppleJuiceClientTG.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/AppleJuiceClientTG.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/AppleJuiceClientTG.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/AppleJuiceClientTG.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/ApplejuiceFassade.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/ApplejuiceFassade.java
similarity index 98%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/ApplejuiceFassade.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/ApplejuiceFassade.java
index 798d522a..8ed8184b 100644
--- a/ajcorefassade/src/de/applejuicenet/client/fassade/ApplejuiceFassade.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/ApplejuiceFassade.java
@@ -17,7 +17,6 @@
import de.applejuicenet.client.fassade.controller.CoreConnectionSettingsHolder;
import de.applejuicenet.client.fassade.controller.DataPropertyChangeInformer;
import de.applejuicenet.client.fassade.controller.DataUpdateInformer;
-import de.applejuicenet.client.fassade.controller.json.ReleaseInfoJsonLoader;
import de.applejuicenet.client.fassade.controller.xml.DirectoryXMLHolder;
import de.applejuicenet.client.fassade.controller.xml.GetObjectXMLHolder;
import de.applejuicenet.client.fassade.controller.xml.InformationXMLHolder;
@@ -50,13 +49,11 @@
import de.applejuicenet.client.fassade.shared.HtmlLoader;
import de.applejuicenet.client.fassade.shared.NetworkInfo;
import de.applejuicenet.client.fassade.shared.ProxySettings;
-import de.applejuicenet.client.fassade.shared.ReleaseInfo;
import de.applejuicenet.client.fassade.shared.StringConstants;
import de.applejuicenet.client.fassade.tools.MD5Encoder;
public class ApplejuiceFassade implements CoreConnectionSettingsListener
{
- public static final String FASSADE_VERSION = "F-1.23";
public static final String MIN_NEEDED_CORE_VERSION = "0.30.146.1203";
public static final String ERROR_MESSAGE = "Unbehandelte Exception";
public static String separator;
@@ -1137,12 +1134,6 @@ public void fireSettingsChanged(ITEM item, String oldValue, String newValue)
{
}
- public ReleaseInfo getReleaseInfo(String hash, ProxySettings proxy)
- throws Exception
- {
- return new ReleaseInfoJsonLoader(hash, proxy).getReleaseInfo();
- }
-
private class CancelThread extends Thread
{
private Search search;
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/CoreConnectionSettingsHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/CoreConnectionSettingsHolder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/CoreConnectionSettingsHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/CoreConnectionSettingsHolder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/DataPropertyChangeInformer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/DataPropertyChangeInformer.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/DataPropertyChangeInformer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/DataPropertyChangeInformer.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/DataUpdateInformer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/DataUpdateInformer.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/DataUpdateInformer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/DataUpdateInformer.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/DirectoryDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/DirectoryDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/DirectoryDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/DirectoryDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/DirectoryXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/DirectoryXMLHolder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/DirectoryXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/DirectoryXMLHolder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/DownloadDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/DownloadDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/DownloadDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/DownloadDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/DownloadSourceDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/DownloadSourceDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/DownloadSourceDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/DownloadSourceDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/GetObjectXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/GetObjectXMLHolder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/GetObjectXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/GetObjectXMLHolder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/InformationDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/InformationDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/InformationDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/InformationDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/InformationXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/InformationXMLHolder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/InformationXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/InformationXMLHolder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ModifiedXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ModifiedXMLHolder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ModifiedXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ModifiedXMLHolder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/NetworkServerXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/NetworkServerXMLHolder.java
similarity index 95%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/NetworkServerXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/NetworkServerXMLHolder.java
index 4dfbfc16..6aa4296d 100644
--- a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/NetworkServerXMLHolder.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/NetworkServerXMLHolder.java
@@ -89,7 +89,7 @@ public String[] getNetworkKnownServers()
try
{
- xmlData = WebsiteContentLoader.getWebsiteContent("http://www.applejuicenet.org", 80, "/serverlist/xmllist.php");
+ xmlData = WebsiteContentLoader.getWebsiteContent("https://www.applejuicenet.de", 443, "/serverlist/xmllist.php");
if(xmlData == null || xmlData.length() == 0)
{
return null;
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/PartListDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/PartListDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/PartListDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/PartListDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/PartListXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/PartListXMLHolder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/PartListXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/PartListXMLHolder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/SearchDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/SearchDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/SearchDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/SearchDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/SecurerXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/SecurerXMLHolder.java
similarity index 98%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/SecurerXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/SecurerXMLHolder.java
index 1259574f..70d7c91e 100644
--- a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/SecurerXMLHolder.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/SecurerXMLHolder.java
@@ -28,7 +28,7 @@
* Titel: AppleJuice Client-GUI
*
*
- * Beschreibung: Offizielles GUI f�r den von muhviehstarr entwickelten
+ * Beschreibung: Offizielles GUI für den von muhviehstarr entwickelten
* appleJuice-Core
*
*
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ServerDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ServerDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ServerDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ServerDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/SessionXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/SessionXMLHolder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/SessionXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/SessionXMLHolder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/SettingsXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/SettingsXMLHolder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/SettingsXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/SettingsXMLHolder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ShareDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ShareDO.java
similarity index 95%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ShareDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ShareDO.java
index a2cc1889..9bc1bdca 100644
--- a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ShareDO.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ShareDO.java
@@ -140,4 +140,8 @@ public void setSearchCount(long searchCount)
{
this.searchCount = searchCount;
}
+
+ public String getAjfspLink() {
+ return String.format("ajfsp://file|%s|%s|%s/", getShortfilename(), getCheckSum(), getSize());
+ }
}
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ShareEntryDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ShareEntryDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ShareEntryDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ShareEntryDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ShareXMLHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ShareXMLHolder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/ShareXMLHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/ShareXMLHolder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/UploadDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/UploadDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/UploadDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/UploadDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/VersionDO.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/VersionDO.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/VersionDO.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/VersionDO.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/WebXMLParser.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/WebXMLParser.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/WebXMLParser.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/WebXMLParser.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/XMLValueHolder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/XMLValueHolder.java
similarity index 96%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/XMLValueHolder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/XMLValueHolder.java
index 1958ff42..790c665f 100644
--- a/ajcorefassade/src/de/applejuicenet/client/fassade/controller/xml/XMLValueHolder.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/controller/xml/XMLValueHolder.java
@@ -4,10 +4,8 @@
package de.applejuicenet.client.fassade.controller.xml;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.StringReader;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
import java.util.Properties;
import org.apache.xerces.parsers.SAXParser;
@@ -35,7 +33,8 @@ public void parseProperties(File propertiesFile) throws IllegalArgumentException
FileInputStream fiS = new FileInputStream(propertiesFile);
values.clear();
- values.load(fiS);
+
+ values.load(new InputStreamReader(fiS, StandardCharsets.UTF_8));
fiS.close();
}
catch(Exception e)
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Directory.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Directory.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/Directory.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Directory.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Download.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Download.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/Download.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Download.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/DownloadSource.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/DownloadSource.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/DownloadSource.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/DownloadSource.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/FileName.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/FileName.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/FileName.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/FileName.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/IdOwner.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/IdOwner.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/IdOwner.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/IdOwner.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Information.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Information.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/Information.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Information.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Part.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Part.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/Part.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Part.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/PartList.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/PartList.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/PartList.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/PartList.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Search.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Search.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/Search.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Search.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/SearchEntry.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/SearchEntry.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/SearchEntry.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/SearchEntry.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Server.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Server.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/Server.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Server.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Share.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Share.java
similarity index 91%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/Share.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Share.java
index 89c7ff7e..1bd0829b 100644
--- a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Share.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Share.java
@@ -15,8 +15,10 @@ public interface Share extends IdOwner{
int getPrioritaet();
long getAskCount();
-
+
long getLastAsked();
-
+
long getSearchCount();
+
+ String getAjfspLink();
}
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/ShareEntry.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/ShareEntry.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/ShareEntry.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/ShareEntry.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Upload.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Upload.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/Upload.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Upload.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/entity/Version.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Version.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/entity/Version.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/entity/Version.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/event/DataPropertyChangeEvent.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/event/DataPropertyChangeEvent.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/event/DataPropertyChangeEvent.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/event/DataPropertyChangeEvent.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/event/DownloadDataPropertyChangeEvent.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/event/DownloadDataPropertyChangeEvent.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/event/DownloadDataPropertyChangeEvent.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/event/DownloadDataPropertyChangeEvent.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/exception/CoreLostException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/CoreLostException.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/exception/CoreLostException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/CoreLostException.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/exception/IllegalArgumentException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/IllegalArgumentException.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/exception/IllegalArgumentException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/IllegalArgumentException.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/exception/NoAccessException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/NoAccessException.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/exception/NoAccessException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/NoAccessException.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/exception/WebSiteNotFoundException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/WebSiteNotFoundException.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/exception/WebSiteNotFoundException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/WebSiteNotFoundException.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/exception/WrongPasswordException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/WrongPasswordException.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/exception/WrongPasswordException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/exception/WrongPasswordException.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/listener/CoreConnectionSettingsListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/listener/CoreConnectionSettingsListener.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/listener/CoreConnectionSettingsListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/listener/CoreConnectionSettingsListener.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/listener/CoreStatusListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/listener/CoreStatusListener.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/listener/CoreStatusListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/listener/CoreStatusListener.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/listener/DataPropertyChangeListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/listener/DataPropertyChangeListener.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/listener/DataPropertyChangeListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/listener/DataPropertyChangeListener.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/listener/DataUpdateListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/listener/DataUpdateListener.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/listener/DataUpdateListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/listener/DataUpdateListener.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/AJSettings.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/AJSettings.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/AJSettings.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/AJSettings.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/FileType.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/FileType.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/FileType.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/FileType.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/HtmlLoader.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/HtmlLoader.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/HtmlLoader.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/HtmlLoader.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/NetworkInfo.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/NetworkInfo.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/NetworkInfo.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/NetworkInfo.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/ProxySettings.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/ProxySettings.java
similarity index 89%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/ProxySettings.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/ProxySettings.java
index bb9397c5..8a8db171 100644
--- a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/ProxySettings.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/ProxySettings.java
@@ -5,6 +5,8 @@
package de.applejuicenet.client.fassade.shared;
+import java.util.Base64;
+
/**
* $Header:
* /cvsroot/applejuicejava/ajcorefassade/src/de/applejuicenet/client/fassade/shared/ProxySettings.java,v
@@ -64,7 +66,8 @@ public String getUserpass()
public void setUserpass(String user, String passwort)
{
- this.userpass = new sun.misc.BASE64Encoder().encode((user + ":" + passwort).getBytes());
+ Base64.Encoder base64Encoder = Base64.getEncoder().withoutPadding();
+ this.userpass = base64Encoder.encodeToString((user + ":" + passwort).getBytes());
}
public boolean isUse()
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/StringConstants.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/StringConstants.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/StringConstants.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/StringConstants.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/WebsiteContentLoader.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/WebsiteContentLoader.java
similarity index 87%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/WebsiteContentLoader.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/WebsiteContentLoader.java
index d2c3d4ab..91ff397d 100644
--- a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/WebsiteContentLoader.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/WebsiteContentLoader.java
@@ -12,7 +12,9 @@
import java.net.URL;
import java.net.URLConnection;
+import de.applejuicenet.client.fassade.ApplejuiceFassade;
import de.applejuicenet.client.fassade.exception.NoAccessException;
+import de.applejuicenet.client.gui.AppleJuiceDialog;
/**
* $Header:
@@ -58,6 +60,9 @@ public static String getWebsiteContent(ProxySettings proxySettings, String websi
uc.setRequestProperty("Proxy-Authorization", "Basic " + proxySettings.getUserpass());
}
+ uc.setRequestProperty("User-Agent",
+ String.format("AJCoreGUI/%s; Java/%s; (%s/%s)", AppleJuiceDialog.getVersion(), System.getProperty("java.version"), System.getProperty("os.name"), System.getProperty("os.version")));
+
InputStream content = uc.getInputStream();
BufferedReader in = new BufferedReader(new InputStreamReader(content));
String line;
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/XMLDecoder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/XMLDecoder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/XMLDecoder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/XMLDecoder.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/ZLibUtils.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/ZLibUtils.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/ZLibUtils.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/ZLibUtils.java
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/ZeichenErsetzer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/ZeichenErsetzer.java
similarity index 86%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/shared/ZeichenErsetzer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/ZeichenErsetzer.java
index dab4b068..a897e058 100644
--- a/ajcorefassade/src/de/applejuicenet/client/fassade/shared/ZeichenErsetzer.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/shared/ZeichenErsetzer.java
@@ -32,25 +32,25 @@ public static String korrigiereUmlaute(String text) {
temp.replace(index, index + 2, "\"");
}
while ((index = temp.indexOf("ü")) != -1) {
- temp.replace(index, index + 6, "");
+ temp.replace(index, index + 6, "ü");
}
while ((index = temp.indexOf("Ü")) != -1) {
- temp.replace(index, index + 6, "");
+ temp.replace(index, index + 6, "Ü");
}
while ((index = temp.indexOf("ä")) != -1) {
- temp.replace(index, index + 6, "");
+ temp.replace(index, index + 6, "ä");
}
while ((index = temp.indexOf("Ä")) != -1) {
- temp.replace(index, index + 6, "");
+ temp.replace(index, index + 6, "Ä");
}
while ((index = temp.indexOf("ö")) != -1) {
- temp.replace(index, index + 6, "");
+ temp.replace(index, index + 6, "ö");
}
while ((index = temp.indexOf("Ö")) != -1) {
- temp.replace(index, index + 6, "");
+ temp.replace(index, index + 6, "Ö");
}
while ((index = temp.indexOf("ß")) != -1) {
- temp.replace(index, index + 7, "");
+ temp.replace(index, index + 7, "ß");
}
while ((index = temp.indexOf("&")) != -1) {
temp.replace(index, index + 5, "");
diff --git a/ajcorefassade/src/de/applejuicenet/client/fassade/tools/MD5Encoder.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/tools/MD5Encoder.java
similarity index 100%
rename from ajcorefassade/src/de/applejuicenet/client/fassade/tools/MD5Encoder.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/fassade/tools/MD5Encoder.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/AppleJuiceDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/AppleJuiceDialog.java
similarity index 74%
rename from AJClientGUI/src/de/applejuicenet/client/gui/AppleJuiceDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/AppleJuiceDialog.java
index 8499de08..cdf4a613 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/AppleJuiceDialog.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/AppleJuiceDialog.java
@@ -16,8 +16,6 @@
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.InputEvent;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -32,12 +30,7 @@
import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
+import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -62,13 +55,12 @@
import javax.swing.ToolTipManager;
import javax.swing.UIManager;
import javax.swing.border.BevelBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import javax.swing.filechooser.FileFilter;
import com.l2fprod.gui.plaf.skin.Skin;
import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
+import de.applejuicenet.client.gui.tray.TrayLoader;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -81,8 +73,6 @@
import de.applejuicenet.client.fassade.listener.DataUpdateListener;
import de.applejuicenet.client.fassade.shared.AJSettings;
import de.applejuicenet.client.fassade.shared.NetworkInfo;
-import de.applejuicenet.client.fassade.shared.ProxySettings;
-import de.applejuicenet.client.fassade.shared.WebsiteContentLoader;
import de.applejuicenet.client.gui.about.AboutDialog;
import de.applejuicenet.client.gui.controller.LanguageSelector;
import de.applejuicenet.client.gui.controller.OptionsManager;
@@ -90,7 +80,6 @@
import de.applejuicenet.client.gui.controller.PositionManager;
import de.applejuicenet.client.gui.controller.PositionManagerImpl;
import de.applejuicenet.client.gui.controller.PropertiesManager;
-import de.applejuicenet.client.gui.controller.ProxyManagerImpl;
import de.applejuicenet.client.gui.download.DownloadController;
import de.applejuicenet.client.gui.download.DownloadPanel;
import de.applejuicenet.client.gui.listener.LanguageListener;
@@ -100,7 +89,6 @@
import de.applejuicenet.client.gui.server.ServerPanel;
import de.applejuicenet.client.gui.share.ShareController;
import de.applejuicenet.client.gui.share.SharePanel;
-import de.applejuicenet.client.gui.tray.TrayIF;
import de.applejuicenet.client.gui.upload.UploadController;
import de.applejuicenet.client.gui.upload.UploadPanel;
import de.applejuicenet.client.shared.IconManager;
@@ -134,15 +122,13 @@
public class AppleJuiceDialog extends TKLFrame implements LanguageListener, DataUpdateListener
{
- //CVS-Beispiel 0.60.0-1-CVS
- public static final String GUI_VERSION = "0.71.2";
- private static Logger logger = Logger.getLogger(AppleJuiceDialog.class);
+ private static final Logger logger = Logger.getLogger(AppleJuiceDialog.class);
private static Map themes = null;
public static boolean rewriteProperties = false;
private static AppleJuiceDialog theApp;
private static boolean themesInitialized = false;
private static boolean useTrayIcon = false;
- private static TrayIF trayLoader = null;
+ private static TrayLoader trayLoader = null;
private Information information = null;
private RegisterPanel registerPane;
private TKLLabel[] statusbar = new TKLLabel[6];
@@ -212,6 +198,10 @@ public AppleJuiceDialog()
}
}
+ public static String getVersion() {
+ return AppleJuiceDialog.class.getPackage().getImplementationVersion();
+ }
+
private void initKeyStrokes()
{
int tabCount = registerPane.getTabCount();
@@ -219,7 +209,7 @@ private void initKeyStrokes()
for(int i = 0; i < tabCount; i++)
{
int event = i < 9 ? KeyEvent.VK_1 + i : KeyEvent.VK_A + i - 9;
- KeyStroke stroke = KeyStroke.getKeyStroke(event, InputEvent.CTRL_DOWN_MASK);
+ KeyStroke stroke = KeyStroke.getKeyStroke(event, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask());
final int index = i;
AbstractAction action = new AbstractAction()
{
@@ -336,7 +326,7 @@ public static AppleJuiceDialog getApp()
@SuppressWarnings("unchecked")
private void init() throws Exception
{
- titel = "appleJuice Client (GUI " + AppleJuiceDialog.GUI_VERSION + "/" + ApplejuiceFassade.FASSADE_VERSION + ")";
+ titel = "appleJuice GUI (" + AppleJuiceDialog.getVersion() + ")";
IconManager im = IconManager.getInstance();
firewallIcon = im.getIcon("firewall");
@@ -346,7 +336,6 @@ private void init() throws Exception
Image image = im.getIcon("applejuice").getImage();
setTitle(titel);
- String osName = System.getProperty("os.name");
setIconImage(image);
menuItemOptionen.setIcon(im.getIcon("optionen"));
@@ -445,11 +434,9 @@ public void componentMoved(ComponentEvent e)
popup = makeSwingPopup();
try
{
- Class trayLoaderClass = Class.forName("de.applejuicenet.client.gui.tray.TrayLoader");
+ TrayLoader trayLoader = new TrayLoader();
- trayLoader = (TrayIF) trayLoaderClass.newInstance();
-
- useTrayIcon = trayLoader.makeTray(image, titel, this, popupShowHideMenuItem, zeigenIcon, versteckenIcon, popup);
+ useTrayIcon = trayLoader.makeTray(titel, this, popupShowHideMenuItem, zeigenIcon, versteckenIcon, popup);
AppleJuiceClient.getAjFassade().addDataUpdateListener(new DataUpdateListener()
{
private Map stati = new HashMap();
@@ -501,13 +488,7 @@ else if(curDownload.getStatus() == Download.FERTIG && oldDownloadStatus != Downl
}
getContentPane().setLayout(new BorderLayout());
- linkPane.getBtnStartDownload().addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- uebernehmeLink();
- }
- });
+ linkPane.getBtnStartDownload().addActionListener(e -> uebernehmeLink());
getContentPane().add(linkPane, BorderLayout.NORTH);
getContentPane().add(registerPane, BorderLayout.CENTER);
@@ -523,25 +504,21 @@ public void actionPerformed(ActionEvent e)
}
memory.setIcon(IconManager.getInstance().getIcon("mmonitor"));
- memory.addActionListener(new ActionListener()
+ memory.addActionListener(ae -> {
+ if(memoryMonitorDialog == null)
{
- public void actionPerformed(ActionEvent ae)
- {
- if(memoryMonitorDialog == null)
- {
- memoryMonitorDialog = new MemoryMonitorDialog(AppleJuiceDialog.this);
- Point loc = memory.getLocationOnScreen();
+ memoryMonitorDialog = new MemoryMonitorDialog(AppleJuiceDialog.this);
+ Point loc = memory.getLocationOnScreen();
- loc.setLocation(loc.getX() - memoryMonitorDialog.getWidth(), loc.getY() - memoryMonitorDialog.getHeight());
- memoryMonitorDialog.setLocation(loc);
- }
+ loc.setLocation(loc.getX() - memoryMonitorDialog.getWidth(), loc.getY() - memoryMonitorDialog.getHeight());
+ memoryMonitorDialog.setLocation(loc);
+ }
- if(!memoryMonitorDialog.isVisible())
- {
- memoryMonitorDialog.setVisible(true);
- }
- }
- });
+ if(!memoryMonitorDialog.isVisible())
+ {
+ memoryMonitorDialog.setVisible(true);
+ }
+ });
sound.addActionListener(new ActionListener()
{
@@ -654,32 +631,27 @@ public void run()
SoundPlayer.getInstance().playSound(SoundPlayer.LADEN);
if(result.indexOf("ok") != 0)
{
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- String message = null;
+ SwingUtilities.invokeLater(() -> {
+ String message = null;
- if(result.indexOf("already downloaded") != -1)
- {
- message = alreadyLoaded.replaceAll("%s", link);
- }
- else if(result.indexOf("incorrect link") != -1)
- {
- message = invalidLink.replaceAll("%s", link);
- }
- else if(result.indexOf("failure") != -1)
- {
- message = linkFailure;
- }
+ if(result.contains("already downloaded"))
+ {
+ message = alreadyLoaded.replaceAll("%s", link);
+ }
+ else if(result.contains("incorrect link"))
+ {
+ message = invalidLink.replaceAll("%s", link);
+ }
+ else if(result.contains("failure"))
+ {
+ message = linkFailure;
+ }
- if(message != null)
- {
- JOptionPane.showMessageDialog(AppleJuiceDialog.getApp(), message, dialogTitel,
- JOptionPane.OK_OPTION | JOptionPane.INFORMATION_MESSAGE);
- }
- }
- });
+ if(message != null)
+ {
+ JOptionPane.showMessageDialog(AppleJuiceDialog.getApp(), message, dialogTitel, JOptionPane.OK_OPTION | JOptionPane.INFORMATION_MESSAGE);
+ }
+ });
}
}
catch(IllegalArgumentException e)
@@ -842,7 +814,7 @@ protected JMenuBar createMenuBar()
for(int i = 0; i < tempListe.length; i++)
{
- if(tempListe[i].indexOf(".properties") != -1)
+ if(tempListe[i].contains(".properties"))
{
sprachDateien.add(tempListe[i]);
}
@@ -863,47 +835,19 @@ protected JMenuBar createMenuBar()
JMenuBar menuBar = new JMenuBar();
optionenMenu = new JMenu();
- menuItemOptionen.addActionListener(new ActionListener()
+ menuItemOptionen.addActionListener(e -> showOptionsDialog());
+ menuItemDateiliste.addActionListener(e -> dateiListeImportieren());
+ menuItemCheckUpdate.addActionListener(e -> checkAndDisplayUpdate());
+ menuItemCoreBeenden.addActionListener(e -> {
+ int result = JOptionPane.showConfirmDialog(AppleJuiceDialog.getApp(), bestaetigung, "appleJuice Client",
+ JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+
+ if(result == JOptionPane.YES_OPTION)
{
- public void actionPerformed(ActionEvent e)
- {
- showOptionsDialog();
- }
- });
- menuItemDateiliste.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- dateiListeImportieren();
- }
- });
- menuItemCheckUpdate.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- checkAndDisplayUpdate();
- }
- });
- menuItemCoreBeenden.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- int result = JOptionPane.showConfirmDialog(AppleJuiceDialog.getApp(), bestaetigung, "appleJuice Client",
- JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
-
- if(result == JOptionPane.YES_OPTION)
- {
- AppleJuiceClient.getAjFassade().shutdownCore();
- }
- }
- });
- menuItemUeber.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- showAboutDialog();
- }
- });
+ AppleJuiceClient.getAjFassade().shutdownCore();
+ }
+ });
+ menuItemUeber.addActionListener(e -> showAboutDialog());
optionenMenu.add(menuItemOptionen);
optionenMenu.add(menuItemDateiliste);
optionenMenu.add(menuItemCheckUpdate);
@@ -932,21 +876,17 @@ public void actionPerformed(ActionEvent e)
rb.setIcon(result);
sprachMenu.add(rb);
- rb.addItemListener(new ItemListener()
- {
- public void itemStateChanged(ItemEvent ae)
- {
- JCheckBoxMenuItem rb2 = (JCheckBoxMenuItem) ae.getSource();
+ rb.addItemListener(ae -> {
+ JCheckBoxMenuItem rb2 = (JCheckBoxMenuItem) ae.getSource();
- if(rb2.isSelected())
- {
- String path = System.getProperty("user.dir") + File.separator + "language" + File.separator;
- String dateiName = path + rb2.getText().toLowerCase() + ".properties";
+ if(rb2.isSelected())
+ {
+ String path1 = System.getProperty("user.dir") + File.separator + "language" + File.separator;
+ String dateiName = path1 + rb2.getText().toLowerCase() + ".properties";
- LanguageSelector.getInstance(dateiName);
- }
- }
- });
+ LanguageSelector.getInstance(dateiName);
+ }
+ });
lafGroup.add(rb);
}
@@ -972,7 +912,7 @@ public void itemStateChanged(ItemEvent ae)
for(int i = 0; i < themeFiles.length; i++)
{
- if(themeFiles[i].isFile() && themeFiles[i].getName().indexOf(".zip") != -1)
+ if(themeFiles[i].isFile() && themeFiles[i].getName().endsWith(".zip"))
{
//testen, ob es wirklich ein skinfile ist
@@ -1010,28 +950,18 @@ public void itemStateChanged(ItemEvent ae)
rb.setSelected(true);
}
- rb.addItemListener(new ItemListener()
+ rb.addItemListener(ae -> {
+ if(rb.isSelected())
{
- public void itemStateChanged(ItemEvent ae)
- {
- if(rb.isSelected())
- {
- activateLaF(rb.getText());
- }
- }
- });
+ activateLaF(rb.getText());
+ }
+ });
lafGroup2.add(rb);
themesMenu.add(rb);
}
themesMenu.add(new JSeparator());
- menuItemDeaktivieren.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ce)
- {
- activateThemeSupport(false);
- }
- });
+ menuItemDeaktivieren.addActionListener(ce -> activateThemeSupport(false));
themesMenu.add(menuItemDeaktivieren);
}
else
@@ -1055,25 +985,15 @@ public void actionPerformed(ActionEvent ce)
lookAndFeelMenuItem.setSelected(false);
}
- lookAndFeelMenuItem.addItemListener(new ItemListener()
+ lookAndFeelMenuItem.addItemListener(ae -> {
+ if(lookAndFeelMenuItem.isSelected())
{
- public void itemStateChanged(ItemEvent ae)
- {
- if(lookAndFeelMenuItem.isSelected())
- {
- activateLaF(lookAndFeelMenuItem.getText());
- }
- }
- });
- }
-
- menuItemAktivieren.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ce)
- {
- activateThemeSupport(true);
+ activateLaF(lookAndFeelMenuItem.getText());
}
});
+ }
+
+ menuItemAktivieren.addActionListener(ce -> activateThemeSupport(true));
themesMenu.add(new JSeparator());
themesMenu.add(menuItemAktivieren);
}
@@ -1268,17 +1188,17 @@ public void run()
returnValues.append("'" + link + "' OK\n");
somethingAdded = true;
}
- else if(result.indexOf("already downloaded") != -1)
+ else if(result.contains("already downloaded"))
{
returnValues.append(alreadyLoaded.replaceAll("%s", link) + "\n");
somethingAdded = true;
}
- else if(result.indexOf("incorrect link") != -1)
+ else if(result.contains("incorrect link"))
{
returnValues.append(invalidLink.replaceAll("%s", link) + "\n");
somethingAdded = true;
}
- else if(result.indexOf("failure") != -1)
+ else if(result.contains("failure"))
{
returnValues.append(linkFailure + "\n");
somethingAdded = true;
@@ -1288,22 +1208,18 @@ else if(result.indexOf("failure") != -1)
if(somethingAdded)
{
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- JTextPane textArea = new JTextPane();
-
- textArea.setPreferredSize(new Dimension(550, 300));
- textArea.setMaximumSize(new Dimension(550, 300));
- textArea.setEditable(false);
- textArea.setBackground(new TKLLabel().getBackground());
- textArea.setText(returnValues.toString());
- JOptionPane.showMessageDialog(AppleJuiceDialog.getApp(), new JScrollPane(textArea),
- dialogTitel,
- JOptionPane.OK_OPTION | JOptionPane.INFORMATION_MESSAGE);
- }
- });
+ SwingUtilities.invokeLater(() -> {
+ JTextPane textArea = new JTextPane();
+
+ textArea.setPreferredSize(new Dimension(550, 300));
+ textArea.setMaximumSize(new Dimension(550, 300));
+ textArea.setEditable(false);
+ textArea.setBackground(new TKLLabel().getBackground());
+ textArea.setText(returnValues.toString());
+ JOptionPane.showMessageDialog(AppleJuiceDialog.getApp(), new JScrollPane(textArea),
+ dialogTitel,
+ JOptionPane.OK_OPTION | JOptionPane.INFORMATION_MESSAGE);
+ });
}
}
catch(FileNotFoundException ex)
@@ -1383,93 +1299,72 @@ public void fireContentChanged(DATALISTENER_TYPE type, final Object content)
{
if(type == DATALISTENER_TYPE.NETINFO_CHANGED)
{
- SwingUtilities.invokeLater(new Runnable()
+ SwingUtilities.invokeLater(() -> {
+ try
{
- public void run()
+ NetworkInfo netInfo = (NetworkInfo) content;
+
+ if(netInfo.isFirewalled() != firewalled)
{
- try
+ firewalled = !firewalled;
+ updateFirewall();
+ if(firewalled)
{
- NetworkInfo netInfo = (NetworkInfo) content;
-
- if(netInfo.isFirewalled() != firewalled)
- {
- firewalled = !firewalled;
- updateFirewall();
- if(firewalled)
- {
- statusbar[0].setToolTipText(firewallWarning);
- }
- else
- {
- statusbar[0].setToolTipText(null);
- }
-
- updateFirewall();
- }
+ statusbar[0].setToolTipText(firewallWarning);
}
- catch(Exception e)
+ else
{
- logger.error(ApplejuiceFassade.ERROR_MESSAGE, e);
+ statusbar[0].setToolTipText(null);
}
+
+ updateFirewall();
}
- });
+ }
+ catch(Exception e)
+ {
+ logger.error(ApplejuiceFassade.ERROR_MESSAGE, e);
+ }
+ });
}
else if(type == DATALISTENER_TYPE.INFORMATION_CHANGED)
{
- SwingUtilities.invokeLater(new Runnable()
+ SwingUtilities.invokeLater(() -> {
+ try
{
- public void run()
+ information = (Information) content;
+ statusbar[0].setText(getVerbindungsStatusAsString(information));
+ if(information.getVerbindungsStatus() == Information.NICHT_VERBUNDEN)
+ {
+ statusbar[1].setText(keinServer);
+ }
+ else
{
- try
+ String tmp = information.getServerName();
+
+ if(tmp == null || tmp.length() == 0)
{
- if(firstChange)
- {
- firstChange = false;
- SoundPlayer.getInstance().playSound(SoundPlayer.GESTARTET);
- String versionsNr = AppleJuiceClient.getAjFassade().getCoreVersion().getVersion();
-
- titel = LanguageSelector.getInstance().getFirstAttrbuteByTagName("mainform.caption") + " (Core " +
- versionsNr + " - GUI " + AppleJuiceDialog.GUI_VERSION + "/" + ApplejuiceFassade.FASSADE_VERSION +
- ")";
- setTitle(titel);
- repaint();
- }
+ Server server = information.getServer();
- information = (Information) content;
- statusbar[0].setText(getVerbindungsStatusAsString(information));
- if(information.getVerbindungsStatus() == Information.NICHT_VERBUNDEN)
+ if(server != null)
{
- statusbar[1].setText(keinServer);
+ tmp = server.getHost() + ":" + server.getPort();
}
- else
- {
- String tmp = information.getServerName();
-
- if(tmp == null || tmp.length() == 0)
- {
- Server server = information.getServer();
-
- if(server != null)
- {
- tmp = server.getHost() + ":" + server.getPort();
- }
- }
-
- statusbar[1].setText(tmp);
- }
-
- statusbar[2].setText(information.getUpDownAsString());
- statusbar[3].setText(information.getUpDownSessionAsString());
- statusbar[4].setText(information.getExterneIP());
- statusbar[5].setText(information.getCreditsAsString());
- updateFirewall();
- }
- catch(Exception e)
- {
- logger.error(ApplejuiceFassade.ERROR_MESSAGE, e);
}
+
+ statusbar[1].setText(tmp);
}
- });
+
+ statusbar[2].setText(information.getUpDownAsString());
+ statusbar[3].setText(information.getUpDownSessionAsString());
+ statusbar[4].setText(information.getExterneIP());
+ statusbar[5].setText(information.getCreditsAsString());
+ updateFirewall();
+ }
+ catch(Exception e)
+ {
+ logger.error(ApplejuiceFassade.ERROR_MESSAGE, e);
+ }
+ });
}
}
@@ -1496,36 +1391,26 @@ public JPopupMenu makeSwingPopup()
{
final JPopupMenu popup = new JPopupMenu();
- popupShowHideMenuItem.addActionListener(new ActionListener()
+ popupShowHideMenuItem.addActionListener(ae -> {
+ if(!isVisible())
{
- public void actionPerformed(ActionEvent ae)
- {
- if(!isVisible())
- {
- setVisible(true);
- setAlwaysOnTop(true);
- setAlwaysOnTop(false);
- requestFocus();
- }
- else
- {
- if(popup.isVisible())
- {
- popup.setVisible(false);
- }
-
- setVisible(false);
- }
- }
- });
- popup.add(popupShowHideMenuItem);
- popupOptionenMenuItem.addActionListener(new ActionListener()
+ setVisible(true);
+ setAlwaysOnTop(true);
+ setAlwaysOnTop(false);
+ requestFocus();
+ }
+ else
{
- public void actionPerformed(ActionEvent ae)
+ if(popup.isVisible())
{
- showOptionsDialog();
+ popup.setVisible(false);
}
- });
+
+ setVisible(false);
+ }
+ });
+ popup.add(popupShowHideMenuItem);
+ popupOptionenMenuItem.addActionListener(ae -> showOptionsDialog());
popup.add(popupOptionenMenuItem);
IconManager im = IconManager.getInstance();
@@ -1536,13 +1421,7 @@ public void actionPerformed(ActionEvent ae)
popupOptionenMenuItem.setIcon(im.getIcon("optionen"));
popupAboutMenuItem.setIcon(aboutIcon);
- popupAboutMenuItem.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ae)
- {
- showAboutDialog();
- }
- });
+ popupAboutMenuItem.addActionListener(ae -> showAboutDialog());
popup.add(popupAboutMenuItem);
new Thread()
{
@@ -1585,40 +1464,32 @@ public void run()
final TKLLabel label1 = new TKLLabel("50 kb/s");
final TKLLabel label2 = new TKLLabel("50 kb/s");
- label1.setText(Long.toString(ajSettings.getMaxUploadInKB()) + " kb/s");
- label2.setText(Long.toString(ajSettings.getMaxDownloadInKB()) + " kb/s");
+ label1.setText(ajSettings.getMaxUploadInKB() + " kb/s");
+ label2.setText(ajSettings.getMaxDownloadInKB() + " kb/s");
uploadPanel.add(label1, BorderLayout.NORTH);
uploadPanel.add(uploadSlider, BorderLayout.SOUTH);
uploadMenu.add(uploadPanel);
downloadPanel.add(label2, BorderLayout.NORTH);
downloadPanel.add(downloadSlider, BorderLayout.SOUTH);
downloadMenu.add(downloadPanel);
- uploadSlider.addChangeListener(new ChangeListener()
- {
- public void stateChanged(ChangeEvent e)
- {
- JSlider slider = (JSlider) e.getSource();
+ uploadSlider.addChangeListener(e -> {
+ JSlider slider = (JSlider) e.getSource();
- label1.setText(Integer.toString(slider.getValue()) + " kb/s");
- }
- });
- downloadSlider.addChangeListener(new ChangeListener()
- {
- public void stateChanged(ChangeEvent e)
- {
- JSlider slider = (JSlider) e.getSource();
+ label1.setText(slider.getValue() + " kb/s");
+ });
+ downloadSlider.addChangeListener(e -> {
+ JSlider slider = (JSlider) e.getSource();
- label2.setText(Integer.toString(slider.getValue()) + " kb/s");
- }
- });
+ label2.setText(slider.getValue() + " kb/s");
+ });
uploadSlider.addMouseListener(new MouseAdapter()
{
public void mouseReleased(MouseEvent e)
{
if(uploadSlider.getValue() < uploadSlider.getMaximum() && uploadSlider.getValue() > 0)
{
- Long down = new Long(downloadSlider.getValue() * 1024);
- Long up = new Long(uploadSlider.getValue() * 1024);
+ Long down = (long) (downloadSlider.getValue() * 1024);
+ Long up = (long) (uploadSlider.getValue() * 1024);
try
{
@@ -1641,8 +1512,8 @@ public void mouseReleased(MouseEvent e)
{
if(downloadSlider.getValue() < downloadSlider.getMaximum() && downloadSlider.getValue() > 0)
{
- Long down = new Long(downloadSlider.getValue() * 1024);
- Long up = new Long(uploadSlider.getValue() * 1024);
+ Long down = (long) (downloadSlider.getValue() * 1024);
+ Long up = (long) (uploadSlider.getValue() * 1024);
try
{
@@ -1659,14 +1530,10 @@ public void mouseReleased(MouseEvent e)
}
}
});
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- popup.add(uploadMenu);
- popup.add(downloadMenu);
- }
- });
+ SwingUtilities.invokeLater(() -> {
+ popup.add(uploadMenu);
+ popup.add(downloadMenu);
+ });
}
}
}.start();
@@ -1699,93 +1566,7 @@ private String getVerbindungsStatusAsString(Information information)
private void checkAndDisplayUpdate()
{
- Thread versionWorker = new Thread()
- {
- public void run()
- {
- if(logger.isEnabledFor(Level.DEBUG))
- {
- logger.debug("VersionWorkerThread gestartet. " + this);
- }
-
- try
- {
- ProxySettings proxy = ProxyManagerImpl.getInstance().getProxySettings();
- String downloadData = WebsiteContentLoader.getWebsiteContent(proxy, "http://www.tkl-soft.de", 80,
- "/applejuice/version.txt");
-
- if(downloadData.length() > 0)
- {
- int pos1 = downloadData.indexOf("|");
- String aktuellsteVersion = downloadData.substring(0, pos1);
- StringTokenizer token1 = new StringTokenizer(aktuellsteVersion, ".");
- String guiVersion = AppleJuiceDialog.GUI_VERSION;
-
- if(guiVersion.indexOf('-') != -1)
- {
- guiVersion = guiVersion.substring(0, guiVersion.indexOf('-'));
- }
-
- StringTokenizer token2 = new StringTokenizer(guiVersion, ".");
-
- if(token1.countTokens() != 3 || token2.countTokens() != 3)
- {
- return;
- }
-
- String[] versionInternet = new String[3];
- String[] aktuelleVersion = new String[3];
-
- for(int i = 0; i < 3; i++)
- {
- versionInternet[i] = token1.nextToken();
- aktuelleVersion[i] = token2.nextToken();
- }
-
- if((versionInternet[0].compareTo(aktuelleVersion[0]) > 0) ||
- (versionInternet[0].compareTo(aktuelleVersion[0]) == 0 &&
- versionInternet[1].compareTo(aktuelleVersion[1]) > 0) ||
- (versionInternet[0].compareTo(aktuelleVersion[0]) == 0 &&
- versionInternet[1].compareTo(aktuelleVersion[1]) == 0) &&
- versionInternet[2].compareTo(aktuelleVersion[2]) > 0)
- {
- int pos2 = downloadData.lastIndexOf("|");
- String winLink = downloadData.substring(pos1 + 1, pos2);
- String sonstigeLink = downloadData.substring(pos2 + 1);
- UpdateInformationDialog updateInformationDialog = new UpdateInformationDialog(AppleJuiceDialog.getApp(),
- aktuellsteVersion, winLink,
- sonstigeLink);
-
- updateInformationDialog.setVisible(true);
- }
- else
- {
- LanguageSelector languageSelector = LanguageSelector.getInstance();
- String fehlerTitel = languageSelector.getFirstAttrbuteByTagName("mainform.caption");
-
- String fehlerNachricht = languageSelector.getFirstAttrbuteByTagName("javagui.checkupdate.keineNeueVersion");
-
- JOptionPane.showMessageDialog(AppleJuiceDialog.getApp(), fehlerNachricht, fehlerTitel,
- JOptionPane.INFORMATION_MESSAGE);
- }
- }
- }
- catch(Exception e)
- {
- if(logger.isEnabledFor(Level.INFO))
- {
- logger.info("Aktualisierungsinformationen konnten nicht geladen werden. Server down?");
- }
- }
-
- if(logger.isEnabledFor(Level.DEBUG))
- {
- logger.debug("VersionWorkerThread beendet. " + this);
- }
- }
- };
-
- versionWorker.start();
+ VersionChecker.check();
}
public void informWrongPassword()
@@ -1828,24 +1609,20 @@ public JCheckBoxLookAndFeelMenuItem(LookAFeel lookAFeelToUse)
{
super(lookAFeelToUse.getName());
this.lookAFeel = lookAFeelToUse;
- addItemListener(new ItemListener()
+ addItemListener(ae -> {
+ if(isSelected())
{
- public void itemStateChanged(ItemEvent ae)
+ try
{
- if(isSelected())
- {
- try
- {
- UIManager.setLookAndFeel(lookAFeel.getClassName());
- SwingUtilities.updateComponentTreeUI(AppleJuiceDialog.this);
- }
- catch(Exception ex)
- {
- logger.error(ApplejuiceFassade.ERROR_MESSAGE, ex);
- }
- }
+ UIManager.setLookAndFeel(lookAFeel.getClassName());
+ SwingUtilities.updateComponentTreeUI(AppleJuiceDialog.this);
}
- });
+ catch(Exception ex)
+ {
+ logger.error(ApplejuiceFassade.ERROR_MESSAGE, ex);
+ }
+ }
+ });
}
}
}
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/DownloadlinkPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/DownloadlinkPanel.java
similarity index 65%
rename from AJClientGUI/src/de/applejuicenet/client/gui/DownloadlinkPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/DownloadlinkPanel.java
index c252a2bd..7f572454 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/DownloadlinkPanel.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/DownloadlinkPanel.java
@@ -10,9 +10,8 @@
import java.io.File;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
+import javax.swing.*;
+import javax.swing.text.DefaultEditorKit;
import de.applejuicenet.client.fassade.ApplejuiceFassade;
import de.applejuicenet.client.gui.controller.LanguageSelector;
@@ -38,7 +37,7 @@ public DownloadlinkPanel()
{
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
- double[][] sizes =
+ double[][] sizes =
{
{5, p, 5, f, 5, p, 5},
{5, p}
@@ -56,82 +55,71 @@ public void keyPressed(KeyEvent ke)
};
txtDownloadLink.addKeyListener(keyListener);
- InvalidRule downloadloadlinkRule = new InvalidRule()
- {
- public boolean isInvalid(ModifyableComponent component)
- {
- String text = ((TKLTextField) component).getText().toLowerCase();
-
- if(text.length() == 0)
- {
- return false;
- }
+ InvalidRule downloadloadlinkRule = component -> {
+ String text = ((TKLTextField) component).getText().toLowerCase();
- if(!text.startsWith("ajfsp://"))
- {
- return true;
- }
+ if(text.length() == 0)
+ {
+ return false;
+ }
- text = text.substring("ajfsp://".length());
- if(!text.startsWith("file") && !text.startsWith("server"))
- {
- return true;
- }
+ if(!text.startsWith("ajfsp://"))
+ {
+ return true;
+ }
- int count;
+ text = text.substring("ajfsp://".length());
+ if(!text.startsWith("file") && !text.startsWith("server"))
+ {
+ return true;
+ }
- if(text.startsWith("file"))
- {
- count = 3;
- }
- else
- {
- count = 2;
- }
+ int count;
- for(int i = 0; i < text.length(); i++)
- {
- if(text.charAt(i) == '|')
- {
- count--;
- }
- }
+ if(text.startsWith("file"))
+ {
+ count = 3;
+ }
+ else
+ {
+ count = 2;
+ }
- if(count > 0)
+ for(int i = 0; i < text.length(); i++)
+ {
+ if(text.charAt(i) == '|')
{
- return true;
+ count--;
}
+ }
- return false;
+ if(count > 0)
+ {
+ return true;
}
+
+ return false;
};
txtDownloadLink.ignoreStatus(STATUSFLAG.MODIFIED, true);
txtDownloadLink.addInvalidRule(downloadloadlinkRule);
txtDownloadLink.ignoreInvalidRules(false);
- cmbTargetDir.ignoreStatus(STATUSFLAG.MODIFIED, true);
- InvalidRule targetDirRule = new InvalidRule()
- {
- public boolean isInvalid(ModifyableComponent component)
- {
- Object obj = ((TKLComboBox) component).getSelectedItem();
-
- if(obj == null)
- {
- return false;
- }
-
- String subdir = (String) obj;
+// txtDownloadLink.getComponentPopupMenu().add( new JMenuItem(new DefaultEditorKit.CopyAction()) );
- if(subdir.indexOf(File.separator) != -1 || subdir.indexOf(ApplejuiceFassade.separator) != -1 ||
- subdir.indexOf("..") != -1 || subdir.indexOf(":") != -1)
- {
- return true;
- }
+ cmbTargetDir.ignoreStatus(STATUSFLAG.MODIFIED, true);
+ InvalidRule targetDirRule = component -> {
+ Object obj = ((TKLComboBox) component).getSelectedItem();
+ if(obj == null)
+ {
return false;
}
+
+ String subdir = (String) obj;
+
+ return subdir.contains(File.separator) || subdir.indexOf(ApplejuiceFassade.separator) != -1 ||
+ subdir.contains("..") || subdir.contains(":");
};
cmbTargetDir.addInvalidRule(targetDirRule);
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/RegisterI.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/RegisterI.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/RegisterI.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/RegisterI.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/RegisterPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/RegisterPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/RegisterPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/RegisterPanel.java
diff --git a/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/UpdateInformationDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/UpdateInformationDialog.java
new file mode 100644
index 00000000..4aaccf8b
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/UpdateInformationDialog.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2006 TKLSoft.de All rights reserved.
+ */
+
+package de.applejuicenet.client.gui;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+import de.applejuicenet.client.fassade.ApplejuiceFassade;
+import de.applejuicenet.client.gui.controller.LanguageSelector;
+import de.applejuicenet.client.gui.controller.OptionsManagerImpl;
+
+/**
+ * Titel: AppleJuice Client-GUI
+ * Beschreibung: Offizielles GUI fuer den von muhviehstarr entwickelten appleJuice-Core
+ * Copyright: General Public License
+ *
+ * @author Maj0r
+ */
+public class UpdateInformationDialog extends JDialog {
+ private String aktuellsteVersion;
+ private final JButton schliessen = new JButton();
+ private String releaseLink = "";
+ private final Logger logger;
+
+ public UpdateInformationDialog(JFrame parentFrame, String aktuellsteVersion, String releaseLink) {
+ super(parentFrame, true);
+ logger = Logger.getLogger(getClass());
+ try {
+ this.aktuellsteVersion = aktuellsteVersion;
+ this.releaseLink = releaseLink;
+ init();
+ } catch (Exception e) {
+ if (logger.isEnabledFor(Level.ERROR)) {
+ logger.error(ApplejuiceFassade.ERROR_MESSAGE, e);
+ }
+ }
+ }
+
+ private void init() {
+ LanguageSelector ls = LanguageSelector.getInstance();
+
+ schliessen.addActionListener(ae -> UpdateInformationDialog.this.dispose());
+
+ String titel = ls.getFirstAttrbuteByTagName("javagui.startup.newversiontitel");
+ String nachricht = ls.getFirstAttrbuteByTagName("javagui.startup.newversionnachricht");
+
+ nachricht = nachricht.replaceFirst("%s", aktuellsteVersion);
+ schliessen.setText(ls.getFirstAttrbuteByTagName("javagui.options.plugins.schliessen"));
+ setTitle(titel);
+ JPanel panel1 = new JPanel(new GridBagLayout());
+ GridBagConstraints constraints = new GridBagConstraints();
+
+ constraints.anchor = GridBagConstraints.NORTH;
+ constraints.fill = GridBagConstraints.BOTH;
+ constraints.gridx = 0;
+ constraints.gridy = 0;
+ constraints.gridwidth = 3;
+ constraints.insets.left = 5;
+ constraints.insets.top = 5;
+ constraints.insets.right = 5;
+ panel1.add(new JLabel(nachricht), constraints);
+ constraints.insets.right = 0;
+ constraints.gridwidth = 1;
+ constraints.gridy = 1;
+ JLabel label1 = new JLabel();
+
+ label1.setText(ls.getFirstAttrbuteByTagName("javagui.startup.newversion") + ": ");
+ JLabel linkWin = new JLabel("" + releaseLink + "");
+
+ panel1.add(label1, constraints);
+ constraints.gridx = 1;
+ panel1.add(linkWin, constraints);
+ constraints.gridx = 2;
+ constraints.weightx = 1;
+ constraints.insets.right = 5;
+ panel1.add(new JLabel(), constraints);
+ constraints.insets.right = 0;
+ constraints.weightx = 0;
+ constraints.gridx = 0;
+ constraints.gridy = 2;
+ constraints.insets.bottom = 5;
+
+ linkWin.setForeground(Color.blue);
+ linkWin.addMouseListener(new MouseAdapter() {
+ public void mouseExited(MouseEvent e) {
+ setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
+ }
+
+ public void mouseEntered(MouseEvent e) {
+ setCursor(new Cursor(Cursor.HAND_CURSOR));
+ }
+
+ public void mouseClicked(MouseEvent e) {
+ executeLink(releaseLink);
+ }
+ });
+
+ getContentPane().setLayout(new BorderLayout());
+ getContentPane().add(panel1, BorderLayout.CENTER);
+ JPanel southPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
+
+ southPanel.add(schliessen);
+ getContentPane().add(southPanel, BorderLayout.SOUTH);
+ pack();
+ Dimension appDimension = getSize();
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+
+ setLocation((screenSize.width - appDimension.width) / 2, (screenSize.height - appDimension.height) / 2);
+ }
+
+ private void executeLink(String link) {
+ try {
+ String browser = OptionsManagerImpl.getInstance().getStandardBrowser();
+
+ try {
+ Runtime.getRuntime().exec(new String[]{browser, link});
+ } catch (Exception ex) {
+ LanguageSelector ls = LanguageSelector.getInstance();
+ String nachricht = ls.getFirstAttrbuteByTagName("javagui.startup.updatefehlernachricht");
+ String titel = ls.getFirstAttrbuteByTagName("mainform.caption");
+
+ setVisible(false);
+ JOptionPane.showMessageDialog(this, nachricht, titel, JOptionPane.INFORMATION_MESSAGE);
+ setVisible(true);
+ }
+ } catch (Exception e) {
+ if (logger.isEnabledFor(Level.ERROR)) {
+ logger.error(ApplejuiceFassade.ERROR_MESSAGE, e);
+ }
+ }
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/VersionChecker.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/VersionChecker.java
new file mode 100644
index 00000000..798dc9cc
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/VersionChecker.java
@@ -0,0 +1,92 @@
+package de.applejuicenet.client.gui;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import de.applejuicenet.client.fassade.shared.ProxySettings;
+import de.applejuicenet.client.fassade.shared.WebsiteContentLoader;
+import de.applejuicenet.client.gui.controller.ProxyManagerImpl;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+import javax.swing.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class VersionChecker {
+
+ private static final Logger logger = Logger.getLogger(AppleJuiceDialog.class);
+
+ public static void check() {
+ Thread versionWorker = new Thread() {
+ public void run() {
+ if (logger.isEnabledFor(Level.DEBUG)) {
+ logger.debug("VersionWorkerThread gestartet. " + this);
+ }
+
+ try {
+ ProxySettings proxy = ProxyManagerImpl.getInstance().getProxySettings();
+ String downloadData = WebsiteContentLoader.getWebsiteContent(proxy, "https://api.github.com", 443, "/repos/applejuicenet/gui-java/releases/latest");
+
+ if (downloadData.length() > 0) {
+ JsonObject jsonObject = new JsonParser().parse(downloadData).getAsJsonObject();
+ String aktuellsteVersion = jsonObject.get("tag_name").getAsString();
+
+ if (logger.isEnabledFor(Level.INFO)) {
+ logger.info("letzte veröffentlichte Version: " + aktuellsteVersion);
+ }
+
+ if (compareVersion(aktuellsteVersion, AppleJuiceDialog.getVersion()) == 1) {
+ String releaseLink = jsonObject.get("html_url").getAsString();
+ SwingUtilities.invokeLater(() -> {
+ UpdateInformationDialog updateInformationDialog = new UpdateInformationDialog(AppleJuiceDialog.getApp(), aktuellsteVersion, releaseLink);
+ updateInformationDialog.setVisible(true);
+ });
+ } else {
+ if (logger.isEnabledFor(Level.INFO)) {
+ logger.info("aktuelle Version " + AppleJuiceDialog.getVersion() + " | letzte veröffentlichte Version: " + aktuellsteVersion);
+ }
+ }
+
+ }
+ } catch (Exception e) {
+ if (logger.isEnabledFor(Level.INFO)) {
+ logger.info("Aktualisierungsinformationen konnten nicht geladen werden.");
+ }
+ }
+
+ if (logger.isEnabledFor(Level.DEBUG)) {
+ logger.debug("VersionWorkerThread beendet. " + this);
+ }
+ }
+ };
+
+ versionWorker.start();
+ }
+
+ public static int compareVersion(String A, String B) {
+ List strList1 = Arrays.stream(A.split("\\."))
+ .map(s -> s.replaceAll("^0+(?!$)", ""))
+ .collect(Collectors.toList());
+ List strList2 = Arrays.stream(B.split("\\."))
+ .map(s -> s.replaceAll("^0+(?!$)", ""))
+ .collect(Collectors.toList());
+ int len1 = strList1.size();
+ int len2 = strList2.size();
+ int i = 0;
+ while (i < len1 && i < len2) {
+ if (strList1.get(i).length() > strList2.get(i).length()) return 1;
+ if (strList1.get(i).length() < strList2.get(i).length()) return -1;
+ int result = new Long(strList1.get(i)).compareTo(new Long(strList2.get(i)));
+ if (result != 0) return result;
+ i++;
+ }
+ while (i < len1) {
+ if (!strList1.get(i++).equals("0")) return 1;
+ }
+ while (i < len2) {
+ if (!strList2.get(i++).equals("0")) return -1;
+ }
+ return 0;
+ }
+}
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/about/AboutDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/about/AboutDialog.java
similarity index 97%
rename from AJClientGUI/src/de/applejuicenet/client/gui/about/AboutDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/about/AboutDialog.java
index 0d0c0f58..31a68aa4 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/about/AboutDialog.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/about/AboutDialog.java
@@ -142,16 +142,16 @@ private void init()
credits.add(new CreditsEntry(false, "(tkrall@tkl-soft.de)"));
credits.add(new CreditsEntry(false, "loevenwong"));
credits.add(new CreditsEntry(false, "(tloevenich@tkl-soft.de)"));
+ credits.add(new CreditsEntry(false, "red171"));
+ credits.add(new CreditsEntry(false, "(red171@tr4sh.eu)"));
credits.add(new CreditsEntry(true, "Besonderen Dank an"));
credits.add(new CreditsEntry(false, "muhviehstarr"));
credits.add(new CreditsEntry(true, "Banner & Bilder"));
credits.add(new CreditsEntry(false, "saschxd"));
- credits.add(new CreditsEntry(true, "bersetzung"));
+ credits.add(new CreditsEntry(true, "Übersetzung"));
credits.add(new CreditsEntry(false, "BlueTiger"));
credits.add(new CreditsEntry(false, "nurseppel"));
credits.add(new CreditsEntry(true, "Kontakt"));
- credits.add(new CreditsEntry(false, "irc.devStaff.net:6667"));
- credits.add(new CreditsEntry(false, "#applejuice"));
credits.add(new CreditsEntry(false, "www.applejuicenet.de"));
backgroundImage = IconManager.getInstance().getIcon("applejuiceinfobanner").getImage();
@@ -169,7 +169,7 @@ private void init()
//kein Bild da, dann kack drauf ;-)
}
- version.setText("Version " + AppleJuiceDialog.GUI_VERSION + "/" + ApplejuiceFassade.FASSADE_VERSION);
+ version.setText("Version " + AppleJuiceDialog.getVersion());
Font font = version.getFont();
font = new Font(font.getName(), Font.PLAIN, font.getSize());
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/GuiController.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/GuiController.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/GuiController.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/GuiController.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/GuiControllerActionListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/GuiControllerActionListener.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/GuiControllerActionListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/GuiControllerActionListener.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/TklPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/TklPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/TklPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/TklPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/dragndrop/DndSourceAdapter.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/dragndrop/DndSourceAdapter.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/dragndrop/DndSourceAdapter.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/dragndrop/DndSourceAdapter.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/dragndrop/DndTargetAdapter.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/dragndrop/DndTargetAdapter.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/dragndrop/DndTargetAdapter.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/dragndrop/DndTargetAdapter.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/listener/KeyStates.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/listener/KeyStates.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/listener/KeyStates.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/listener/KeyStates.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/table/BevelArrowIcon.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/BevelArrowIcon.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/table/BevelArrowIcon.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/BevelArrowIcon.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/table/BlankIcon.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/BlankIcon.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/table/BlankIcon.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/BlankIcon.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/table/HeaderListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/HeaderListener.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/table/HeaderListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/HeaderListener.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/table/NormalHeaderRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/NormalHeaderRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/table/NormalHeaderRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/NormalHeaderRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/table/SortButtonRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/SortButtonRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/table/SortButtonRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/SortButtonRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/table/SortableTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/SortableTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/table/SortableTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/SortableTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/table/TableSorter.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/TableSorter.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/table/TableSorter.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/table/TableSorter.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/tree/ApplejuiceNode.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/tree/ApplejuiceNode.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/tree/ApplejuiceNode.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/tree/ApplejuiceNode.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/tree/WaitNode.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/tree/WaitNode.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/tree/WaitNode.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/tree/WaitNode.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/AbstractCellEditor.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/AbstractCellEditor.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/AbstractCellEditor.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/AbstractCellEditor.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/AbstractTreeTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/AbstractTreeTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/AbstractTreeTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/AbstractTreeTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/DefaultIconNodeRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/DefaultIconNodeRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/DefaultIconNodeRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/DefaultIconNodeRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/DefaultTreeTableCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/DefaultTreeTableCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/DefaultTreeTableCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/DefaultTreeTableCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/JTreeTable.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/JTreeTable.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/JTreeTable.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/JTreeTable.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/Node.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/Node.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/Node.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/Node.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/TreeTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/TreeTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/TreeTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/TreeTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/TreeTableModelAdapter.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/TreeTableModelAdapter.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/treetable/TreeTableModelAdapter.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/treetable/TreeTableModelAdapter.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/util/IconGetter.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/util/IconGetter.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/util/IconGetter.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/util/IconGetter.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/util/MergeSort.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/util/MergeSort.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/util/MergeSort.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/util/MergeSort.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/components/util/Value.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/util/Value.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/components/util/Value.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/components/util/Value.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/connect/ConnectFrame.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/connect/ConnectFrame.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/connect/ConnectFrame.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/connect/ConnectFrame.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/connect/QuickConnectionSettingsDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/connect/QuickConnectionSettingsDialog.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/connect/QuickConnectionSettingsDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/connect/QuickConnectionSettingsDialog.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/LanguageSelector.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/LanguageSelector.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/LanguageSelector.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/LanguageSelector.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/LinkListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/LinkListener.java
similarity index 98%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/LinkListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/LinkListener.java
index b09769b8..0878069e 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/controller/LinkListener.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/LinkListener.java
@@ -79,9 +79,10 @@ public void run()
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
String line = reader.readLine();
- if(line.indexOf("-link=") != -1)
+ if(line.contains("-link="))
{
String link = getLinkFromReadLine(line);
+ link = link.replaceAll("%7C", "|");
if(link != null)
{
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/OptionsManager.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/OptionsManager.java
similarity index 96%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/OptionsManager.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/OptionsManager.java
index 9f8aa159..07305ed6 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/controller/OptionsManager.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/OptionsManager.java
@@ -31,9 +31,9 @@ public interface OptionsManager
String getSprache();
- int getVersionsinfoModus();
+ boolean getUpdateInfo();
- void setVersionsinfoModus(int versionsinfoModus);
+ void setUpdateInfo(boolean UpdateInfo);
boolean isErsterStart();
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/OptionsManagerImpl.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/OptionsManagerImpl.java
similarity index 95%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/OptionsManagerImpl.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/OptionsManagerImpl.java
index b7b7d3df..5621373e 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/controller/OptionsManagerImpl.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/OptionsManagerImpl.java
@@ -47,12 +47,12 @@ public String getSprache() {
return propertiesManager.getSprache();
}
- public int getVersionsinfoModus() {
- return propertiesManager.getVersionsinfoModus();
+ public boolean getUpdateInfo() {
+ return propertiesManager.getUpdateInfo();
}
- public void setVersionsinfoModus(int versionsInfoModus) {
- propertiesManager.setVersionsinfoModus(versionsInfoModus);
+ public void setUpdateInfo(boolean UpdateInfo) {
+ propertiesManager.setUpdateInfo(UpdateInfo);
}
public boolean isErsterStart() {
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/PositionManager.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/PositionManager.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/PositionManager.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/PositionManager.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/PositionManagerImpl.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/PositionManagerImpl.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/PositionManagerImpl.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/PositionManagerImpl.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/PropertiesManager.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/PropertiesManager.java
similarity index 99%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/PropertiesManager.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/PropertiesManager.java
index 61cb536a..bb898e4f 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/controller/PropertiesManager.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/PropertiesManager.java
@@ -436,7 +436,7 @@ public String getStandardBrowser()
{
try
{
- return propertyHandler.get("options_browser_file", "");
+ return propertyHandler.get("options_browser_file", "xdg-open");
}
catch(Exception e)
{
@@ -536,19 +536,14 @@ public void enableThemeSupport(boolean enable)
propertyHandler.put("options_themes", enable);
}
- public int getVersionsinfoModus()
+ public boolean getUpdateInfo()
{
- return propertyHandler.getAsInt("options_versionsinfo", 1);
+ return propertyHandler.getAsBoolean("options_updateinfo", true);
}
- public void setVersionsinfoModus(int versionsinfoModus)
+ public void setUpdateInfo(boolean UpdateInfo)
{
- if(versionsinfoModus < 0 || versionsinfoModus > 2)
- {
- versionsinfoModus = 1;
- }
-
- propertyHandler.put("options_versionsinfo", versionsinfoModus);
+ propertyHandler.put("options_updateinfo", UpdateInfo);
}
public int getLinkListenerPort()
@@ -886,7 +881,7 @@ public static void restoreProperties()
aPropertyHandler.put("options_loadplugins", true);
aPropertyHandler.put("options_enableToolTip", true);
aPropertyHandler.put("options_linklistenerport", 8768);
- aPropertyHandler.put("options_versionsinfo", 1);
+ aPropertyHandler.put("options_updateinfo", true);
aPropertyHandler.put("options_remote_host", "localhost");
aPropertyHandler.put("options_remote_passwort", "");
aPropertyHandler.put("options_remote_port", 9851);
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/PropertyHandler.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/PropertyHandler.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/PropertyHandler.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/PropertyHandler.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/ProxyManager.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/ProxyManager.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/ProxyManager.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/ProxyManager.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/controller/ProxyManagerImpl.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/ProxyManagerImpl.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/controller/ProxyManagerImpl.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/controller/ProxyManagerImpl.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/debug/DebugController.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/debug/DebugController.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/debug/DebugController.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/debug/DebugController.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/debug/DebugPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/debug/DebugPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/debug/DebugPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/debug/DebugPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/debug/LiveAppender.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/debug/LiveAppender.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/debug/LiveAppender.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/debug/LiveAppender.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadController.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadController.java
similarity index 99%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadController.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadController.java
index 99cae83b..33243cb5 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadController.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadController.java
@@ -28,6 +28,7 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
+import de.applejuicenet.client.shared.ReleaseInfo;
import org.apache.log4j.Level;
import de.applejuicenet.client.AppleJuiceClient;
@@ -54,7 +55,6 @@
import de.applejuicenet.client.gui.upload.HeaderPopupListener;
import de.applejuicenet.client.gui.upload.UploadMouseMotionListener;
import de.applejuicenet.client.shared.DesktopTools;
-import de.applejuicenet.client.shared.ReleaseInfoDialog;
import de.applejuicenet.client.shared.SoundPlayer;
public class DownloadController extends GuiController
@@ -378,7 +378,7 @@ private void showReleaseInfo()
Download curDownload = selectedItems[0];
- ReleaseInfoDialog.showReleaseInfo(curDownload.getHash());
+ ReleaseInfo.handle(curDownload.getFilename(), curDownload.getHash(), (long) curDownload.getGroesse());
}
private void headerDownloadsDragged()
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadOverviewPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadOverviewPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadOverviewPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadOverviewPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadPanel.java
similarity index 85%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadPanel.java
index 138e2925..bf7f2da5 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadPanel.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadPanel.java
@@ -352,41 +352,35 @@ public void internalSort(int column, boolean ascent)
columnDownloadPopupItems[i] = new JCheckBoxMenuItem((String) downloadColumns[i].getHeaderValue());
final int x = i;
- columnDownloadPopupItems[i].addActionListener(new ActionListener()
+ columnDownloadPopupItems[i].addActionListener(ae -> {
+ if(columnDownloadPopupItems[x].isSelected())
{
- public void actionPerformed(ActionEvent ae)
+ downloadActiveTable.getColumnModel().addColumn(downloadColumns[x]);
+ PositionManagerImpl.getInstance().setDownloadColumnVisible(x, true);
+ PositionManagerImpl.getInstance()
+ .setDownloadColumnIndex(x,
+ downloadActiveTable.getColumnModel().getColumnIndex(downloadColumns[x].getIdentifier()));
+ }
+ else
+ {
+ downloadActiveTable.getColumnModel().removeColumn(downloadColumns[x]);
+ PositionManagerImpl.getInstance().setDownloadColumnVisible(x, false);
+ for(int y = 0; y < downloadColumns.length; y++)
{
- if(columnDownloadPopupItems[x].isSelected())
+ try
{
- downloadActiveTable.getColumnModel().addColumn(downloadColumns[x]);
- PositionManagerImpl.getInstance().setDownloadColumnVisible(x, true);
PositionManagerImpl.getInstance()
- .setDownloadColumnIndex(x,
- downloadActiveTable.getColumnModel().getColumnIndex(downloadColumns[x].getIdentifier()));
+ .setDownloadColumnIndex(y,
+ downloadActiveTable.getColumnModel()
+ .getColumnIndex(downloadColumns[y].getIdentifier()));
}
- else
+ catch(IllegalArgumentException niaE)
{
- downloadActiveTable.getColumnModel().removeColumn(downloadColumns[x]);
- PositionManagerImpl.getInstance().setDownloadColumnVisible(x, false);
- for(int y = 0; y < downloadColumns.length; y++)
- {
- try
- {
- PositionManagerImpl.getInstance()
- .setDownloadColumnIndex(y,
- downloadActiveTable.getColumnModel()
- .getColumnIndex(downloadColumns[y].getIdentifier()));
- }
- catch(IllegalArgumentException niaE)
- {
- ;
-
- //nix zu tun
- }
- }
+ //nix zu tun
}
}
- });
+ }
+ });
columnDownloadPopup.add(columnDownloadPopupItems[i]);
}
@@ -434,42 +428,36 @@ public void internalSort(int column, boolean ascent)
columnDownloadSourcesPopupItems[i] = new JCheckBoxMenuItem((String) downloadSourceColumns[i].getHeaderValue());
final int x = i;
- columnDownloadSourcesPopupItems[i].addActionListener(new ActionListener()
+ columnDownloadSourcesPopupItems[i].addActionListener(ae -> {
+ if(columnDownloadSourcesPopupItems[x].isSelected())
{
- public void actionPerformed(ActionEvent ae)
+ downloadSourceTable.getColumnModel().addColumn(downloadSourceColumns[x]);
+ PositionManagerImpl.getInstance().setDownloadSourcesColumnVisible(x, true);
+ PositionManagerImpl.getInstance()
+ .setDownloadSourcesColumnIndex(x,
+ downloadSourceTable.getColumnModel()
+ .getColumnIndex(downloadSourceColumns[x].getIdentifier()));
+ }
+ else
+ {
+ downloadSourceTable.getColumnModel().removeColumn(downloadSourceColumns[x]);
+ PositionManagerImpl.getInstance().setDownloadSourcesColumnVisible(x, false);
+ for(int y = 0; y < downloadSourceColumns.length; y++)
{
- if(columnDownloadSourcesPopupItems[x].isSelected())
+ try
{
- downloadSourceTable.getColumnModel().addColumn(downloadSourceColumns[x]);
- PositionManagerImpl.getInstance().setDownloadSourcesColumnVisible(x, true);
PositionManagerImpl.getInstance()
- .setDownloadSourcesColumnIndex(x,
+ .setDownloadSourcesColumnIndex(y,
downloadSourceTable.getColumnModel()
- .getColumnIndex(downloadSourceColumns[x].getIdentifier()));
+ .getColumnIndex(downloadSourceColumns[y].getIdentifier()));
}
- else
+ catch(IllegalArgumentException niaE)
{
- downloadSourceTable.getColumnModel().removeColumn(downloadSourceColumns[x]);
- PositionManagerImpl.getInstance().setDownloadSourcesColumnVisible(x, false);
- for(int y = 0; y < downloadSourceColumns.length; y++)
- {
- try
- {
- PositionManagerImpl.getInstance()
- .setDownloadSourcesColumnIndex(y,
- downloadSourceTable.getColumnModel()
- .getColumnIndex(downloadSourceColumns[y].getIdentifier()));
- }
- catch(IllegalArgumentException niaE)
- {
- ;
-
- //nix zu tun
- }
- }
+ //nix zu tun
}
}
- });
+ }
+ });
columnDownloadSourcesPopup.add(columnDownloadSourcesPopupItems[i]);
}
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadPartListPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadPartListPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadPartListPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadPartListPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadPartListWatcher.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadPartListWatcher.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadPartListWatcher.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadPartListWatcher.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadPropertyChangeListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadPropertyChangeListener.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/DownloadPropertyChangeListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/DownloadPropertyChangeListener.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/PowerDownloadPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/PowerDownloadPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/PowerDownloadPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/PowerDownloadPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/RenameDownloadDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/RenameDownloadDialog.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/RenameDownloadDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/RenameDownloadDialog.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadMouseMotionListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadMouseMotionListener.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadMouseMotionListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadMouseMotionListener.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadSourcesTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadSourcesTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadSourcesTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadSourcesTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadTableDownloadFilenameCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadTableDownloadFilenameCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadTableDownloadFilenameCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadTableDownloadFilenameCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadTableFilenameCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadTableFilenameCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadTableFilenameCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadTableFilenameCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadTablePowerdownloadCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadTablePowerdownloadCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadTablePowerdownloadCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadTablePowerdownloadCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadTableStatusCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadTableStatusCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadTableStatusCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadTableStatusCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadToolTipUI.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadToolTipUI.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadToolTipUI.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadToolTipUI.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadsTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadsTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/download/table/DownloadsTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/download/table/DownloadsTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/listener/LanguageListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/listener/LanguageListener.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/listener/LanguageListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/listener/LanguageListener.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/memorymonitor/MemoryMonitor.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/memorymonitor/MemoryMonitor.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/memorymonitor/MemoryMonitor.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/memorymonitor/MemoryMonitor.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/memorymonitor/MemoryMonitorDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/memorymonitor/MemoryMonitorDialog.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/memorymonitor/MemoryMonitorDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/memorymonitor/MemoryMonitorDialog.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/mobileproxy/HTTPRequest.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/mobileproxy/HTTPRequest.java
similarity index 96%
rename from AJClientGUI/src/de/applejuicenet/client/gui/mobileproxy/HTTPRequest.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/mobileproxy/HTTPRequest.java
index 8cccaf6d..afaebf19 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/mobileproxy/HTTPRequest.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/mobileproxy/HTTPRequest.java
@@ -26,7 +26,7 @@ public class HTTPRequest
*
* @param so der Socket, zum Lesen des Requests
* @param log ein Logger-Objekt, damit pro Client unterschiedliche
- * Log-Levels definiert werden knnen
+ * Log-Levels definiert werden können
*/
public HTTPRequest(Socket so)
{
@@ -39,7 +39,7 @@ public HTTPRequest(Socket so)
/**
* Liefert den Parameter-Wert zu n
* @param n Name des Parameters
- * @return der zugehrige Wert oder null
+ * @return der zugehörige Wert oder null
*/
public String getParameter(String n)
{
@@ -49,7 +49,7 @@ public String getParameter(String n)
/**
* Liefert das Header-Feld zu h
* @param h Name des Headers
- * @return das zugehrige Headerfeld.
+ * @return das zugehörige Headerfeld.
*/
public String getHeader(String h)
{
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/mobileproxy/HTTPResponse.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/mobileproxy/HTTPResponse.java
similarity index 96%
rename from AJClientGUI/src/de/applejuicenet/client/gui/mobileproxy/HTTPResponse.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/mobileproxy/HTTPResponse.java
index de8819c4..32379e1c 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/mobileproxy/HTTPResponse.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/mobileproxy/HTTPResponse.java
@@ -30,7 +30,7 @@ public class HTTPResponse
public final static int HTTP_InternalServerError = 5;
public final static int HTTP_NotImplemented = 6;
- /** String-Konstante fr HTTP-Repsonse-Code */
+ /** String-Konstante für HTTP-Repsonse-Code */
public final static String[] ResponseCodes =
{
"200 OK", "301 Moved Permanently", "400 Bad Request", "403 Forbidden",
@@ -38,7 +38,7 @@ public class HTTPResponse
};
/**
- * Der Dateinamen fr die Default-Datei, die verwendet wird, wenn nur ein
+ * Der Dateinamen für die Default-Datei, die verwendet wird, wenn nur ein
* Verzeichnis abgefragt wird.
*/
public static String DefaultFile = "index.html";
@@ -54,18 +54,18 @@ public class HTTPResponse
public static String FileNotFound = "not_found.html";
/**
- * Zeitraum fr das Cachen HTTP-Antworten
- * unsere Daten knnen einen Tag gecacht werden:
+ * Zeitraum für das Cachen HTTP-Antworten
+ * unsere Daten können einen Tag gecacht werden:
*/
public static String CacheControlSeconds = (3600 * 24) + "";
/**
- * Der Mime-Typ fr unbekannte Dateien
+ * Der Mime-Typ für unbekannte Dateien
*/
public static final String DefaultMimeType = "application/octet-stream";
/**
- * Der Mime-Typ fr einfache Text-Dateien, wird auch fr das Senden von
+ * Der Mime-Typ für einfache Text-Dateien, wird auch für das Senden von
* Fehlermeldungen verwendet.
*/
public static final String PlainMimeType = "text/plain";
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/mobileproxy/MobileProxy.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/mobileproxy/MobileProxy.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/mobileproxy/MobileProxy.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/mobileproxy/MobileProxy.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/IncomingDirSelectionDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/IncomingDirSelectionDialog.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/IncomingDirSelectionDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/IncomingDirSelectionDialog.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODAnsichtPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODAnsichtPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/ODAnsichtPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODAnsichtPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODConnectionPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODConnectionPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/ODConnectionPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODConnectionPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODDirectoryChooser.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODDirectoryChooser.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/ODDirectoryChooser.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODDirectoryChooser.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODPluginOptionsDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODPluginOptionsDialog.java
similarity index 92%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/ODPluginOptionsDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODPluginOptionsDialog.java
index 03e8dfde..126fd520 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODPluginOptionsDialog.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODPluginOptionsDialog.java
@@ -60,13 +60,7 @@ private void init()
{
LanguageSelector languageSelector = LanguageSelector.getInstance();
- schliessen.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent ae)
- {
- ODPluginOptionsDialog.this.dispose();
- }
- });
+ schliessen.addActionListener(ae -> ODPluginOptionsDialog.this.dispose());
String title = pluginConnector.getTitle() + " - ";
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODPluginPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODPluginPanel.java
similarity index 89%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/ODPluginPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODPluginPanel.java
index a884b3d3..0841744e 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODPluginPanel.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODPluginPanel.java
@@ -102,13 +102,7 @@ private void init() throws Exception
beschreibung.setWrapStyleWord(true);
pluginList = new JList(v);
pluginList.setPreferredSize(new Dimension(190, pluginList.getPreferredSize().height));
- pluginList.addListSelectionListener(new ListSelectionListener()
- {
- public void valueChanged(ListSelectionEvent e)
- {
- pluginList_valueChanged(e);
- }
- });
+ pluginList.addListSelectionListener(e -> pluginList_valueChanged(e));
setLayout(new BorderLayout());
LanguageSelector languageSelector = LanguageSelector.getInstance();
@@ -131,19 +125,15 @@ public void valueChanged(ListSelectionEvent e)
panel1.add(sp, BorderLayout.CENTER);
panel1.add(panel2, BorderLayout.SOUTH);
add(panel1, BorderLayout.CENTER);
- einstellungen.addActionListener(new ActionListener()
+ einstellungen.addActionListener(ae -> {
+ if(selectedPluginConnector != null)
{
- public void actionPerformed(ActionEvent ae)
- {
- if(selectedPluginConnector != null)
- {
- ODPluginOptionsDialog pluginOptionsDialog = new ODPluginOptionsDialog(parentDialog, selectedPluginConnector);
-
- pluginOptionsDialog.setResizable(true);
- pluginOptionsDialog.setVisible(true);
- }
- }
- });
+ ODPluginOptionsDialog pluginOptionsDialog = new ODPluginOptionsDialog(parentDialog, selectedPluginConnector);
+
+ pluginOptionsDialog.setResizable(true);
+ pluginOptionsDialog.setVisible(true);
+ }
+ });
}
void pluginList_valueChanged(ListSelectionEvent e)
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODProxyPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODProxyPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/ODProxyPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODProxyPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODStandardPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODStandardPanel.java
similarity index 86%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/ODStandardPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODStandardPanel.java
index 0728b373..80152ba5 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODStandardPanel.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODStandardPanel.java
@@ -12,8 +12,6 @@
import java.awt.GridBagLayout;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -27,8 +25,6 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JToolTip;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -87,8 +83,8 @@ public class ODStandardPanel extends JPanel implements OptionsRegister
private JDialog parent;
private AJSettings ajSettings;
private TKLComboBox cmbLog;
- private TKLComboBox updateInfoModus;
- private TKLCheckBox loadPlugins = new TKLCheckBox();
+ private TKLCheckBox updateNotification = new TKLCheckBox();
+ private TKLCheckBox loadPlugins = new TKLCheckBox();
private Logger logger;
private ConnectionSettings remote;
private Icon menuIcon;
@@ -123,18 +119,9 @@ public Level getLogLevel()
return ((LevelItem) cmbLog.getSelectedItem()).getLevel();
}
- public int getVersionsinfoModus()
+ public boolean getUpdateInfo()
{
- if(updateInfoModus.getSelectedIndex() == -1)
- {
- return 1;
- }
- else
- {
- UpdateInfoItem selectedItem = (UpdateInfoItem) updateInfoModus.getSelectedItem();
-
- return selectedItem.getModus();
- }
+ return updateNotification.isSelected();
}
public String getBrowserPfad()
@@ -179,13 +166,7 @@ private void init() throws Exception
levelItems[2] = new LevelItem(Level.OFF, languageSelector.getFirstAttrbuteByTagName("javagui.options.logging.off"));
menuText = languageSelector.getFirstAttrbuteByTagName("einstform.standardsheet.caption");
cmbLog = new TKLComboBox(levelItems);
- cmbLog.addItemListener(new ItemListener()
- {
- public void itemStateChanged(ItemEvent e)
- {
- dirty = true;
- }
- });
+ cmbLog.addItemListener(e -> dirty = true);
int index = 0;
@@ -206,57 +187,11 @@ else if(logLevel == Level.OFF)
panel8.add(cmbLog);
- updateInfoModus = new TKLComboBox();
- UpdateInfoItem item0 = new UpdateInfoItem(0,
- languageSelector.getFirstAttrbuteByTagName("javagui.options.standard.updateinfo0"));
- UpdateInfoItem item1 = new UpdateInfoItem(1,
- languageSelector.getFirstAttrbuteByTagName("javagui.options.standard.updateinfo1"));
- UpdateInfoItem item2 = new UpdateInfoItem(2,
- languageSelector.getFirstAttrbuteByTagName("javagui.options.standard.updateinfo2"));
-
- updateInfoModus.addItem(item0);
- updateInfoModus.addItem(item1);
- updateInfoModus.addItem(item2);
- int infoModus = optionsManager.getVersionsinfoModus();
-
- switch(infoModus)
- {
-
- case 0:
- {
- updateInfoModus.setSelectedItem(item0);
- break;
- }
-
- case 1:
- {
- updateInfoModus.setSelectedItem(item1);
- break;
- }
-
- case 2:
- {
- updateInfoModus.setSelectedItem(item2);
- break;
- }
+ updateNotification.setText(languageSelector.getFirstAttrbuteByTagName("javagui.options.standard.updateinfotext"));
+ updateNotification.setSelected(optionsManager.getUpdateInfo());
+ updateNotification.addItemListener(e -> dirty = true);
- default:
- updateInfoModus.setSelectedIndex(-1);
- }
- updateInfoModus.addItemListener(new ItemListener()
- {
- public void itemStateChanged(ItemEvent e)
- {
- dirty = true;
- }
- });
-
- JPanel panel9 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
- JLabel label10 = new JLabel(languageSelector.getFirstAttrbuteByTagName("javagui.options.standard.updateinfotext"));
-
- panel9.add(label10);
- panel9.add(updateInfoModus);
setLayout(new BorderLayout());
port.setHorizontalAlignment(JLabel.RIGHT);
@@ -303,13 +238,7 @@ public void itemStateChanged(ItemEvent e)
selectStandardBrowser.addMouseListener(new SelectBrowserMouseListener());
- loadPlugins.addChangeListener(new ChangeListener()
- {
- public void stateChanged(ChangeEvent e)
- {
- dirty = true;
- }
- });
+ loadPlugins.addChangeListener(e -> dirty = true);
GridBagConstraints constraints = new GridBagConstraints();
@@ -319,14 +248,16 @@ public void stateChanged(ChangeEvent e)
constraints.gridy = 0;
constraints.insets.top = 5;
- JPanel panel1 = new JPanel(new GridBagLayout());
+ JPanel panel1 = new JPanel(new GridBagLayout());
JPanel panel2 = new JPanel(new GridBagLayout());
JPanel panel3 = new JPanel(new GridBagLayout());
JPanel panel4 = new JPanel(new GridBagLayout());
JPanel panel7 = new JPanel(new GridBagLayout());
JPanel panel10 = new JPanel(new GridBagLayout());
+ JPanel panel9 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
JPanel panel11 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ panel9.add(updateNotification);
panel11.add(loadPlugins);
constraints.insets.right = 5;
@@ -389,6 +320,7 @@ public void stateChanged(ChangeEvent e)
panel6.add(hint5, constraints);
constraints.gridy = 7;
constraints.gridx = 0;
+ constraints.gridwidth = 5;
panel6.add(panel9, constraints);
constraints.gridy = 8;
constraints.gridx = 0;
@@ -403,10 +335,10 @@ public void stateChanged(ChangeEvent e)
nick.confirmNewValue();
browser.confirmNewValue();
cmbLog.confirmNewValue();
- updateInfoModus.confirmNewValue();
+ updateNotification.confirmNewValue();
loadPlugins.confirmNewValue();
- if(DesktopTools.isAdvancedSupported() && System.getProperty("os.name").toLowerCase().indexOf("linux") == -1)
+ if(DesktopTools.isAdvancedSupported() && !System.getProperty("os.name").toLowerCase().contains("linux"))
{
selectStandardBrowser.setVisible(false);
browser.setVisible(false);
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/ODVerbindungPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODVerbindungPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/ODVerbindungPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/ODVerbindungPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/OptionsDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/OptionsDialog.java
similarity index 89%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/OptionsDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/OptionsDialog.java
index 009e21cb..e624ae89 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/options/OptionsDialog.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/OptionsDialog.java
@@ -26,6 +26,7 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+import de.applejuicenet.client.gui.AppleJuiceDialog;
import org.apache.log4j.Logger;
import de.applejuicenet.client.AppleJuiceClient;
@@ -51,11 +52,11 @@
*/
public class OptionsDialog extends JDialog
{
+ private static final Logger logger = Logger.getLogger(OptionsDialog.class);
private JFrame parent;
private JButton speichern;
private JButton abbrechen;
private AJSettings ajSettings;
- private Logger logger;
private ConnectionSettings remote;
private JList menuList;
private OptionsRegister[] optionPanels;
@@ -65,7 +66,6 @@ public class OptionsDialog extends JDialog
public OptionsDialog(JFrame parent) throws HeadlessException
{
super(parent, true);
- logger = Logger.getLogger(getClass());
try
{
this.parent = parent;
@@ -99,32 +99,16 @@ private void init() throws Exception
registerPanel.add(optionPanels[i].getMenuText(), (JPanel) optionPanels[i]);
}
- menuList.addListSelectionListener(new ListSelectionListener()
- {
- public void valueChanged(ListSelectionEvent listSelectionEvent)
- {
- Object selected = menuList.getSelectedValue();
+ menuList.addListSelectionListener(listSelectionEvent -> {
+ Object selected = menuList.getSelectedValue();
- registerLayout.show(registerPanel, ((OptionsRegister) selected).getMenuText());
- }
- });
+ registerLayout.show(registerPanel, ((OptionsRegister) selected).getMenuText());
+ });
menuList.setSelectedValue(optionPanels[0], true);
speichern = new JButton(languageSelector.getFirstAttrbuteByTagName("einstform.Button1.caption"));
abbrechen = new JButton(languageSelector.getFirstAttrbuteByTagName("einstform.Button2.caption"));
- abbrechen.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- dispose();
- }
- });
- speichern.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- speichern();
- }
- });
+ abbrechen.addActionListener(e -> dispose());
+ speichern.addActionListener(e -> speichern());
JPanel panel = new JPanel();
FlowLayout flowL = new FlowLayout();
@@ -158,10 +142,10 @@ private void speichern()
om.saveAJSettings(ajSettings);
om.setStandardBrowser(((ODStandardPanel) optionPanels[0]).getBrowserPfad());
om.loadPluginsOnStartup(((ODStandardPanel) optionPanels[0]).shouldLoadPluginsOnStartup());
+ om.setUpdateInfo(((ODStandardPanel) optionPanels[0]).getUpdateInfo());
if(((ODStandardPanel) optionPanels[0]).isDirty())
{
om.setLogLevel(((ODStandardPanel) optionPanels[0]).getLogLevel());
- om.setVersionsinfoModus(((ODStandardPanel) optionPanels[0]).getVersionsinfoModus());
}
etwasGeaendert = true;
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/OptionsRegister.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/OptionsRegister.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/OptionsRegister.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/OptionsRegister.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserNode.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserNode.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserNode.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserNode.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserTreeCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserTreeCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserTreeCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserTreeCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserTreeModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserTreeModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserTreeModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/options/directorytree/DirectoryChooserTreeModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/plugincontrol/PluginFactory.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/plugincontrol/PluginFactory.java
similarity index 88%
rename from AJClientGUI/src/de/applejuicenet/client/gui/plugincontrol/PluginFactory.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/plugincontrol/PluginFactory.java
index 28414186..ae3ea02d 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/plugincontrol/PluginFactory.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/plugincontrol/PluginFactory.java
@@ -48,33 +48,8 @@ public static Set getPlugins()
path = System.getProperty("user.dir") + File.separator + "plugins" + File.separator;
}
- File delFile = new File(path + "ajIrcPlugin_1_3.jar");
-
- if(delFile.isFile())
- {
- delFile.delete();
- }
-
- delFile = new File(path + "ajIrcPlugin_1_31.jar");
- if(delFile.isFile())
- {
- delFile.delete();
- }
-
- delFile = new File(path + "IrcPlugin_1_31.jar");
- if(delFile.isFile())
- {
- delFile.delete();
- }
-
File pluginPath = new File(path);
- if(!pluginPath.isDirectory())
- {
- pluginPath.mkdir();
- return plugins;
- }
-
String[] tempListe = pluginPath.list();
PluginJarClassLoader jarLoader = null;
@@ -131,7 +106,7 @@ public static Set getPlugins()
private static Set loadPluginsFromClasspath()
{
Set thePlugins = new HashSet();
- String[] which = new String[] { //"de.applejuicenet.client.gui.plugins.jabber.JabberTestLoader",//
+ String[] which = new String[] { //"de.applejuicenet.client.gui.plugins.jabber.JabberTestLoader",//
// "de.applejuicenet.client.gui.plugins.versionchecker.VersioncheckerTestLoader"
// "de.applejuicenet.client.gui.plugins.serverwatcher.ServerWatcherTestLoader"
// "de.applejuicenet.client.gui.plugins.logviewer.LogViewerTestLoader"
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/plugincontrol/TestLoader.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/plugincontrol/TestLoader.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/plugincontrol/TestLoader.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/plugincontrol/TestLoader.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/plugins/PluginConnector.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/plugins/PluginConnector.java
similarity index 99%
rename from AJClientGUI/src/de/applejuicenet/client/gui/plugins/PluginConnector.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/plugins/PluginConnector.java
index 498a4857..bce5bb50 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/plugins/PluginConnector.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/plugins/PluginConnector.java
@@ -212,7 +212,7 @@ public final String getLanguageString(String identifier)
* @param type int: Typ des angesprochenen Listeners
* @param content Object: Geaenderte Werte, Typ abhaengig vom
* angesprochenen Listener
- * @see DataUpdateListener.class
+ * @see DataUpdateListener
*/
public abstract void fireContentChanged(DATALISTENER_TYPE type, Object content);
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/powerdownload/AutomaticPowerdownloadPolicy.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/powerdownload/AutomaticPowerdownloadPolicy.java
similarity index 98%
rename from AJClientGUI/src/de/applejuicenet/client/gui/powerdownload/AutomaticPowerdownloadPolicy.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/powerdownload/AutomaticPowerdownloadPolicy.java
index 7d82e80f..ec4f0ddb 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/powerdownload/AutomaticPowerdownloadPolicy.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/powerdownload/AutomaticPowerdownloadPolicy.java
@@ -255,7 +255,7 @@ public boolean hasPropertiesDialog()
}
/**
- * Diese Methode mit dem ffnen und Auswerten des Einstellungendialogs ueberschreiben.
+ * Diese Methode mit dem Ãffnen und Auswerten des Einstellungendialogs ueberschreiben.
*/
public void showPropertiesDialog(Frame parent)
{
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/search/SearchController.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/SearchController.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/search/SearchController.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/SearchController.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/search/SearchPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/SearchPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/search/SearchPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/SearchPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/search/SearchResultPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/SearchResultPanel.java
similarity index 98%
rename from AJClientGUI/src/de/applejuicenet/client/gui/search/SearchResultPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/SearchResultPanel.java
index 2cc1ede8..8a10367a 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/search/SearchResultPanel.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/SearchResultPanel.java
@@ -27,6 +27,7 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
+import de.applejuicenet.client.shared.ReleaseInfo;
import org.apache.log4j.Logger;
import de.applejuicenet.client.AppleJuiceClient;
@@ -44,7 +45,6 @@
import de.applejuicenet.client.gui.search.table.SearchEntrySizeRenderer;
import de.applejuicenet.client.gui.search.table.SearchTableModel;
import de.applejuicenet.client.shared.IconManager;
-import de.applejuicenet.client.shared.ReleaseInfoDialog;
import de.applejuicenet.client.shared.SoundPlayer;
/**
@@ -142,8 +142,7 @@ public void actionPerformed(ActionEvent ae)
SearchEntry curSearchEntry = searchResultTableModel.getRow(sel[0]);
- ReleaseInfoDialog.showReleaseInfo(curSearchEntry.getChecksumme(), true,
- curSearchEntry.getFileNames()[0].getDateiName(), curSearchEntry.getGroesse());
+ ReleaseInfo.handle(curSearchEntry.getFileNames()[0].getDateiName(), curSearchEntry.getChecksumme(), curSearchEntry.getGroesse());
}
});
popup.add(mnuReleaseInfo);
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/search/SearchResultTabbedPane.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/SearchResultTabbedPane.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/search/SearchResultTabbedPane.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/SearchResultTabbedPane.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/search/table/SearchEntryIconRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/table/SearchEntryIconRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/search/table/SearchEntryIconRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/table/SearchEntryIconRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/search/table/SearchEntrySizeRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/table/SearchEntrySizeRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/search/table/SearchEntrySizeRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/table/SearchEntrySizeRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/search/table/SearchTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/table/SearchTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/search/table/SearchTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/search/table/SearchTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/server/NewServerDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/NewServerDialog.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/server/NewServerDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/NewServerDialog.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/server/ServerPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/ServerPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/server/ServerPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/ServerPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/server/table/ServerTableCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/table/ServerTableCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/server/table/ServerTableCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/table/ServerTableCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/server/table/ServerTableDateCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/table/ServerTableDateCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/server/table/ServerTableDateCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/table/ServerTableDateCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/server/table/ServerTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/table/ServerTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/server/table/ServerTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/server/table/ServerTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/DateiListeDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/DateiListeDialog.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/DateiListeDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/DateiListeDialog.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/ShareController.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/ShareController.java
similarity index 99%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/ShareController.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/ShareController.java
index b686cd82..86d2ed6e 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/share/ShareController.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/ShareController.java
@@ -41,7 +41,7 @@
import de.applejuicenet.client.gui.share.tree.DirectoryNode;
import de.applejuicenet.client.gui.share.tree.ShareSelectionTreeModel;
import de.applejuicenet.client.shared.DesktopTools;
-import de.applejuicenet.client.shared.ReleaseInfoDialog;
+import de.applejuicenet.client.shared.ReleaseInfo;
import de.applejuicenet.client.shared.SwingWorker;
/**
@@ -253,7 +253,7 @@ private void showReleaseInfo()
{
Share share = ((ShareNode) obj[0]).getShare();
- ReleaseInfoDialog.showReleaseInfo(share.getCheckSum());
+ ReleaseInfo.handle(share.getShortfilename(), share.getCheckSum(), (long) share.getSize());
}
}
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/SharePanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/SharePanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/SharePanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/SharePanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/ShareTableMouseAdapter.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/ShareTableMouseAdapter.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/ShareTableMouseAdapter.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/ShareTableMouseAdapter.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/ShareTreeMouseAdapter.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/ShareTreeMouseAdapter.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/ShareTreeMouseAdapter.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/ShareTreeMouseAdapter.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/table/DateiListeTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/DateiListeTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/table/DateiListeTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/DateiListeTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/table/DragShareNode.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/DragShareNode.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/table/DragShareNode.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/DragShareNode.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/table/ShareNode.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/ShareNode.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/table/ShareNode.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/ShareNode.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/table/ShareTable.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/ShareTable.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/table/ShareTable.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/ShareTable.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/table/ShareTableCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/ShareTableCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/table/ShareTableCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/ShareTableCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/table/ShareTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/ShareTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/table/ShareTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/table/ShareTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/tree/DirectoryNode.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/tree/DirectoryNode.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/tree/DirectoryNode.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/tree/DirectoryNode.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/tree/DirectoryTree.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/tree/DirectoryTree.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/tree/DirectoryTree.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/tree/DirectoryTree.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/tree/ShareSelectionTreeCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/tree/ShareSelectionTreeCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/tree/ShareSelectionTreeCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/tree/ShareSelectionTreeCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/share/tree/ShareSelectionTreeModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/tree/ShareSelectionTreeModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/share/tree/ShareSelectionTreeModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/share/tree/ShareSelectionTreeModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/start/HyperlinkAdapter.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/HyperlinkAdapter.java
similarity index 96%
rename from AJClientGUI/src/de/applejuicenet/client/gui/start/HyperlinkAdapter.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/HyperlinkAdapter.java
index a752def3..59548f95 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/start/HyperlinkAdapter.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/HyperlinkAdapter.java
@@ -29,7 +29,7 @@
*/
public class HyperlinkAdapter implements HyperlinkListener
{
- private Logger logger;
+ private static Logger logger;
private Component parent;
public HyperlinkAdapter(Component parent)
@@ -65,7 +65,7 @@ else if(e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
}
}
- private void executeLink(String link)
+ public static void executeLink(String link)
{
try
{
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/start/NachrichtenWorker.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/NachrichtenWorker.java
similarity index 85%
rename from AJClientGUI/src/de/applejuicenet/client/gui/start/NachrichtenWorker.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/NachrichtenWorker.java
index f93f9834..d04a2099 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/start/NachrichtenWorker.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/NachrichtenWorker.java
@@ -61,7 +61,7 @@ public void run()
}
ProxySettings proxy = ProxyManagerImpl.getInstance().getProxySettings();
- String htmlText = WebsiteContentLoader.getWebsiteContent(proxy, "http://www.applejuicenet.org", 80,
+ String htmlText = WebsiteContentLoader.getWebsiteContent(proxy, "https://www.applejuicenet.de", 443,
"/inprog/news.php?version=" +
AppleJuiceClient.getAjFassade().getCoreVersion()
.getVersion());
@@ -91,17 +91,12 @@ public void run()
htmlText = buffer.toString();
final String htmlContent = htmlText;
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- version.setText("GUI: " + AppleJuiceDialog.GUI_VERSION + "/" + ApplejuiceFassade.FASSADE_VERSION +
- "
Core: " + coreVersion + "");
- nachrichten.setContentType("text/html");
- nachrichten.setText(htmlContent);
- nachrichten.setFont(version.getFont());
- }
- });
+ SwingUtilities.invokeLater(() -> {
+ version.setText("GUI: " + AppleJuiceDialog.getVersion() + "
Core: " + coreVersion + "");
+ nachrichten.setContentType("text/html");
+ nachrichten.setText(htmlContent);
+ nachrichten.setFont(version.getFont());
+ });
}
catch(Exception e)
{
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/start/NorthPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/NorthPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/start/NorthPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/NorthPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/start/StartController.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/StartController.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/start/StartController.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/StartController.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/start/StartPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/StartPanel.java
similarity index 98%
rename from AJClientGUI/src/de/applejuicenet/client/gui/start/StartPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/StartPanel.java
index bf84055e..9a162f4d 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/start/StartPanel.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/start/StartPanel.java
@@ -25,7 +25,7 @@
* $Header:
* /cvsroot/applejuicejava/AJClientGUI/src/de/applejuicenet/client/gui/StartPanel.java,v
* 1.57 2004/06/15 16:19:19 maj0r Exp $
- *
+ *
*
* Titel: AppleJuice Client-GUI
*
@@ -36,9 +36,9 @@
*
* Copyright: General Public License
*
- *
+ *
* @author: Maj0r [aj@tkl-soft.de]
- *
+ *
*/
public class StartPanel extends TklPanel {
@@ -61,7 +61,7 @@ public class StartPanel extends TklPanel {
private NetworkInfo netInfo;
private Information information;
private LanguageSelector languageSelector;
-
+
public StartPanel(GuiController guiController) {
super(guiController);
try {
@@ -84,7 +84,7 @@ public JTextPane getServerMessagePane(){
public JTextPane getFaqPane(){
return faq;
}
-
+
public JLabel getLblVersion(){
return version;
}
@@ -124,7 +124,7 @@ public JLabel getLblDeinClient(){
public JLabel getLblNeuigkeiten(){
return neuigkeiten;
}
-
+
private void init() throws Exception {
setLayout(new BorderLayout());
serverMessage = new JTextPane();
@@ -167,7 +167,7 @@ private void init() throws Exception {
faq = new JTextPane();
faq.setContentType("text/html");
faq.setEditable(false);
- faq.setText("FAQ");
+ faq.setText("FAQ");
panel3.add(faq, constraints);
constraints.gridy++;
@@ -241,4 +241,4 @@ private void init() throws Exception {
scrollPane.setBorder(null);
add(scrollPane, BorderLayout.CENTER);
}
-}
\ No newline at end of file
+}
diff --git a/ajtray/src/de/applejuicenet/client/gui/tray/DesktopToolJava6.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/tray/DesktopTool.java
similarity index 78%
rename from ajtray/src/de/applejuicenet/client/gui/tray/DesktopToolJava6.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/tray/DesktopTool.java
index 13f77a6f..7ace3dfb 100644
--- a/ajtray/src/de/applejuicenet/client/gui/tray/DesktopToolJava6.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/tray/DesktopTool.java
@@ -3,16 +3,16 @@
*/
package de.applejuicenet.client.gui.tray;
-import java.awt.Desktop;
+
+import java.awt.*;
import java.io.File;
+
import java.io.IOException;
import java.net.URI;
-import de.applejuicenet.client.shared.DesktopToolIF;
-
-public class DesktopToolJava6 implements DesktopToolIF
+public class DesktopTool
{
- public DesktopToolJava6()
+ public DesktopTool()
{
if(!Desktop.isDesktopSupported())
{
@@ -20,7 +20,6 @@ public DesktopToolJava6()
}
}
- @Override
public void browse(URI uri)
{
try
@@ -33,7 +32,6 @@ public void browse(URI uri)
}
}
- @Override
public void open(File toOpen)
{
try
diff --git a/ajtray/src/de/applejuicenet/client/gui/tray/TrayLoader.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/tray/TrayLoader.java
similarity index 88%
rename from ajtray/src/de/applejuicenet/client/gui/tray/TrayLoader.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/tray/TrayLoader.java
index 52d4b445..eeaf8223 100644
--- a/ajtray/src/de/applejuicenet/client/gui/tray/TrayLoader.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/tray/TrayLoader.java
@@ -3,31 +3,30 @@
*/
package de.applejuicenet.client.gui.tray;
-import java.awt.AWTException;
-import java.awt.Image;
-import java.awt.SystemTray;
-import java.awt.TrayIcon;
+import de.applejuicenet.client.gui.AppleJuiceDialog;
+import de.applejuicenet.client.shared.IconManager;
+
+import javax.swing.*;
+import java.awt.*;
import java.awt.TrayIcon.MessageType;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import javax.swing.Icon;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-
-import de.applejuicenet.client.gui.AppleJuiceDialog;
-
-public class TrayLoader implements TrayIF
+public class TrayLoader
{
private String zeigen;
private String verstecken;
private TrayIcon trayIcon = null;
- public boolean makeTray(Image image, String title, final AppleJuiceDialog dialog, final JMenuItem popupShowHideMenuItem,
+ public boolean makeTray( String title, final AppleJuiceDialog dialog, final JMenuItem popupShowHideMenuItem,
final Icon zeigenIcon, final Icon versteckenIcon, final JPopupMenu popup)
{
SystemTray tray = SystemTray.getSystemTray();
+ IconManager im = IconManager.getInstance();
+
+ Image image = im.getIcon("applejuice").getImage();
+
trayIcon = new TrayIcon(image, title, null);
trayIcon.setImageAutoSize(true);
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/HeaderPopupListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/HeaderPopupListener.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/HeaderPopupListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/HeaderPopupListener.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadController.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadController.java
similarity index 93%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadController.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadController.java
index aa6a2f60..a9cbc99b 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadController.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadController.java
@@ -21,6 +21,7 @@
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
+import de.applejuicenet.client.shared.ReleaseInfo;
import org.apache.log4j.Level;
import de.applejuicenet.client.AppleJuiceClient;
@@ -45,6 +46,7 @@ public class UploadController extends GuiController
private static final int COPY_TO_CLIPBOARD = 4;
private static final int HEADER_WAITING_DRAGGED = 8;
private static final int HEADER_WAITING_POPUP = 9;
+ private static final int RELEASE_INFO = 18;
private final UploadPanel uploadPanel;
private boolean componentSelected = false;
private boolean initialized = false;
@@ -93,6 +95,7 @@ private void init()
uploadPanel.getUploadActiveTable().addMouseListener(new UploadTableMouseListener(this, TABLE_MOUSE_CLICKED));
uploadPanel.getUploadActiveTable().addMouseListener(new UploadTablePopupListener(this, TABLE_POPUP));
uploadPanel.getMnuCopyToClipboard().addActionListener(new GuiControllerActionListener(this, COPY_TO_CLIPBOARD));
+ uploadPanel.getMnuReleaseInfo().addActionListener(new GuiControllerActionListener(this, RELEASE_INFO));
uploadPanel.getUploadWaitingTable().getTableHeader().addMouseListener(new HeaderPopupListener(this, HEADER_WAITING_POPUP));
uploadPanel.getUploadWaitingTable().getTableHeader()
@@ -146,11 +149,48 @@ public void fireAction(int actionId, Object obj)
break;
}
+ case RELEASE_INFO:
+ {
+ showReleaseInfo();
+ break;
+ }
+
default:
logger.error("Unregistrierte EventId " + actionId);
}
}
+ private void showReleaseInfo()
+ {
+ int selected = uploadPanel.getUploadActiveTable().getSelectedRow();
+
+ if(selected == -1)
+ {
+ return;
+ }
+
+ Share shareObj = getShareObject4SelectedRow(selected);
+
+ if(shareObj != null)
+ {
+ ReleaseInfo.handle(shareObj.getShortfilename(), shareObj.getCheckSum(), shareObj.getSize());
+ }
+ }
+
+ private Share getShareObject4SelectedRow(int selected) {
+ Upload upload = uploadPanel.getUploadActiveTableModel().getRow(selected);
+
+ Integer shareFileId = upload.getShareFileID();
+ Map share = AppleJuiceClient.getAjFassade().getShare(false);
+
+ if(share.containsKey(shareFileId))
+ {
+ return share.get(shareFileId);
+ }
+
+ return null;
+ }
+
private void headerDragged()
{
PositionManager pm = PositionManagerImpl.getInstance();
@@ -235,26 +275,15 @@ private void copyLinkToClipboard()
return;
}
- Upload upload = uploadPanel.getUploadActiveTableModel().getRow(selected);
+ Share shareObj = getShareObject4SelectedRow(selected);
- Integer shareFileId = upload.getShareFileID();
- Map share = AppleJuiceClient.getAjFassade().getShare(false);
-
- if(share.containsKey(shareFileId))
- {
- Share shareObj = share.get(shareFileId);
+ if(shareObj != null) {
+ Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard();
+ StringBuffer toCopy = new StringBuffer();
- if(share != null)
- {
- Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard();
- StringBuffer toCopy = new StringBuffer();
-
- toCopy.append("ajfsp://file|");
- toCopy.append(shareObj.getShortfilename() + "|" + shareObj.getCheckSum() + "|" + shareObj.getSize() + "/");
- StringSelection contents = new StringSelection(toCopy.toString());
-
- cb.setContents(contents, null);
- }
+ toCopy.append(shareObj.getAjfspLink());
+ StringSelection contents = new StringSelection(toCopy.toString());
+ cb.setContents(contents, null);
}
}
@@ -492,6 +521,7 @@ protected void languageChanged()
warteschlangeVoll = languageSelector.getFirstAttrbuteByTagName("javagui.downloadform.warteschlangevoll");
uploadPanel.getMnuCopyToClipboard().setText(languageSelector.getFirstAttrbuteByTagName("mainform.getlink1.caption"));
+ uploadPanel.getMnuReleaseInfo().setText(languageSelector.getFirstAttrbuteByTagName("releaseinfo.menu"));
}
protected void contentChanged(DATALISTENER_TYPE type, final Object content)
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadMouseMotionListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadMouseMotionListener.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadMouseMotionListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadMouseMotionListener.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadPanel.java
similarity index 74%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadPanel.java
index a06a6c51..5fba2f20 100644
--- a/AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadPanel.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadPanel.java
@@ -4,17 +4,11 @@
package de.applejuicenet.client.gui.upload;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.util.Date;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JLabel;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
+import javax.swing.*;
import javax.swing.table.JTableHeader;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
@@ -67,7 +61,8 @@ public class UploadPanel extends TklPanel implements RegisterI
{
private JLabel uploadListeLabel = new JLabel("0 Clients in Deiner Uploadliste");
private JPopupMenu popupMenu = new JPopupMenu();
- private JMenuItem itemCopyToClipboard;
+ private JMenuItem itemCopyToClipboard = new JMenuItem();
+ private JMenuItem itemReleaseInfo = new JMenuItem();
private JPopupMenu columnActivePopup = new JPopupMenu();
private TableColumn[] columnsActiveUploads = new TableColumn[7];
private JCheckBoxMenuItem[] columnPopupItemsActiveUploads = new JCheckBoxMenuItem[columnsActiveUploads.length];
@@ -99,7 +94,7 @@ private void init() throws Exception
{
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
- double[][] sizes =
+ double[][] sizes =
{
{5, f, 5},
{5, f, f, p}
@@ -119,6 +114,26 @@ private void init() throws Exception
uploadActiveTable.getColumnModel().getColumn(5).setCellRenderer(new UploadTablePrioCellRenderer());
uploadActiveTable.getColumnModel().getColumn(6).setCellRenderer(new VersionTableCellRenderer());
+ uploadActiveTable.addMouseListener(new MouseAdapter()
+ {
+ @Override
+ public void mouseClicked(MouseEvent e)
+ {
+ if(SwingUtilities.isRightMouseButton(e))
+ {
+
+ int row = uploadActiveTable.rowAtPoint(e.getPoint());
+
+ if(!uploadActiveTable.getSelectionModel().isSelectedIndex(row))
+ {
+ uploadActiveTable.getSelectionModel().setSelectionInterval(row, row);
+ }
+
+ maybeShowUploadPopup(e);
+ }
+ }
+ });
+
TableColumnModel modelActive = uploadActiveTable.getColumnModel();
for(int i = 0; i < columnsActiveUploads.length; i++)
@@ -127,41 +142,35 @@ private void init() throws Exception
columnPopupItemsActiveUploads[i] = new JCheckBoxMenuItem((String) columnsActiveUploads[i].getHeaderValue());
final int x = i;
- columnPopupItemsActiveUploads[i].addActionListener(new ActionListener()
+ columnPopupItemsActiveUploads[i].addActionListener(ae -> {
+ if(columnPopupItemsActiveUploads[x].isSelected())
+ {
+ uploadActiveTable.getColumnModel().addColumn(columnsActiveUploads[x]);
+ PositionManagerImpl.getInstance().setUploadColumnVisible(x, true);
+ PositionManagerImpl.getInstance()
+ .setUploadColumnIndex(x,
+ uploadActiveTable.getColumnModel().getColumnIndex(columnsActiveUploads[x].getIdentifier()));
+ }
+ else
{
- public void actionPerformed(ActionEvent ae)
+ uploadActiveTable.getColumnModel().removeColumn(columnsActiveUploads[x]);
+ PositionManagerImpl.getInstance().setUploadColumnVisible(x, false);
+ for(int y = 0; y < columnsActiveUploads.length; y++)
{
- if(columnPopupItemsActiveUploads[x].isSelected())
+ try
{
- uploadActiveTable.getColumnModel().addColumn(columnsActiveUploads[x]);
- PositionManagerImpl.getInstance().setUploadColumnVisible(x, true);
PositionManagerImpl.getInstance()
- .setUploadColumnIndex(x,
- uploadActiveTable.getColumnModel().getColumnIndex(columnsActiveUploads[x].getIdentifier()));
+ .setUploadColumnIndex(y,
+ uploadActiveTable.getColumnModel()
+ .getColumnIndex(columnsActiveUploads[y].getIdentifier()));
}
- else
+ catch(IllegalArgumentException niaE)
{
- uploadActiveTable.getColumnModel().removeColumn(columnsActiveUploads[x]);
- PositionManagerImpl.getInstance().setUploadColumnVisible(x, false);
- for(int y = 0; y < columnsActiveUploads.length; y++)
- {
- try
- {
- PositionManagerImpl.getInstance()
- .setUploadColumnIndex(y,
- uploadActiveTable.getColumnModel()
- .getColumnIndex(columnsActiveUploads[y].getIdentifier()));
- }
- catch(IllegalArgumentException niaE)
- {
- ;
-
- //nix zu tun
- }
- }
+ //nix zu tun
}
}
- });
+ }
+ });
columnActivePopup.add(columnPopupItemsActiveUploads[i]);
}
@@ -220,42 +229,38 @@ public void internalSort(int column, boolean ascent)
columnPopupItemsWaitingUploads[i] = new JCheckBoxMenuItem((String) columnsWaitingUploads[i].getHeaderValue());
final int x = i;
- columnPopupItemsWaitingUploads[i].addActionListener(new ActionListener()
+ columnPopupItemsWaitingUploads[i].addActionListener(ae -> {
+ if(columnPopupItemsWaitingUploads[x].isSelected())
+ {
+ uploadWaitingTable.getColumnModel().addColumn(columnsWaitingUploads[x]);
+ PositionManagerImpl.getInstance().setUploadWaitingColumnVisible(x, true);
+ PositionManagerImpl.getInstance()
+ .setUploadWaitingColumnIndex(x,
+ uploadWaitingTable.getColumnModel()
+ .getColumnIndex(columnsWaitingUploads[x].getIdentifier()));
+ }
+ else
{
- public void actionPerformed(ActionEvent ae)
+ uploadWaitingTable.getColumnModel().removeColumn(columnsWaitingUploads[x]);
+ PositionManagerImpl.getInstance().setUploadWaitingColumnVisible(x, false);
+ for(int y = 0; y < columnsWaitingUploads.length; y++)
{
- if(columnPopupItemsWaitingUploads[x].isSelected())
+ try
{
- uploadWaitingTable.getColumnModel().addColumn(columnsWaitingUploads[x]);
- PositionManagerImpl.getInstance().setUploadWaitingColumnVisible(x, true);
PositionManagerImpl.getInstance()
- .setUploadWaitingColumnIndex(x,
+ .setUploadWaitingColumnIndex(y,
uploadWaitingTable.getColumnModel()
- .getColumnIndex(columnsWaitingUploads[x].getIdentifier()));
+ .getColumnIndex(columnsWaitingUploads[y].getIdentifier()));
}
- else
+ catch(IllegalArgumentException niaE)
{
- uploadWaitingTable.getColumnModel().removeColumn(columnsWaitingUploads[x]);
- PositionManagerImpl.getInstance().setUploadWaitingColumnVisible(x, false);
- for(int y = 0; y < columnsWaitingUploads.length; y++)
- {
- try
- {
- PositionManagerImpl.getInstance()
- .setUploadWaitingColumnIndex(y,
- uploadWaitingTable.getColumnModel()
- .getColumnIndex(columnsWaitingUploads[y].getIdentifier()));
- }
- catch(IllegalArgumentException niaE)
- {
- ;
-
- //nix zu tun
- }
- }
+ ;
+
+ //nix zu tun
}
}
- });
+ }
+ });
columnWaitingPopup.add(columnPopupItemsWaitingUploads[i]);
}
@@ -270,14 +275,31 @@ public void actionPerformed(ActionEvent ae)
JScrollPane aScrollPaneWaiting = new JScrollPane(uploadWaitingTable);
+ IconManager im = IconManager.getInstance();
+
aScrollPaneWaiting.setBackground(uploadWaitingTable.getBackground());
aScrollPaneWaiting.getViewport().setOpaque(false);
add(aScrollPaneWaiting, "1, 2");
add(uploadListeLabel, "1, 3, L, T");
- itemCopyToClipboard = new JMenuItem();
- itemCopyToClipboard.setIcon(IconManager.getInstance().getIcon("clipboard"));
+ itemCopyToClipboard.setIcon(im.getIcon("clipboard"));
popupMenu.add(itemCopyToClipboard);
+
+ itemReleaseInfo.setIcon(im.getIcon("hint"));
+
+ popupMenu.add(itemReleaseInfo);
+ }
+
+ private void maybeShowUploadPopup(MouseEvent e)
+ {
+ int[] selected = uploadActiveTable.getSelectedRows();
+
+ if(null == selected || selected.length == 0)
+ {
+ return;
+ }
+
+ getPopup().show(uploadActiveTable, e.getX(), e.getY());
}
public int[] getColumnActiveWidths()
@@ -368,4 +390,9 @@ public JMenuItem getMnuCopyToClipboard()
{
return itemCopyToClipboard;
}
+
+ public JMenuItem getMnuReleaseInfo()
+ {
+ return itemReleaseInfo;
+ }
}
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadTableMouseListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadTableMouseListener.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadTableMouseListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadTableMouseListener.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadTablePopupListener.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadTablePopupListener.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/UploadTablePopupListener.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/UploadTablePopupListener.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadActiveTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadActiveTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadActiveTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadActiveTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadTableDateCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadTableDateCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadTableDateCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadTableDateCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadTableFilenameCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadTableFilenameCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadTableFilenameCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadTableFilenameCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadTablePrioCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadTablePrioCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadTablePrioCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadTablePrioCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadTableWaitingStatusCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadTableWaitingStatusCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadTableWaitingStatusCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadTableWaitingStatusCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadWaitingTableModel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadWaitingTableModel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/upload/table/UploadWaitingTableModel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/upload/table/UploadWaitingTableModel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/wizard/ConnectionKind.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/ConnectionKind.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/wizard/ConnectionKind.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/ConnectionKind.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/wizard/ConnectionXML.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/ConnectionXML.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/wizard/ConnectionXML.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/ConnectionXML.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt1Panel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt1Panel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt1Panel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt1Panel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt2Panel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt2Panel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt2Panel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt2Panel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt3Panel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt3Panel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt3Panel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt3Panel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt4Panel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt4Panel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt4Panel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt4Panel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt5Panel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt5Panel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/wizard/Schritt5Panel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/Schritt5Panel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/wizard/WizardDialog.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/WizardDialog.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/wizard/WizardDialog.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/WizardDialog.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/gui/wizard/WizardPanel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/WizardPanel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/gui/wizard/WizardPanel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/gui/wizard/WizardPanel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/ConnectionSettings.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/ConnectionSettings.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/ConnectionSettings.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/ConnectionSettings.java
diff --git a/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/DesktopTools.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/DesktopTools.java
new file mode 100644
index 00000000..685cd095
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/DesktopTools.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2006 TKLSoft.de All rights reserved.
+ */
+
+package de.applejuicenet.client.shared;
+
+import java.io.File;
+
+import java.net.URI;
+
+import javax.swing.JOptionPane;
+
+import de.applejuicenet.client.gui.AppleJuiceDialog;
+import de.applejuicenet.client.gui.controller.LanguageSelector;
+import de.applejuicenet.client.gui.controller.OptionsManagerImpl;
+import de.applejuicenet.client.gui.tray.DesktopTool;
+
+public class DesktopTools {
+ private static DesktopTool desktopToolIF;
+
+ static {
+ desktopToolIF = new DesktopTool();
+ }
+
+ public static boolean isAdvancedSupported() {
+ return null != desktopToolIF;
+ }
+
+ public static void browse(URI uri) {
+ if (null != desktopToolIF && !System.getProperty("os.name").toLowerCase().contains("linux")) {
+ desktopToolIF.browse(uri);
+ } else {
+ String browser = OptionsManagerImpl.getInstance().getStandardBrowser();
+
+ try {
+ Runtime.getRuntime().exec(new String[]{browser, uri.toURL().toString()});
+ } catch (Exception ex) {
+ LanguageSelector ls = LanguageSelector.getInstance();
+ String nachricht = ls.getFirstAttrbuteByTagName("javagui.startup.updatefehlernachricht");
+ String titel = ls.getFirstAttrbuteByTagName("mainform.caption");
+
+ JOptionPane.showMessageDialog(AppleJuiceDialog.getApp(), nachricht, titel, JOptionPane.INFORMATION_MESSAGE);
+ }
+ }
+ }
+
+ public static void open(File toOpen) {
+ if (null != desktopToolIF) {
+ desktopToolIF.open(toOpen);
+ }
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/IconManager.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/IconManager.java
new file mode 100644
index 00000000..03fb9c3f
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/IconManager.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2006 TKLSoft.de All rights reserved.
+ */
+
+package de.applejuicenet.client.shared;
+
+import java.awt.Image;
+import java.awt.Toolkit;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+import java.io.FileNotFoundException;
+import java.net.URL;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.swing.ImageIcon;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+/**
+ * Titel: AppleJuice Client-GUI
+ * Beschreibung: Offizielles GUI fuer den von muhviehstarr entwickelten appleJuice-Core
+ * Copyright: General Public License
+ *
+ * @author: Maj0r [aj@tkl-soft.de]
+ */
+public class IconManager {
+ private static IconManager instance = null;
+ private final Logger logger;
+ private final Map icons;
+ private String pluginPath;
+
+ private IconManager() {
+ logger = Logger.getLogger(getClass());
+ icons = new HashMap<>();
+ if (!System.getProperty("os.name").toLowerCase().contains("windows")) {
+ pluginPath = System.getProperty("user.home") + File.separator + "appleJuice" + File.separator + "gui" + File.separator + "plugins" + File.separator;
+ } else {
+ pluginPath = System.getProperty("user.dir") + File.separator + "plugins" + File.separator;
+ }
+ }
+
+ public static IconManager getInstance() {
+ if (instance == null) {
+ instance = new IconManager();
+ }
+
+ return instance;
+ }
+
+ public ImageIcon getIcon(String key) {
+ ImageIcon result = null;
+
+ try {
+
+ if (icons.containsKey(key)) {
+ result = icons.get(key);
+ } else {
+ String path;
+ String pathGif = System.getProperty("user.dir") + File.separator + "icons" + File.separator + key + ".gif";
+ String pathPng = System.getProperty("user.dir") + File.separator + "icons" + File.separator + key + ".png";
+
+ File fileGif = new File(pathGif);
+ File filePng = new File(pathPng);
+
+ if (filePng.exists() && !filePng.isDirectory()) {
+ path = pathPng;
+ }
+ else if (fileGif.exists() && !fileGif.isDirectory()) {
+ path = pathGif;
+ }
+ else {
+ throw new FileNotFoundException("No Icon for " + key + " found (.gif or .png)");
+ }
+
+ Image img = Toolkit.getDefaultToolkit().getImage(path);
+
+ result = new ImageIcon(img);
+ icons.put(key, result);
+ }
+ } catch (Exception e) {
+ if (logger.isEnabledFor(Level.INFO)) {
+ logger.info("Icon " + key + ".gif nicht gefunden", e);
+ }
+ }
+
+ return result;
+ }
+
+ @SuppressWarnings("unchecked")
+ public ImageIcon getIcon(String key, boolean isPlugin, Class referenceClass) {
+ if (!isPlugin) {
+ return getIcon(key);
+ }
+
+ ImageIcon result = null;
+
+ try {
+ result = icons.get(key);
+ if (null == result) {
+ URL url = referenceClass.getClassLoader().getResource(key + ".gif");
+
+ Image img = Toolkit.getDefaultToolkit().getImage(url);
+
+ result = new ImageIcon(img);
+ icons.put(key, result);
+ }
+ } catch (Exception e) {
+ if (logger.isEnabledFor(Level.INFO)) {
+ logger.info("Plugin-Icon " + key + ".gif nicht gefunden", e);
+ }
+ }
+
+ return result;
+ }
+
+ public Properties getIconProperties(String identifier) {
+ String path = System.getProperty("user.dir") + File.separator + "icons" + File.separator + identifier + ".properties";
+ File aFile = new File(path);
+
+ if (aFile.isFile()) {
+ Properties props = new Properties();
+
+ try {
+ props.load(new FileInputStream(aFile));
+ } catch (Exception e) {
+ return null;
+ }
+
+ return props;
+ } else {
+ return null;
+ }
+ }
+}
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/LookAFeel.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/LookAFeel.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/LookAFeel.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/LookAFeel.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/MultiLineToolTip.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/MultiLineToolTip.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/MultiLineToolTip.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/MultiLineToolTip.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/NumberAndSpecialCharsInputVerifier.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/NumberAndSpecialCharsInputVerifier.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/NumberAndSpecialCharsInputVerifier.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/NumberAndSpecialCharsInputVerifier.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/NumberInputVerifier.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/NumberInputVerifier.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/NumberInputVerifier.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/NumberInputVerifier.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/PluginJarClassLoader.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/PluginJarClassLoader.java
similarity index 96%
rename from AJClientGUI/src/de/applejuicenet/client/shared/PluginJarClassLoader.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/PluginJarClassLoader.java
index 313e51b3..0bf7cceb 100644
--- a/AJClientGUI/src/de/applejuicenet/client/shared/PluginJarClassLoader.java
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/PluginJarClassLoader.java
@@ -4,16 +4,14 @@
package de.applejuicenet.client.shared;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.security.SecureClassLoader;
import java.util.Enumeration;
@@ -136,7 +134,7 @@ private void loadClassBytesFromJar(File jar) throws Exception
InputStream iS = jf.getInputStream(entry);
pluginProperties = new Properties();
- pluginProperties.load(iS);
+ pluginProperties.load(new InputStreamReader(iS, StandardCharsets.UTF_8));
}
else if(entryName.indexOf("icon.gif") != -1)
{
@@ -155,9 +153,9 @@ else if(entryName.startsWith("language_") && entryName.endsWith(".properties"))
{
InputStream iS = jf.getInputStream(entry);
- Properties curLanguageProperties = new Properties();
+ Properties curLanguageProperties = new Properties();
- curLanguageProperties.load(iS);
+ curLanguageProperties.load(new InputStreamReader(iS, StandardCharsets.UTF_8));
String sprache = curLanguageProperties.getProperty("language");
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/PolicyJarClassLoader.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/PolicyJarClassLoader.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/PolicyJarClassLoader.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/PolicyJarClassLoader.java
diff --git a/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/ReleaseInfo.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/ReleaseInfo.java
new file mode 100644
index 00000000..1ca5e061
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/ReleaseInfo.java
@@ -0,0 +1,61 @@
+package de.applejuicenet.client.shared;
+
+import de.applejuicenet.client.gui.start.HyperlinkAdapter;
+
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+
+public class ReleaseInfo {
+
+ private static final String defaultHost = "http://www.apple-deluxe.cc/index.php?ct=403&va=%s";
+
+ private static String releaseInfoHost = null;
+
+ private static void init() {
+ if (null == releaseInfoHost) {
+ Properties props = new Properties();
+ String path = System.getProperty("user.home") + File.separator + "appleJuice" + File.separator + "gui" + File.separator + "rel.properties";
+
+ File aFile = new File(path);
+ if (aFile.exists()) {
+ try {
+ FileInputStream fiS = new FileInputStream(aFile);
+ props.load(fiS);
+ fiS.close();
+
+ releaseInfoHost = props.getProperty("host", defaultHost);
+ } catch (Exception e) {
+ // nix zu tun
+ }
+ } else {
+ props.setProperty("host", defaultHost);
+ try (OutputStream outputStream = new FileOutputStream(aFile)) {
+ props.store(outputStream, null);
+ } catch (IOException e) {
+ // nix zu tun
+ }
+ }
+
+ releaseInfoHost = (releaseInfoHost == null) ? defaultHost : releaseInfoHost;
+ }
+ }
+
+ public static void handle(String filename, String hash, Long size) {
+ init();
+
+ String ajfsp = String.format("ajfsp://file%%7C%s%%7C%s%%7C%s/", encodeValue(filename), hash, size);
+
+ HyperlinkAdapter.executeLink(String.format(releaseInfoHost, ajfsp));
+ }
+
+ private static String encodeValue(String value) {
+ try {
+ return URLEncoder.encode(value, StandardCharsets.UTF_8.toString());
+ } catch (UnsupportedEncodingException ex) {
+ throw new RuntimeException(ex.getCause());
+ }
+ }
+
+}
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/Settings.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/Settings.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/Settings.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/Settings.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/SoundPlayer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/SoundPlayer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/SoundPlayer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/SoundPlayer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/Splash.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/Splash.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/Splash.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/Splash.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/SwingWorker.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/SwingWorker.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/SwingWorker.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/SwingWorker.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/exception/InvalidPasswordException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/InvalidPasswordException.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/exception/InvalidPasswordException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/InvalidPasswordException.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/exception/LanguageSelectorNotInstanciatedException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/LanguageSelectorNotInstanciatedException.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/exception/LanguageSelectorNotInstanciatedException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/LanguageSelectorNotInstanciatedException.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/exception/NoIconAvailableException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/NoIconAvailableException.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/exception/NoIconAvailableException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/NoIconAvailableException.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/exception/NodeAlreadyExistsException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/NodeAlreadyExistsException.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/exception/NodeAlreadyExistsException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/NodeAlreadyExistsException.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/exception/PartlistException.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/PartlistException.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/exception/PartlistException.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/exception/PartlistException.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/icons/DummyClass.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/icons/DummyClass.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/icons/DummyClass.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/icons/DummyClass.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/ProgressTableCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/ProgressTableCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/ProgressTableCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/ProgressTableCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/SizeTableCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/SizeTableCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/SizeTableCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/SizeTableCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/SpeedTableCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/SpeedTableCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/SpeedTableCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/SpeedTableCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/StringTableCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/StringTableCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/StringTableCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/StringTableCellRenderer.java
diff --git a/AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/VersionTableCellRenderer.java b/modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/VersionTableCellRenderer.java
similarity index 100%
rename from AJClientGUI/src/de/applejuicenet/client/shared/tablecellrenderer/VersionTableCellRenderer.java
rename to modules/AJCoreGUI/src/main/java/de/applejuicenet/client/shared/tablecellrenderer/VersionTableCellRenderer.java
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/LICENSE.md b/modules/AJCoreGUI/src/main/java/de/tklsoft/LICENSE.md
new file mode 100644
index 00000000..210895e2
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/LICENSE.md
@@ -0,0 +1,130 @@
+Mozilla Public License Version 1.1
+1. Definitions.
+
+1.0.1. "Commercial Use"
+ means distribution or otherwise making the Covered Code available to a third party.
+1.1. "Contributor"
+ means each entity that creates or contributes to the creation of Modifications.
+1.2. "Contributor Version"
+ means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
+1.3. "Covered Code"
+ means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
+1.4. "Electronic Distribution Mechanism"
+ means a mechanism generally accepted in the software development community for the electronic transfer of data.
+1.5. "Executable"
+ means Covered Code in any form other than Source Code.
+1.6. "Initial Developer"
+ means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
+1.7. "Larger Work"
+ means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
+1.8. "License"
+ means this document.
+1.8.1. "Licensable"
+ means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+1.9. "Modifications"
+
+ means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
+
+ 1. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
+ 2. Any new file that contains any part of the Original Code or previous Modifications.
+
+1.10. "Original Code"
+ means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
+1.10.1. "Patent Claims"
+ means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+1.11. "Source Code"
+ means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
+1.12. "You" (or "Your")
+ means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+2.1. The Initial Developer Grant.
+
+The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
+
+ 1. under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and
+ 2. under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof).
+ 3. the licenses granted in this Section 2.1 (a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License.
+ 4. Notwithstanding Section 2.1 (b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices.
+
+2.2. Contributor Grant.
+
+Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license
+
+ 1. under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and
+ 2. under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+ 3. the licenses granted in Sections 2.2 (a) and 2.2 (b) are effective on the date Contributor first makes Commercial Use of the Covered Code.
+ 4. Notwithstanding Section 2.2 (b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+3.1. Application of License.
+
+The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
+3.2. Availability of Source Code.
+
+Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
+3.3. Description of Modifications.
+
+You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
+3.4. Intellectual Property Matters
+(a) Third Party Claims
+
+If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
+(b) Contributor APIs
+
+If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the legal file.
+(c) Representations.
+
+Contributor represents that, except as disclosed pursuant to Section 3.4 (a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
+3.5. Required Notices.
+
+You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+3.6. Distribution of Executable Versions.
+
+You may distribute Covered Code in Executable form only if the requirements of Sections 3.1, 3.2, 3.3, 3.4 and 3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+3.7. Larger Works.
+
+You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
+4. Inability to Comply Due to Statute or Regulation.
+
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the legal file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
+5. Application of this License.
+
+This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
+6. Versions of the License.
+6.1. New Versions
+
+Netscape Communications Corporation ("Netscape") may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
+6.2. Effect of New Versions
+
+Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
+6.3. Derivative Works
+
+If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", "MPL", "NPL" or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
+7. Disclaimer of warranty
+
+Covered code is provided under this license on an "as is" basis, without warranty of any kind, either expressed or implied, including, without limitation, warranties that the covered code is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the covered code is with you. Should any covered code prove defective in any respect, you (not the initial developer or any other contributor) assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty constitutes an essential part of this license. No use of any covered code is authorized hereunder except under this disclaimer.
+8. Termination
+
+8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+8.2. If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that:
+
+ 1. such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above.
+ 2. any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant.
+
+8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
+
+8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
+9. Limitation of liability
+
+Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall you, the initial developer, any other contributor, or any distributor of covered code, or any supplier of any of such parties, be liable to any person for any indirect, special, incidental, or consequential damages of any character including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from such party's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to you.
+10. U.S. government end users
+
+The Covered Code is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial computer software documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein.
+11. Miscellaneous
+
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.
+12. Responsibility for claims
+
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/README.md b/modules/AJCoreGUI/src/main/java/de/tklsoft/README.md
new file mode 100755
index 00000000..8369c833
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/README.md
@@ -0,0 +1,3 @@
+TKLControls
+version: 1.0
+written by Torsten Krall and Timo Lövenich
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/DelegationObject.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/DelegationObject.java
new file mode 100755
index 00000000..10b73513
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/DelegationObject.java
@@ -0,0 +1,19 @@
+package de.tklsoft.gui.controls;
+
+import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+
+public abstract class DelegationObject {
+
+ public static void notifyPapas(Component ersterPapa, KeyEvent keyEvent) {
+ for(Object moeglicherFrame = ersterPapa; moeglicherFrame != null; moeglicherFrame = ((Component)moeglicherFrame).getParent()) {
+ KeyListener[] listeners = ((Component)moeglicherFrame).getKeyListeners();
+
+ for(int i = 0; i < listeners.length; ++i) {
+ listeners[i].keyReleased(keyEvent);
+ }
+ }
+
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/InvalidRule.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/InvalidRule.java
new file mode 100755
index 00000000..082c077b
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/InvalidRule.java
@@ -0,0 +1,51 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.ModifyableComponent;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JTextField;
+
+public interface InvalidRule {
+
+ boolean isInvalid(ModifyableComponent var1);
+
+ public static class NotEmptyInvalidRule implements InvalidRule {
+
+ private static NotEmptyInvalidRule instance = null;
+
+
+ public static InvalidRule getInstance() {
+ if(instance == null) {
+ instance = new NotEmptyInvalidRule();
+ }
+
+ return instance;
+ }
+
+ public boolean isInvalid(ModifyableComponent aComponent) {
+ JComponent component = aComponent.getComponent();
+ return component instanceof JTextField?((JTextField)component).getText().length() > 0:(component instanceof JComboBox?((JComboBox)component).getSelectedItem() != null:true);
+ }
+
+ }
+
+ public static class EmptyInvalidRule implements InvalidRule {
+
+ private static EmptyInvalidRule instance = null;
+
+
+ public static InvalidRule getInstance() {
+ if(instance == null) {
+ instance = new EmptyInvalidRule();
+ }
+
+ return instance;
+ }
+
+ public boolean isInvalid(ModifyableComponent aComponent) {
+ JComponent component = aComponent.getComponent();
+ return component instanceof JTextField?((JTextField)component).getText().length() == 0:(component instanceof JComboBox?((JComboBox)component).getSelectedItem() == null:true);
+ }
+
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/ModifyableComponent.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/ModifyableComponent.java
new file mode 100755
index 00000000..de581070
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/ModifyableComponent.java
@@ -0,0 +1,39 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.InvalidRule;
+import de.tklsoft.gui.controls.StatusHolder;
+import java.beans.PropertyChangeListener;
+import javax.swing.JComponent;
+
+public interface ModifyableComponent {
+
+ void addStatusPropertyChangeListener(PropertyChangeListener var1);
+
+ void removeStatusPropertyChangeListener(PropertyChangeListener var1);
+
+ void addInvalidRule(InvalidRule var1);
+
+ void removeInvalidRule(InvalidRule var1);
+
+ void ignoreInvalidRules(boolean var1);
+
+ void resetValidStatus();
+
+ void fireCheckRules();
+
+ boolean isInvalid();
+
+ void ignoreStatus(StatusHolder.STATUSFLAG var1, boolean var2);
+
+ Object getOldValue();
+
+ void confirmNewValue();
+
+ JComponent getComponent();
+
+ boolean isDirty();
+
+ void resetToOldValue();
+
+ void disableDirtyComponent(boolean var1);
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/StatusHolder.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/StatusHolder.java
new file mode 100755
index 00000000..192e6f7e
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/StatusHolder.java
@@ -0,0 +1,144 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.InvalidRule;
+import de.tklsoft.gui.controls.ModifyableComponent;
+import de.tklsoft.gui.controls.border.ModifyableComponentBorder;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+public class StatusHolder {
+
+ private final ModifyableComponent parentComponent;
+ private HashSet ignoreStati = new HashSet();
+ private STATUSFLAG status;
+ private ModifyableComponentBorder dirtyBorder;
+ private Set listeners;
+ private Set rules;
+ private boolean ignoreRules;
+
+
+ StatusHolder(ModifyableComponent component, int borderWidth) {
+ this.status = STATUSFLAG.NORMAL;
+ this.listeners = new HashSet();
+ this.rules = new HashSet();
+ this.ignoreRules = true;
+ this.parentComponent = component;
+ this.dirtyBorder = new ModifyableComponentBorder(component.getComponent(), borderWidth);
+ component.getComponent().setBorder(this.dirtyBorder);
+ this.addStatusPropertyChangeListener(this.dirtyBorder);
+ }
+
+ public void setStatus(STATUSFLAG newStatus) {
+ PropertyChangeEvent ev = new PropertyChangeEvent(this.parentComponent, "border", this.status, newStatus);
+ this.status = newStatus;
+ this.informStatusPropertyChangeListeners(ev);
+ }
+
+ public STATUSFLAG getStatus() {
+ return this.status;
+ }
+
+ public void addStatusPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ this.listeners.add(propertyChangeListener);
+ }
+
+ public void removeStatusPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ this.listeners.remove(propertyChangeListener);
+ }
+
+ private void informStatusPropertyChangeListeners(PropertyChangeEvent ev) {
+ Iterator i$ = this.listeners.iterator();
+
+ while(i$.hasNext()) {
+ PropertyChangeListener curListener = (PropertyChangeListener)i$.next();
+ curListener.propertyChange(ev);
+ }
+
+ }
+
+ public void addInvalidRule(InvalidRule rule) {
+ this.rules.add(rule);
+ }
+
+ public void removeInvalidRule(InvalidRule rule) {
+ this.rules.remove(rule);
+ }
+
+ public void ignoreInvalidRules(boolean ignore) {
+ this.ignoreRules = ignore;
+ }
+
+ public boolean shouldIgnoreInvalidRules() {
+ return this.ignoreRules;
+ }
+
+ public void resetValidStatus() {
+ this.setStatus(STATUSFLAG.NORMAL);
+ }
+
+ public void ignoreStatus(STATUSFLAG status, boolean ignore) {
+ if(ignore) {
+ this.ignoreStati.add(status);
+ } else {
+ this.ignoreStati.remove(status);
+ }
+
+ }
+
+ public void fireCheckRules() {
+ if(this.ignoreRules) {
+ if(!this.ignoreStati.contains(STATUSFLAG.MODIFIED) && this.parentComponent.isDirty()) {
+ this.setStatus(STATUSFLAG.MODIFIED);
+ } else {
+ this.setStatus(STATUSFLAG.NORMAL);
+ }
+
+ } else if(this.ignoreStati.contains(STATUSFLAG.INVALID)) {
+ this.setStatus(STATUSFLAG.NORMAL);
+ } else {
+ if(this.isInvalid()) {
+ this.setStatus(STATUSFLAG.INVALID);
+ } else if(!this.ignoreStati.contains(STATUSFLAG.MODIFIED) && this.parentComponent.isDirty()) {
+ this.setStatus(STATUSFLAG.MODIFIED);
+ } else {
+ this.setStatus(STATUSFLAG.NORMAL);
+ }
+
+ }
+ }
+
+ public boolean isInvalid() {
+ if(this.ignoreRules) {
+ return false;
+ } else {
+ Iterator i$ = this.rules.iterator();
+
+ InvalidRule curRule;
+ do {
+ if(!i$.hasNext()) {
+ return false;
+ }
+
+ curRule = (InvalidRule)i$.next();
+ } while(!curRule.isInvalid(this.parentComponent));
+
+ return true;
+ }
+ }
+
+ public static enum STATUSFLAG {
+
+ NORMAL("NORMAL", 0),
+ MODIFIED("MODIFIED", 1),
+ INVALID("INVALID", 2);
+ // $FF: synthetic field
+ private static final STATUSFLAG[] $VALUES = new STATUSFLAG[]{NORMAL, MODIFIED, INVALID};
+
+
+ private STATUSFLAG(String var1, int var2) {}
+
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLButton.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLButton.java
new file mode 100755
index 00000000..3d0547b5
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLButton.java
@@ -0,0 +1,55 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.DelegationObject;
+import de.tklsoft.gui.layout.Synchronizable;
+import de.tklsoft.gui.layout.Synchronizer;
+import java.awt.Dimension;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import javax.swing.Icon;
+import javax.swing.JButton;
+
+public class TKLButton extends JButton implements Synchronizable {
+
+ private Synchronizer synchronizer;
+
+
+ public TKLButton(String text, Icon icon) {
+ super(text, icon);
+ this.synchronizer = null;
+ this.init();
+ }
+
+ public TKLButton(String text) {
+ this(text, (Icon)null);
+ }
+
+ public TKLButton(Icon icon) {
+ this("", icon);
+ }
+
+ public TKLButton() {
+ this("", (Icon)null);
+ }
+
+ private void init() {
+ this.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ DelegationObject.notifyPapas(TKLButton.this.getParent(), keyEvent);
+ }
+ });
+ }
+
+ public void setSynchronizer(Synchronizer synchronizer) {
+ this.synchronizer = synchronizer;
+ }
+
+ public Dimension getPreferredSize() {
+ return this.synchronizer == null?super.getPreferredSize():this.synchronizer.getSize(this);
+ }
+
+ public Dimension getNormalSize() {
+ return super.getPreferredSize();
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLCalendarComboBox.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLCalendarComboBox.java
new file mode 100755
index 00000000..5583fef8
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLCalendarComboBox.java
@@ -0,0 +1,331 @@
+/*
+ * Decompiled with CFR 0.150.
+ */
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.calendar.JCalendarPanel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JSpinner;
+import javax.swing.JTextField;
+import javax.swing.JWindow;
+import javax.swing.RootPaneContainer;
+import javax.swing.SpinnerDateModel;
+import javax.swing.SwingConstants;
+import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.plaf.basic.BasicArrowButton;
+
+public class TKLCalendarComboBox
+ extends JPanel
+ implements ActionListener,
+ AncestorListener,
+ ChangeListener,
+ SwingConstants {
+ private int _popupLocation = 2;
+ private boolean _calendarWindowFocusLost = false;
+ private Calendar _selected;
+ private BasicArrowButton _button;
+ private JSpinner _spinner = new JSpinner();
+ private JWindow _calendarWindow;
+ private JCalendarPanel _calendarPanel;
+ private List _changeListener = new ArrayList();
+ private boolean _fireingChangeEvent = false;
+ private boolean _changed = false;
+
+ public TKLCalendarComboBox() {
+ this._calendarPanel = new JCalendarPanel();
+ this.createGUI();
+ }
+
+ public TKLCalendarComboBox(Calendar cal) {
+ this._calendarPanel = new JCalendarPanel(cal);
+ this.createGUI();
+ }
+
+ private void createGUI() {
+ this._calendarPanel.setListenerModus(2);
+ this._selected = (Calendar)this._calendarPanel.getCalendar().clone();
+ this._calendarPanel.addChangeListener(this);
+ this._calendarPanel.setBorder(BorderFactory.createLineBorder(Color.black));
+ this.setLayout(new BorderLayout());
+ this._spinner.setModel(new SpinnerDateModel());
+ this._spinner.setEditor(new JSpinner.DateEditor(this._spinner, ((SimpleDateFormat)this._calendarPanel.getDateFormat()).toPattern()));
+ this._spinner.getModel().setValue(this._selected.getTime());
+ this._spinner.setBorder(null);
+ ((JSpinner.DefaultEditor)this._spinner.getEditor()).getTextField().addFocusListener(new FocusAdapter(){
+
+ public void focusLost(FocusEvent e) {
+ if (!TKLCalendarComboBox.this._calendarPanel.getCalendar().getTime().equals(TKLCalendarComboBox.this._spinner.getModel().getValue())) {
+ Date date = (Date)TKLCalendarComboBox.this._spinner.getModel().getValue();
+ TKLCalendarComboBox.this._selected.setTime(date);
+ TKLCalendarComboBox.this._calendarPanel.setCalendar(TKLCalendarComboBox.this._selected);
+ TKLCalendarComboBox.this.fireChangeEvent();
+ }
+ }
+ });
+ this._button = new BasicArrowButton(5);
+ Insets insets = new Insets(this._button.getMargin().top, 0, this._button.getMargin().bottom, 0);
+ this._button.setMargin(insets);
+ this._button.addActionListener(this);
+ this._button.setEnabled(true);
+ this._button.addFocusListener(new FocusAdapter(){
+
+ public void focusGained(FocusEvent e) {
+ JComponent opposite;
+ if (e.getOppositeComponent() != null && e.getOppositeComponent() instanceof JComponent && (opposite = (JComponent)e.getOppositeComponent()).getTopLevelAncestor() != TKLCalendarComboBox.this._calendarWindow && !TKLCalendarComboBox.this._calendarWindowFocusLost) {
+ TKLCalendarComboBox.this._calendarWindowFocusLost = false;
+ }
+ }
+ });
+ this.add((Component)this._spinner, "Center");
+ this.add((Component)this._button, "East");
+ this.setBorder(new JTextField().getBorder());
+ }
+
+ public Dimension getPreferredSize() {
+ return new Dimension(120, super.getPreferredSize().height);
+ }
+
+ private void createCalendarWindow() {
+ Window ancestor = (Window)this.getTopLevelAncestor();
+ this._calendarWindow = new JWindow(ancestor);
+ JPanel contentPanel = (JPanel)this._calendarWindow.getContentPane();
+ contentPanel.setLayout(new BorderLayout());
+ contentPanel.add(this._calendarPanel);
+ ((JComponent)((RootPaneContainer)((Object)ancestor)).getContentPane()).addAncestorListener(this);
+ ((JComponent)((RootPaneContainer)((Object)ancestor)).getContentPane()).addMouseListener(new MouseAdapter(){
+
+ public void mouseClicked(MouseEvent e) {
+ TKLCalendarComboBox.this.hideCalendar();
+ }
+ });
+ this._calendarWindow.addWindowListener(new WindowAdapter(){
+
+ public void windowDeactivated(WindowEvent e) {
+ TKLCalendarComboBox.this.hideCalendar();
+ }
+ });
+ this._calendarWindow.addWindowFocusListener(new WindowAdapter(){
+
+ public void windowLostFocus(WindowEvent e) {
+ if (TKLCalendarComboBox.this._button.isSelected()) {
+ TKLCalendarComboBox.this._calendarWindowFocusLost = true;
+ }
+ TKLCalendarComboBox.this.hideCalendar();
+ }
+ });
+ ancestor.addComponentListener(new ComponentAdapter(){
+
+ public void componentResized(ComponentEvent e) {
+ TKLCalendarComboBox.this.hideCalendar();
+ }
+
+ public void componentMoved(ComponentEvent e) {
+ TKLCalendarComboBox.this.hideCalendar();
+ }
+
+ public void componentShown(ComponentEvent e) {
+ TKLCalendarComboBox.this.hideCalendar();
+ }
+
+ public void componentHidden(ComponentEvent e) {
+ TKLCalendarComboBox.this.hideCalendar();
+ }
+ });
+ this._calendarWindow.pack();
+ }
+
+ public Calendar getCalendar() {
+ return this._calendarPanel.getCalendar();
+ }
+
+ public void setTime(long time) {
+ Calendar calendar = this._calendarPanel.getCalendar();
+ calendar.setTimeInMillis(time);
+ this.setCalendar(calendar);
+ }
+
+ public void setCalendar(Calendar cal) {
+ this._calendarPanel.setCalendar(cal);
+ this._spinner.getModel().setValue(this._calendarPanel.getCalendar().getTime());
+ }
+
+ public JCalendarPanel getCalendarPanel() {
+ return this._calendarPanel;
+ }
+
+ public void setPopUpLocation(int location) {
+ this._popupLocation = location;
+ }
+
+ public int getPopUpLocation() {
+ return this._popupLocation;
+ }
+
+ public void setVerticalAlignment(int value) {
+ }
+
+ public void setHorizontalAlignment(int value) {
+ ((JSpinner.DefaultEditor)this._spinner.getEditor()).getTextField().setHorizontalAlignment(value);
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ if (this._calendarWindow != null && this._calendarWindow.isVisible()) {
+ this.hideCalendar();
+ } else {
+ this.showCalender();
+ }
+ }
+
+ public void hideCalendar() {
+ if (this._calendarWindow.isVisible()) {
+ this._calendarWindow.setVisible(false);
+ if (!this._calendarPanel.getCalendar().getTime().equals(this._spinner.getModel().getValue())) {
+ this._changed = true;
+ }
+ if (this._changed) {
+ this._spinner.getModel().setValue(this._calendarPanel.getCalendar().getTime());
+ this._selected = (Calendar)this._calendarPanel.getCalendar().clone();
+ this._changed = false;
+ this.fireChangeEvent();
+ }
+ }
+ }
+
+ public void showCalender() {
+ Window ancestor = (Window)this.getTopLevelAncestor();
+ if (this._calendarWindow == null || ancestor != this._calendarWindow.getOwner()) {
+ this.createCalendarWindow();
+ }
+ Date date = (Date)this._spinner.getModel().getValue();
+ this._selected.setTime(date);
+ this._calendarPanel.setCalendar(this._selected);
+ Point location = this.getLocationOnScreen();
+ int x = this._popupLocation == 4 ? (int)location.getX() + this._button.getSize().width - this._calendarWindow.getSize().width : (this._popupLocation == 0 ? (int)location.getX() + (this._button.getSize().width - this._calendarWindow.getSize().width) / 2 : (int)location.getX());
+ int y = (int)location.getY() + this._button.getHeight();
+ Rectangle screenSize = this.getDesktopBounds();
+ if (x < 0) {
+ x = 0;
+ }
+ if (y < 0) {
+ y = 0;
+ }
+ if (x + this._calendarWindow.getWidth() > screenSize.width) {
+ x = screenSize.width - this._calendarWindow.getWidth();
+ }
+ if (y + 30 + this._calendarWindow.getHeight() > screenSize.height) {
+ y = (int)location.getY() - this._calendarWindow.getHeight();
+ }
+ this._calendarWindow.setBounds(x, y, this._calendarWindow.getWidth(), this._calendarWindow.getHeight());
+ this._calendarWindow.setVisible(true);
+ }
+
+ private Rectangle getDesktopBounds() {
+ GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+ GraphicsDevice[] gd = ge.getScreenDevices();
+ Rectangle[] screenDeviceBounds = new Rectangle[gd.length];
+ Rectangle desktopBounds = new Rectangle();
+ for (int i = 0; i < gd.length; ++i) {
+ GraphicsConfiguration gc = gd[i].getDefaultConfiguration();
+ screenDeviceBounds[i] = gc.getBounds();
+ desktopBounds = desktopBounds.union(screenDeviceBounds[i]);
+ }
+ return desktopBounds;
+ }
+
+ public void ancestorAdded(AncestorEvent event) {
+ this.hideCalendar();
+ }
+
+ public void ancestorMoved(AncestorEvent event) {
+ this.hideCalendar();
+ }
+
+ public void ancestorRemoved(AncestorEvent event) {
+ this.hideCalendar();
+ }
+
+ public void stateChanged(ChangeEvent e) {
+ this._changed = true;
+ this.hideCalendar();
+ }
+
+ public void addChangeListener(ChangeListener listener) {
+ this._changeListener.add(listener);
+ }
+
+ public void removeChangeListener(ChangeListener listener) {
+ this._changeListener.remove(listener);
+ }
+
+ public ChangeListener[] getChangeListener() {
+ return (ChangeListener[])this._changeListener.toArray();
+ }
+
+ protected void fireChangeEvent() {
+ if (!this._fireingChangeEvent) {
+ this._fireingChangeEvent = true;
+ ChangeEvent event = new ChangeEvent(this);
+ for (ChangeListener cl : this._changeListener) {
+ cl.stateChanged(event);
+ }
+ this._fireingChangeEvent = false;
+ }
+ }
+
+ public void setEnabled(boolean enabled) {
+ this._spinner.setEnabled(enabled);
+ this._button.setEnabled(enabled);
+ }
+
+ public boolean isEnabled() {
+ return this._button.isEnabled();
+ }
+
+ public int getPopupLocation() {
+ return this._popupLocation;
+ }
+
+ public void setPopupLocation(int location) {
+ this._popupLocation = location;
+ }
+
+ public SpinnerDateModel getModel() {
+ return (SpinnerDateModel)this._spinner.getModel();
+ }
+
+ public void setSpinnerDateModel(SpinnerDateModel model) {
+ this._spinner.setModel(model);
+ }
+}
+
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLCheckBox.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLCheckBox.java
new file mode 100755
index 00000000..fcea0da6
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLCheckBox.java
@@ -0,0 +1,130 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.DelegationObject;
+import de.tklsoft.gui.controls.InvalidRule;
+import de.tklsoft.gui.controls.ModifyableComponent;
+import de.tklsoft.gui.controls.StatusHolder;
+import de.tklsoft.gui.layout.Synchronizable;
+import de.tklsoft.gui.layout.Synchronizer;
+import java.awt.Dimension;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+public class TKLCheckBox extends JCheckBox implements ModifyableComponent, Synchronizable {
+
+ private Synchronizer synchronizer;
+ private StatusHolder statusHolder;
+ private boolean oldValue;
+
+
+ public TKLCheckBox(String text, boolean selected) {
+ super(text, selected);
+ this.synchronizer = null;
+ this.oldValue = selected;
+ this.init();
+ }
+
+ public TKLCheckBox() {
+ this("", false);
+ }
+
+ public TKLCheckBox(String text) {
+ this(text, false);
+ }
+
+ private void init() {
+ this.statusHolder = new StatusHolder(this, 13);
+ this.setBorderPainted(true);
+ this.addChangeListener(new ChangeListener() {
+ public void stateChanged(ChangeEvent ce) {
+ TKLCheckBox.this.fireCheckRules();
+ }
+ });
+ this.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ DelegationObject.notifyPapas(TKLCheckBox.this.getParent(), keyEvent);
+ TKLCheckBox.this.fireCheckRules();
+ }
+ });
+ }
+
+ public void setSynchronizer(Synchronizer synchronizer) {
+ this.synchronizer = synchronizer;
+ }
+
+ public Dimension getPreferredSize() {
+ return this.synchronizer == null?super.getPreferredSize():this.synchronizer.getSize(this);
+ }
+
+ public Dimension getNormalSize() {
+ return super.getPreferredSize();
+ }
+
+ public void addStatusPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ this.statusHolder.addStatusPropertyChangeListener(propertyChangeListener);
+ }
+
+ public void removeStatusPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ this.statusHolder.removeStatusPropertyChangeListener(propertyChangeListener);
+ }
+
+ public void addInvalidRule(InvalidRule rule) {
+ this.statusHolder.addInvalidRule(rule);
+ }
+
+ public void removeInvalidRule(InvalidRule rule) {
+ this.statusHolder.removeInvalidRule(rule);
+ }
+
+ public void ignoreInvalidRules(boolean ignore) {
+ this.statusHolder.ignoreInvalidRules(ignore);
+ }
+
+ public void ignoreStatus(StatusHolder.STATUSFLAG statusFlag, boolean ignore) {
+ this.statusHolder.ignoreStatus(statusFlag, ignore);
+ }
+
+ public void resetValidStatus() {
+ this.statusHolder.resetValidStatus();
+ }
+
+ public void fireCheckRules() {
+ this.statusHolder.fireCheckRules();
+ }
+
+ public boolean isInvalid() {
+ return this.statusHolder.isInvalid();
+ }
+
+ public Object getOldValue() {
+ return new Boolean(this.oldValue);
+ }
+
+ public void confirmNewValue() {
+ this.oldValue = this.isSelected();
+ this.statusHolder.fireCheckRules();
+ }
+
+ public JComponent getComponent() {
+ return this;
+ }
+
+ public boolean isDirty() {
+ return this.oldValue != this.isSelected();
+ }
+
+ public void resetToOldValue() {
+ this.setSelected(this.oldValue);
+ }
+
+ public void disableDirtyComponent(boolean disable) {
+ this.statusHolder.ignoreStatus(StatusHolder.STATUSFLAG.MODIFIED, disable);
+ this.statusHolder.fireCheckRules();
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLComboBox.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLComboBox.java
new file mode 100755
index 00000000..78a8577d
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLComboBox.java
@@ -0,0 +1,153 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.DelegationObject;
+import de.tklsoft.gui.controls.InvalidRule;
+import de.tklsoft.gui.controls.ModifyableComponent;
+import de.tklsoft.gui.controls.StatusHolder;
+import de.tklsoft.gui.layout.Synchronizable;
+import de.tklsoft.gui.layout.Synchronizer;
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+
+public class TKLComboBox extends JComboBox implements ModifyableComponent, Synchronizable {
+
+ private Synchronizer synchronizer;
+ private StatusHolder statusHolder;
+ private Object oldValue;
+
+
+ public TKLComboBox(Object[] data) {
+ super(data);
+ this.synchronizer = null;
+ this.oldValue = null;
+ this.init();
+ }
+
+ public TKLComboBox() {
+ this(new Object[0]);
+ }
+
+ private void init() {
+ this.statusHolder = new StatusHolder(this, -1);
+ this.addItemListener(new ItemListener() {
+ public void itemStateChanged(ItemEvent e) {
+ if(e.getStateChange() == 1) {
+ TKLComboBox.this.fireCheckRules();
+ }
+
+ }
+ });
+ this.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ DelegationObject.notifyPapas(TKLComboBox.this.getParent(), keyEvent);
+ }
+ });
+ }
+
+ public void setSelectedItem(Object anObject, boolean ignoreInvalidRules) {
+ if(ignoreInvalidRules && !this.statusHolder.shouldIgnoreInvalidRules()) {
+ this.ignoreInvalidRules(true);
+ super.setSelectedItem(anObject);
+ this.ignoreInvalidRules(false);
+ } else {
+ super.setSelectedItem(anObject);
+ }
+
+ }
+
+ public void setSelectedItem(Object anObject) {
+ this.setSelectedItem(anObject, false);
+ }
+
+ public void addItem(Object anObject) {
+ if(this.statusHolder.shouldIgnoreInvalidRules()) {
+ super.addItem(anObject);
+ } else {
+ this.ignoreInvalidRules(true);
+ super.addItem(anObject);
+ this.ignoreInvalidRules(false);
+ }
+
+ }
+
+ public void addStatusPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ this.statusHolder.addStatusPropertyChangeListener(propertyChangeListener);
+ }
+
+ public void removeStatusPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ this.statusHolder.removeStatusPropertyChangeListener(propertyChangeListener);
+ }
+
+ public void addInvalidRule(InvalidRule rule) {
+ this.statusHolder.addInvalidRule(rule);
+ }
+
+ public void removeInvalidRule(InvalidRule rule) {
+ this.statusHolder.removeInvalidRule(rule);
+ }
+
+ public void ignoreInvalidRules(boolean ignore) {
+ this.statusHolder.ignoreInvalidRules(ignore);
+ }
+
+ public void ignoreStatus(StatusHolder.STATUSFLAG statusFlag, boolean ignore) {
+ this.statusHolder.ignoreStatus(statusFlag, ignore);
+ }
+
+ public void resetValidStatus() {
+ this.statusHolder.resetValidStatus();
+ }
+
+ public void fireCheckRules() {
+ this.statusHolder.fireCheckRules();
+ }
+
+ public boolean isInvalid() {
+ return this.statusHolder.isInvalid();
+ }
+
+ public void setSynchronizer(Synchronizer synchronizer) {
+ this.synchronizer = synchronizer;
+ }
+
+ public Dimension getPreferredSize() {
+ return this.synchronizer == null?super.getPreferredSize():this.synchronizer.getSize(this);
+ }
+
+ public Dimension getNormalSize() {
+ return super.getPreferredSize();
+ }
+
+ public Object getOldValue() {
+ return this.oldValue;
+ }
+
+ public void confirmNewValue() {
+ this.oldValue = this.getSelectedItem();
+ this.statusHolder.fireCheckRules();
+ }
+
+ public JComponent getComponent() {
+ return this;
+ }
+
+ public boolean isDirty() {
+ return this.oldValue != this.getSelectedItem();
+ }
+
+ public void resetToOldValue() {
+ this.setSelectedItem(this.oldValue);
+ }
+
+ public void disableDirtyComponent(boolean disable) {
+ this.statusHolder.ignoreStatus(StatusHolder.STATUSFLAG.MODIFIED, disable);
+ this.statusHolder.fireCheckRules();
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLDesktopPane.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLDesktopPane.java
new file mode 100755
index 00000000..f2ab7b63
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLDesktopPane.java
@@ -0,0 +1,36 @@
+package de.tklsoft.gui.controls;
+
+import java.awt.Dimension;
+import java.awt.Rectangle;
+import javax.swing.JDesktopPane;
+
+public class TKLDesktopPane extends JDesktopPane {
+
+ private int x = 20;
+ private int xModifier = 0;
+ private int y = 20;
+ private Dimension dim = null;
+ private int width;
+ private int height;
+
+
+ public Rectangle getPreferredPanelRectangle() {
+ if(this.dim == null) {
+ this.dim = this.getSize();
+ this.width = this.dim.width;
+ this.height = this.dim.height;
+ } else {
+ this.dim = this.getSize();
+ }
+
+ if(this.x > this.width / 2 || this.y > this.height / 2) {
+ this.xModifier += 20;
+ this.x = 20 + this.xModifier;
+ this.y = 20;
+ }
+
+ this.x += 30;
+ this.y += 30;
+ return new Rectangle(this.x, this.y, this.width / 3 * 2, this.height / 3 * 2);
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLFloorMainMenu.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLFloorMainMenu.java
new file mode 100755
index 00000000..b25d5301
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLFloorMainMenu.java
@@ -0,0 +1,228 @@
+/*
+ * Decompiled with CFR 0.150.
+ */
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.TKLFloorTab;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.HashMap;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+public class TKLFloorMainMenu {
+ private JButton northButton;
+ private JButton southButton;
+ private MenuPanel menuPanel;
+ private String name;
+ private TKLFloorTab parent;
+
+ public TKLFloorMainMenu(TKLFloorTab parent, String name) {
+ this.name = name.toLowerCase();
+ this.parent = parent;
+ this.northButton = new JButton(name);
+ this.northButton.setBorderPainted(false);
+ this.northButton.setBackground(Color.LIGHT_GRAY);
+ this.southButton = new JButton(name);
+ this.southButton.setBorderPainted(false);
+ this.southButton.setBackground(Color.LIGHT_GRAY);
+ MenuButtonListener actionListener = new MenuButtonListener(name, this);
+ this.northButton.addActionListener(actionListener);
+ this.southButton.addActionListener(actionListener);
+ this.menuPanel = new MenuPanel();
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String newName) {
+ this.northButton.setText(newName);
+ this.southButton.setText(newName);
+ }
+
+ JButton getNorthButton() {
+ return this.northButton;
+ }
+
+ JButton getSouthButton() {
+ return this.southButton;
+ }
+
+ MenuPanel getMenuPanel() {
+ return this.menuPanel;
+ }
+
+ public TklFloorButton addIcon(String name, Icon icon, ActionListener actionListener) {
+ if (this.menuPanel != null) {
+ return this.menuPanel.addButton(name, icon, actionListener);
+ }
+ return null;
+ }
+
+ private class MenuPanel
+ extends JPanel {
+ private GridBagConstraints gridconst = new GridBagConstraints();
+ private int currentMaxY = -1;
+ private HashMap buttons = new HashMap();
+
+ public MenuPanel() {
+ this.setLayout(new GridBagLayout());
+ this.gridconst.anchor = 11;
+ this.gridconst.fill = 2;
+ this.gridconst.insets = new Insets(0, 0, 0, 0);
+ this.gridconst.weightx = 1.0;
+ this.gridconst.weighty = 0.0;
+ this.gridconst.gridx = 0;
+ this.gridconst.weighty = 1.0;
+ this.gridconst.gridy = 251;
+ this.add((Component)new JLabel(), this.gridconst);
+ this.gridconst.weighty = 0.0;
+ }
+
+ void renameButton(String oldValue, String newValue) {
+ ButtonPanel obj = this.buttons.get(oldValue);
+ if (obj != null) {
+ this.buttons.remove(oldValue);
+ this.buttons.put(newValue, obj);
+ }
+ }
+
+ public TklFloorButton addButton(String name, Icon icon, ActionListener actionListener) {
+ if (name == null || name.length() == 0) {
+ throw new RuntimeException("Ung\u00fcltiger Name!");
+ }
+ if (icon == null) {
+ throw new RuntimeException("Ung\u00fcltiges Icon!");
+ }
+ if (actionListener == null) {
+ throw new RuntimeException("Ung\u00fcltiger ActionListener!");
+ }
+ if (this.buttons.containsKey(name.toLowerCase())) {
+ throw new RuntimeException("Buttonname '" + name + "' bereits definiert!");
+ }
+ ButtonPanel buttonPanel = new ButtonPanel(name, icon, actionListener);
+ this.buttons.put(name, buttonPanel);
+ if (this.currentMaxY >= 249) {
+ throw new RuntimeException("Maximal 250 Men\u00fceintr\u00e4ge m\u00f6glich!");
+ }
+ ++this.currentMaxY;
+ this.gridconst.gridy = this.currentMaxY;
+ this.add((Component)buttonPanel, this.gridconst);
+ return new TklFloorButton(this, buttonPanel);
+ }
+ }
+
+ private class MenuButtonListener
+ implements ActionListener {
+ private final String name;
+ private final TKLFloorMainMenu tKLFloorMainMenu;
+
+ public MenuButtonListener(String name, TKLFloorMainMenu tKLFloorMainMenu2) {
+ this.name = name.toLowerCase();
+ this.tKLFloorMainMenu = tKLFloorMainMenu2;
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ TKLFloorMainMenu.this.parent.showMenu(this.tKLFloorMainMenu);
+ }
+ }
+
+ private class ButtonPanel
+ extends JPanel {
+ private JLabel buttonLabel;
+
+ ButtonPanel(String name, Icon icon, ActionListener actionListener) {
+ super(new GridBagLayout());
+ JLabel button = new JLabel(icon);
+ button.setPreferredSize(new Dimension(48, 48));
+ button.setMinimumSize(new Dimension(48, 48));
+ button.addMouseListener(new MouseOverAdapter(actionListener, name));
+ button.setBorder(BorderFactory.createLineBorder(button.getBackground()));
+ GridBagConstraints gridconstint = new GridBagConstraints();
+ gridconstint.anchor = 11;
+ gridconstint.fill = 2;
+ gridconstint.insets = new Insets(10, 5, 0, 5);
+ gridconstint.weightx = 1.0;
+ gridconstint.weighty = 0.0;
+ gridconstint.gridx = 0;
+ this.add((Component)new JLabel(), gridconstint);
+ gridconstint.weightx = 0.0;
+ gridconstint.gridx = 1;
+ this.add((Component)button, gridconstint);
+ gridconstint.gridx = 2;
+ gridconstint.weightx = 1.0;
+ this.add((Component)new JLabel(), gridconstint);
+ gridconstint.weightx = 0.0;
+ gridconstint.gridx = 0;
+ gridconstint.gridy = 1;
+ gridconstint.gridwidth = 3;
+ gridconstint.insets.top = 0;
+ this.buttonLabel = new JLabel(name, 0);
+ this.add((Component)this.buttonLabel, gridconstint);
+ }
+
+ String getButtonText() {
+ return this.buttonLabel.getText();
+ }
+
+ void setButtonText(String newText) {
+ this.buttonLabel.setText(newText);
+ }
+ }
+
+ private class MouseOverAdapter
+ extends MouseAdapter {
+ private ActionListener actionListener;
+ private String name;
+
+ public MouseOverAdapter(ActionListener actionListener, String name) {
+ this.actionListener = actionListener;
+ this.name = name;
+ }
+
+ public void mouseEntered(MouseEvent e) {
+ JLabel source = (JLabel)e.getSource();
+ source.setBorder(BorderFactory.createLineBorder(Color.black));
+ }
+
+ public void mouseClicked(MouseEvent e) {
+ JLabel source = (JLabel)e.getSource();
+ if (this.actionListener != null) {
+ this.actionListener.actionPerformed(new ActionEvent(source, 0, this.name));
+ }
+ }
+
+ public void mouseExited(MouseEvent e) {
+ JLabel source = (JLabel)e.getSource();
+ source.setBorder(BorderFactory.createLineBorder(source.getBackground()));
+ }
+ }
+
+ public class TklFloorButton {
+ private final ButtonPanel buttonPanel;
+ private final MenuPanel parent;
+
+ TklFloorButton(MenuPanel parent, ButtonPanel buttonPanel) {
+ this.buttonPanel = buttonPanel;
+ this.parent = parent;
+ }
+
+ public void setText(String newText) {
+ this.parent.renameButton(this.buttonPanel.getButtonText(), newText);
+ this.buttonPanel.setButtonText(newText);
+ }
+ }
+}
+
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLFloorTab.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLFloorTab.java
new file mode 100755
index 00000000..30173442
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLFloorTab.java
@@ -0,0 +1,107 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.TKLFloorMainMenu;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+
+public class TKLFloorTab extends JPanel {
+
+ private ArrayList buttons = new ArrayList();
+ private JPanel northPanel = new JPanel(new GridBagLayout());
+ private JPanel southPanel = new JPanel(new GridBagLayout());
+ private CardLayout cardLayout = new CardLayout();
+ private JPanel centerPanel;
+ private ArrayList mainMenuButtons;
+ private HashMap yIndizes;
+ private GridBagConstraints constraints;
+ private int maxY;
+
+
+ public TKLFloorTab() {
+ this.centerPanel = new JPanel(this.cardLayout);
+ this.mainMenuButtons = new ArrayList();
+ this.yIndizes = new HashMap();
+ this.constraints = new GridBagConstraints();
+ this.maxY = -1;
+ this.setLayout(new BorderLayout());
+ this.add(this.northPanel, "North");
+ this.add(this.southPanel, "South");
+ this.add(this.centerPanel, "Center");
+ this.constraints.anchor = 11;
+ this.constraints.fill = 1;
+ this.constraints.insets = new Insets(0, 0, 0, 0);
+ this.constraints.weightx = 1.0D;
+ this.constraints.weighty = 0.0D;
+ this.constraints.gridx = 0;
+ }
+
+ public void showMenu(TKLFloorMainMenu tKLFloorMainMenu) {
+ String name = tKLFloorMainMenu.getName();
+ if(name != null && name.length() != 0) {
+ Integer indexTmp = (Integer)this.yIndizes.get(name.toLowerCase());
+ if(indexTmp != null) {
+ int index = indexTmp.intValue();
+
+ for(int i = 0; i < this.yIndizes.size(); ++i) {
+ JButton northButton = ((TKLFloorMainMenu)this.mainMenuButtons.get(i)).getNorthButton();
+ northButton.setSelected(false);
+ JButton southButton = ((TKLFloorMainMenu)this.mainMenuButtons.get(i)).getSouthButton();
+ southButton.setSelected(false);
+ if(i <= index) {
+ northButton.setVisible(true);
+ if(i != index) {
+ northButton.setBackground(Color.LIGHT_GRAY);
+ } else {
+ northButton.setBackground(Color.WHITE);
+ }
+
+ southButton.setVisible(false);
+ } else {
+ northButton.setVisible(false);
+ southButton.setVisible(true);
+ }
+ }
+
+ this.cardLayout.show(this.centerPanel, name.toLowerCase());
+ }
+
+ }
+ }
+
+ public void addMenu(TKLFloorMainMenu tKLFloorMainMenu) {
+ String name = tKLFloorMainMenu.getName();
+ int size = this.mainMenuButtons.size();
+ Iterator northButton = this.mainMenuButtons.iterator();
+
+ TKLFloorMainMenu southButton;
+ do {
+ if(!northButton.hasNext()) {
+ JButton northButton1 = tKLFloorMainMenu.getNorthButton();
+ JButton southButton1 = tKLFloorMainMenu.getSouthButton();
+ ++this.maxY;
+ this.constraints.gridy = this.maxY;
+ northButton1.setVisible(false);
+ this.northPanel.add(northButton1, this.constraints);
+ this.southPanel.add(southButton1, this.constraints);
+ northButton1.setVisible(false);
+ this.mainMenuButtons.add(tKLFloorMainMenu);
+ this.yIndizes.put(name.toLowerCase(), new Integer(this.maxY));
+ this.centerPanel.add(name.toLowerCase(), tKLFloorMainMenu.getMenuPanel());
+ return;
+ }
+
+ southButton = (TKLFloorMainMenu)northButton.next();
+ } while(!southButton.getName().equalsIgnoreCase(name));
+
+ throw new RuntimeException("Menüname \'" + name + "\' bereits definiert!");
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLFrame.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLFrame.java
new file mode 100755
index 00000000..3c24a76d
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLFrame.java
@@ -0,0 +1,39 @@
+package de.tklsoft.gui.controls;
+
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import javax.swing.JFrame;
+
+public class TKLFrame extends JFrame {
+
+ private WindowListener closeWindowListener;
+
+
+ public TKLFrame() {
+ this("");
+ }
+
+ public TKLFrame(String title) {
+ super(title);
+ this.closeWindowListener = new WindowAdapter() {
+ public void windowClosing(WindowEvent e) {
+ TKLFrame.this.closeFrame(0);
+ }
+ };
+ this.addWindowListener(this.closeWindowListener);
+ }
+
+ protected void closeFrame(int i) {
+ System.exit(i);
+ }
+
+ public void enableCloseWindowListener(boolean enable) {
+ if(enable) {
+ this.addWindowListener(this.closeWindowListener);
+ } else {
+ this.removeWindowListener(this.closeWindowListener);
+ }
+
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLLabel.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLLabel.java
new file mode 100755
index 00000000..ca7d93d3
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLLabel.java
@@ -0,0 +1,41 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.DelegationObject;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JLabel;
+
+public class TKLLabel extends JLabel {
+
+ public TKLLabel(String text, Icon image) {
+ super(text, image, 0);
+ this.init();
+ }
+
+ public TKLLabel(String text) {
+ this(text, (Icon)null);
+ }
+
+ public TKLLabel(Icon image) {
+ this("", image);
+ }
+
+ public TKLLabel() {
+ this("", (Icon)null);
+ }
+
+ private void init() {
+ this.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ DelegationObject.notifyPapas(TKLLabel.this.getParent(), keyEvent);
+ }
+ });
+ }
+
+ public void enableBorder() {
+ this.setBorder(BorderFactory.createEtchedBorder());
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLPanel.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLPanel.java
new file mode 100755
index 00000000..258bcf31
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLPanel.java
@@ -0,0 +1,13 @@
+package de.tklsoft.gui.controls;
+
+import java.awt.LayoutManager;
+import javax.swing.JPanel;
+
+public class TKLPanel extends JPanel {
+
+ public TKLPanel() {}
+
+ public TKLPanel(LayoutManager layoutManager) {
+ super(layoutManager);
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLPasswordField.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLPasswordField.java
new file mode 100755
index 00000000..275f48f1
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLPasswordField.java
@@ -0,0 +1,50 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.DelegationObject;
+import de.tklsoft.gui.layout.Synchronizable;
+import de.tklsoft.gui.layout.Synchronizer;
+import java.awt.Dimension;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import javax.swing.JPasswordField;
+
+public class TKLPasswordField extends JPasswordField implements Synchronizable {
+
+ private Synchronizer synchronizer = null;
+ private boolean dirty = false;
+
+
+ public TKLPasswordField() {
+ this.init();
+ }
+
+ public boolean isDirty() {
+ return this.dirty;
+ }
+
+ public void resetDirtyFlag() {
+ this.dirty = false;
+ }
+
+ private void init() {
+ this.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ TKLPasswordField.this.dirty = true;
+ DelegationObject.notifyPapas(TKLPasswordField.this.getParent(), keyEvent);
+ }
+ });
+ }
+
+ public void setSynchronizer(Synchronizer synchronizer) {
+ this.synchronizer = synchronizer;
+ }
+
+ public Dimension getPreferredSize() {
+ return this.synchronizer == null?super.getPreferredSize():this.synchronizer.getSize(this);
+ }
+
+ public Dimension getNormalSize() {
+ return super.getPreferredSize();
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLRadioButton.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLRadioButton.java
new file mode 100755
index 00000000..dddd43dc
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLRadioButton.java
@@ -0,0 +1,23 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.DelegationObject;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import javax.swing.JRadioButton;
+
+public class TKLRadioButton extends JRadioButton {
+
+ public TKLRadioButton(String schluesselname) {
+ super(schluesselname);
+ this.init();
+ }
+
+ private void init() {
+ this.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ DelegationObject.notifyPapas(TKLRadioButton.this.getParent(), keyEvent);
+ }
+ });
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLSlider.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLSlider.java
new file mode 100755
index 00000000..f9111bf1
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLSlider.java
@@ -0,0 +1,23 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.DelegationObject;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import javax.swing.JSlider;
+
+public class TKLSlider extends JSlider {
+
+ public TKLSlider(int min, int max, int value) {
+ super(min, max, value);
+ this.init();
+ }
+
+ private void init() {
+ this.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ DelegationObject.notifyPapas(TKLSlider.this.getParent(), keyEvent);
+ }
+ });
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLTable.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLTable.java
new file mode 100755
index 00000000..07053118
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLTable.java
@@ -0,0 +1,28 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.DelegationObject;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import javax.swing.JTable;
+import javax.swing.table.TableModel;
+
+public class TKLTable extends JTable {
+
+ public TKLTable() {
+ this.init();
+ }
+
+ public TKLTable(TableModel tableModel) {
+ super(tableModel);
+ this.init();
+ }
+
+ private void init() {
+ this.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ DelegationObject.notifyPapas(TKLTable.this.getParent(), keyEvent);
+ }
+ });
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLTextArea.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLTextArea.java
new file mode 100755
index 00000000..c15b3b79
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLTextArea.java
@@ -0,0 +1,32 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.controls.DelegationObject;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import javax.swing.BorderFactory;
+import javax.swing.JTextArea;
+
+public class TKLTextArea extends JTextArea {
+
+ public TKLTextArea(String text) {
+ super(text);
+ this.init();
+ }
+
+ public TKLTextArea() {
+ this("");
+ }
+
+ private void init() {
+ this.addKeyListener(new KeyAdapter() {
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ DelegationObject.notifyPapas(TKLTextArea.this.getParent(), keyEvent);
+ }
+ });
+ }
+
+ public void enableBorder() {
+ this.setBorder(BorderFactory.createEtchedBorder());
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLTextField.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLTextField.java
new file mode 100755
index 00000000..5a2089fd
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/TKLTextField.java
@@ -0,0 +1,126 @@
+package de.tklsoft.gui.controls;
+
+import de.tklsoft.gui.layout.Synchronizable;
+import de.tklsoft.gui.layout.Synchronizer;
+import java.awt.Dimension;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.JComponent;
+import javax.swing.JTextField;
+import javax.swing.KeyStroke;
+
+public class TKLTextField extends JTextField implements ModifyableComponent, Synchronizable {
+
+ private Synchronizer synchronizer = null;
+ private StatusHolder statusHolder;
+ private String oldValue = "";
+
+
+ public TKLTextField() {
+ this.init();
+ }
+
+ public TKLTextField(int columncount) {
+ super(columncount);
+ this.init();
+ }
+
+ public TKLTextField(String text) {
+ super(text);
+ this.oldValue = text;
+ this.init();
+ }
+
+ private void init() {
+ KeyStroke undo = KeyStroke.getKeyStroke(90, 2);
+ this.statusHolder = new StatusHolder(this, -1);
+ this.addKeyListener(new KeyAdapter() {
+ public void keyPressed(KeyEvent e) {
+ if(e.isControlDown() && e.getKeyCode() == 90) {
+ TKLTextField.this.setText(TKLTextField.this.oldValue);
+ }
+
+ }
+ public void keyReleased(KeyEvent keyEvent) {
+ super.keyReleased(keyEvent);
+ DelegationObject.notifyPapas(TKLTextField.this.getParent(), keyEvent);
+ TKLTextField.this.fireCheckRules();
+ }
+ });
+ }
+
+ public void addStatusPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ this.statusHolder.addStatusPropertyChangeListener(propertyChangeListener);
+ }
+
+ public void removeStatusPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ this.statusHolder.removeStatusPropertyChangeListener(propertyChangeListener);
+ }
+
+ public void addInvalidRule(InvalidRule rule) {
+ this.statusHolder.addInvalidRule(rule);
+ }
+
+ public void removeInvalidRule(InvalidRule rule) {
+ this.statusHolder.removeInvalidRule(rule);
+ }
+
+ public void ignoreInvalidRules(boolean ignore) {
+ this.statusHolder.ignoreInvalidRules(ignore);
+ }
+
+ public void ignoreStatus(StatusHolder.STATUSFLAG statusFlag, boolean ignore) {
+ this.statusHolder.ignoreStatus(statusFlag, ignore);
+ }
+
+ public void resetValidStatus() {
+ this.statusHolder.resetValidStatus();
+ }
+
+ public void fireCheckRules() {
+ this.statusHolder.fireCheckRules();
+ }
+
+ public boolean isInvalid() {
+ return this.statusHolder.isInvalid();
+ }
+
+ public void setSynchronizer(Synchronizer synchronizer) {
+ this.synchronizer = synchronizer;
+ }
+
+ public Dimension getPreferredSize() {
+ return this.synchronizer == null?super.getPreferredSize():this.synchronizer.getSize(this);
+ }
+
+ public Dimension getNormalSize() {
+ return super.getPreferredSize();
+ }
+
+ public Object getOldValue() {
+ return this.oldValue;
+ }
+
+ public void confirmNewValue() {
+ this.oldValue = this.getText();
+ this.statusHolder.fireCheckRules();
+ }
+
+ public void resetToOldValue() {
+ this.setText(this.oldValue);
+ }
+
+ public JComponent getComponent() {
+ return this;
+ }
+
+ public boolean isDirty() {
+ return !this.oldValue.equals(this.getText());
+ }
+
+ public void disableDirtyComponent(boolean disable) {
+ this.statusHolder.ignoreStatus(StatusHolder.STATUSFLAG.MODIFIED, disable);
+ this.statusHolder.fireCheckRules();
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/border/ModifyableComponentBorder.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/border/ModifyableComponentBorder.java
new file mode 100755
index 00000000..9fcd2795
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/border/ModifyableComponentBorder.java
@@ -0,0 +1,118 @@
+/*
+ * Decompiled with CFR 0.150.
+ */
+package de.tklsoft.gui.controls.border;
+
+import de.tklsoft.gui.controls.StatusHolder;
+import de.tklsoft.icon.IconManager;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.Timer;
+import javax.swing.border.AbstractBorder;
+import javax.swing.border.Border;
+
+public class ModifyableComponentBorder
+ extends AbstractBorder
+ implements PropertyChangeListener {
+ public static final String BORDER_STATUS_CHANGED = "border";
+ private static Icon invalidIcon = IconManager.getInstance().getIcon("border_invalid");
+ private final JComponent parentComponent;
+ private final Insets insets;
+ private int[] colors = new int[]{255, 0, 0};
+ private Color currentColor = new Color(this.colors[0], this.colors[1], this.colors[2]);
+ private Border notDirtyBorder;
+ private int increment = 20;
+ private Timer timer;
+ private StatusHolder.STATUSFLAG status = StatusHolder.STATUSFLAG.NORMAL;
+ private Color modifiedColor = Color.BLUE;
+ private final int borderWidth;
+ private boolean hasToEnableBorder = false;
+
+ public ModifyableComponentBorder(JComponent parentComponent, int borderWidth) {
+ this.parentComponent = parentComponent;
+ this.borderWidth = borderWidth;
+ this.notDirtyBorder = parentComponent.getBorder();
+ if (this.notDirtyBorder != null) {
+ this.insets = this.notDirtyBorder.getBorderInsets(parentComponent);
+ this.hasToEnableBorder = true;
+ } else {
+ this.notDirtyBorder = BorderFactory.createLineBorder(parentComponent.getBackground(), 2);
+ this.insets = new Insets(1, 1, 1, 1);
+ }
+ this.init();
+ }
+
+ public ModifyableComponentBorder(JComponent parentComponent) {
+ this(parentComponent, -1);
+ }
+
+ private void init() {
+ this.timer = new Timer(100, new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+ if (ModifyableComponentBorder.this.parentComponent.isShowing()) {
+ ModifyableComponentBorder.this.currentColor = new Color(ModifyableComponentBorder.this.colors[0], ModifyableComponentBorder.this.colors[1], ModifyableComponentBorder.this.colors[2]);
+ int[] arrn = ModifyableComponentBorder.this.colors;
+ arrn[1] = arrn[1] + ModifyableComponentBorder.this.increment;
+ int[] arrn2 = ModifyableComponentBorder.this.colors;
+ arrn2[2] = arrn2[2] + ModifyableComponentBorder.this.increment;
+ if (ModifyableComponentBorder.this.colors[1] >= 240 || ModifyableComponentBorder.this.colors[1] == 0) {
+ ModifyableComponentBorder.this.increment = -ModifyableComponentBorder.this.increment;
+ }
+ ModifyableComponentBorder.this.parentComponent.repaint();
+ }
+ }
+ });
+ }
+
+ public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+ if (this.status == StatusHolder.STATUSFLAG.NORMAL) {
+ this.notDirtyBorder.paintBorder(c, g, x, y, width, height);
+ } else if (this.status == StatusHolder.STATUSFLAG.MODIFIED) {
+ this.drawBorder(this.modifiedColor, g, x, y, this.borderWidth == -1 ? width : this.borderWidth, height);
+ } else {
+ this.drawBorder(this.currentColor, g, x, y, this.borderWidth == -1 ? width : this.borderWidth, height);
+ invalidIcon.paintIcon(c, g, width - invalidIcon.getIconWidth() - this.insets.right - 2, this.insets.top + 2);
+ }
+ }
+
+ private void drawBorder(Color color, Graphics g, int x, int y, int width, int height) {
+ Color tmpcolor = g.getColor();
+ g.setColor(color);
+ g.drawRect(x, y, width - 1, height - 1);
+ g.drawRect(x + 1, y + 1, width - 3, height - 3);
+ g.setColor(tmpcolor);
+ }
+
+ public Insets getBorderInsets(Component c) {
+ if (this.status == StatusHolder.STATUSFLAG.NORMAL) {
+ return this.notDirtyBorder.getBorderInsets(c);
+ }
+ if (this.status == StatusHolder.STATUSFLAG.MODIFIED) {
+ return this.insets;
+ }
+ return this.insets;
+ }
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (evt.getSource() == this.parentComponent && evt.getPropertyName().equals(BORDER_STATUS_CHANGED)) {
+ this.status = (StatusHolder.STATUSFLAG)((Object)evt.getNewValue());
+ if (this.status == StatusHolder.STATUSFLAG.INVALID && !this.timer.isRunning()) {
+ this.timer.start();
+ } else if (this.status != StatusHolder.STATUSFLAG.INVALID && this.timer.isRunning()) {
+ this.timer.stop();
+ }
+ this.parentComponent.repaint();
+ }
+ }
+}
+
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/DayLabel.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/DayLabel.java
new file mode 100755
index 00000000..377d345d
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/DayLabel.java
@@ -0,0 +1,63 @@
+package de.tklsoft.gui.controls.calendar;
+
+import de.tklsoft.gui.controls.calendar.FlatButton;
+import de.tklsoft.gui.controls.calendar.JMonthPanel;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.BorderFactory;
+import javax.swing.border.Border;
+
+public class DayLabel extends FlatButton implements ActionListener {
+
+ private boolean _today;
+ private JMonthPanel _monthPanel;
+ private int _day;
+ private boolean _selected = false;
+
+
+ public DayLabel(int day, boolean today, JMonthPanel monthPanel) {
+ super(Integer.toString(day));
+ this._today = today;
+ if(this._today) {
+ super.setBorder(BorderFactory.createEtchedBorder());
+ }
+
+ this.setBackground(JMonthPanel.BACKGROUND_COLOR);
+ this.addActionListener(this);
+ this._day = day;
+ this._monthPanel = monthPanel;
+ this.setHorizontalAlignment(4);
+ }
+
+ public void setBorder(Border border) {
+ if(this._today) {
+ super.setBorder(BorderFactory.createEtchedBorder());
+ } else {
+ super.setBorder(border);
+ }
+
+ }
+
+ public void setSelected(boolean selected) {
+ this._selected = selected;
+ if(this._selected) {
+ this.setOpaque(true);
+ this.setBackground(JMonthPanel.SELECTED_BACKGROUND_COLOR);
+ this.setForeground(JMonthPanel.SELECTED_FONT_COLOR);
+ } else {
+ this.setOpaque(false);
+ this.setBackground(JMonthPanel.BACKGROUND_COLOR);
+ this.setForeground(JMonthPanel.FONT_COLOR);
+ }
+
+ }
+
+ public boolean isSelected() {
+ return this._selected;
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ this._monthPanel.setSelectedDayOfMonth(this._day);
+ this.requestFocus();
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/FlatButton.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/FlatButton.java
new file mode 100755
index 00000000..e7af62a6
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/FlatButton.java
@@ -0,0 +1,52 @@
+package de.tklsoft.gui.controls.calendar;
+
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.UIManager;
+import javax.swing.border.Border;
+
+public class FlatButton extends JButton implements FocusListener, MouseListener {
+
+ private Border _focus = BorderFactory.createEtchedBorder();
+ private Border _withoutfocus = BorderFactory.createEmptyBorder(2, 2, 2, 2);
+
+
+ public FlatButton(String text) {
+ super(text);
+ this.setBorder(this._withoutfocus);
+ if(UIManager.getLookAndFeel().getClass().toString().startsWith("class com.jgoodies")) {
+ this.setOpaque(false);
+ } else {
+ this.setContentAreaFilled(false);
+ }
+
+ this.addFocusListener(this);
+ this.addMouseListener(this);
+ }
+
+ public void focusGained(FocusEvent e) {
+ this.setBorder(this._focus);
+ }
+
+ public void focusLost(FocusEvent e) {
+ this.setBorder(this._withoutfocus);
+ }
+
+ public void mouseClicked(MouseEvent e) {}
+
+ public void mouseEntered(MouseEvent e) {
+ this.setBorder(this._focus);
+ }
+
+ public void mouseExited(MouseEvent e) {
+ this.setBorder(this._withoutfocus);
+ }
+
+ public void mousePressed(MouseEvent e) {}
+
+ public void mouseReleased(MouseEvent e) {}
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/JCalendarDialog.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/JCalendarDialog.java
new file mode 100755
index 00000000..ff2b412f
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/JCalendarDialog.java
@@ -0,0 +1,78 @@
+package de.tklsoft.gui.controls.calendar;
+
+import de.tklsoft.gui.controls.TKLCalendarComboBox;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.util.Calendar;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+public class JCalendarDialog {
+
+ private Component _parentComponent;
+ private String _title;
+ private String _message;
+ private TKLCalendarComboBox _calendarBox;
+ private int _optionType;
+ private int _messageType;
+
+
+ public JCalendarDialog(Component parentComponent, String title, String message) {
+ this._parentComponent = parentComponent;
+ this._title = title;
+ this._message = message;
+ this._calendarBox = new TKLCalendarComboBox();
+ this._optionType = 2;
+ this._messageType = 3;
+ }
+
+ public JCalendarDialog(Component parentComponent, String title, String message, TKLCalendarComboBox calendarBox) {
+ this._parentComponent = parentComponent;
+ this._title = title;
+ this._message = message;
+ this._calendarBox = calendarBox;
+ this._optionType = 2;
+ this._messageType = 3;
+ }
+
+ public JCalendarDialog(Component parentComponent, String title, String message, TKLCalendarComboBox calendarBox, int optionType, int messageType) {
+ this._parentComponent = parentComponent;
+ this._title = title;
+ this._message = message;
+ this._calendarBox = calendarBox;
+ this._optionType = optionType;
+ this._messageType = messageType;
+ }
+
+ public JCalendarDialog(Component parentComponent, String title, String message, int optionType, int messageType) {
+ this._parentComponent = parentComponent;
+ this._title = title;
+ this._message = message;
+ this._optionType = optionType;
+ this._messageType = messageType;
+ this._calendarBox = new TKLCalendarComboBox();
+ }
+
+ public Calendar getCalendar() {
+ return this.getCalendar(0);
+ }
+
+ public Calendar getCalendar(int messageOption) {
+ return this.showConfirmDialog() == messageOption?this._calendarBox.getCalendar():null;
+ }
+
+ private int showConfirmDialog() {
+ new JTextField();
+ JPanel calPanel = new JPanel();
+ FlowLayout layout = new FlowLayout();
+ layout.setAlignment(0);
+ layout.setHgap(0);
+ layout.setVgap(0);
+ calPanel.setLayout(layout);
+ calPanel.add(this._calendarBox);
+ Object[] msg = new Object[]{this._message, calPanel};
+ int result = JOptionPane.showConfirmDialog(this._parentComponent, msg, this._title, this._optionType, this._messageType);
+ return result;
+ }
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/JCalendarPanel.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/JCalendarPanel.java
new file mode 100755
index 00000000..549a3ca2
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/JCalendarPanel.java
@@ -0,0 +1,315 @@
+/*
+ * Decompiled with CFR 0.150.
+ */
+package de.tklsoft.gui.controls.calendar;
+
+import de.tklsoft.gui.controls.calendar.FlatButton;
+import de.tklsoft.gui.controls.calendar.JMonthPanel;
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Locale;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+public class JCalendarPanel
+ extends JPanel
+ implements ItemListener,
+ ChangeListener {
+ public static final int FIRE_EVERYTIME = 1;
+ public static final int FIRE_DAYCHANGES = 2;
+ private int _listenermode = 1;
+ private boolean _updating = false;
+ private Calendar _cal;
+ private DateFormat _format;
+ private Locale _locale;
+ private JComboBox _month;
+ private JComboBox _year;
+ private JMonthPanel _monthPanel;
+ private ArrayList _changeListener = new ArrayList();
+ private boolean _fireingChangeEvent = false;
+
+ public JCalendarPanel() {
+ this.createGUI(Calendar.getInstance(), Locale.getDefault(), DateFormat.getDateInstance(2, Locale.getDefault()), true);
+ }
+
+ public JCalendarPanel(Calendar cal) {
+ this.createGUI(cal, Locale.getDefault(), DateFormat.getDateInstance(2, Locale.getDefault()), true);
+ }
+
+ public JCalendarPanel(Locale locale) {
+ this.createGUI(Calendar.getInstance(locale), locale, DateFormat.getDateInstance(2, locale), true);
+ }
+
+ public JCalendarPanel(Calendar cal, Locale locale) {
+ this.createGUI(cal, locale, DateFormat.getDateInstance(2, locale), true);
+ }
+
+ public JCalendarPanel(Calendar cal, Locale locale, DateFormat dateFormat) {
+ this.createGUI(cal, locale, dateFormat, true);
+ }
+
+ public JCalendarPanel(Calendar cal, Locale locale, DateFormat dateFormat, boolean flat) {
+ this.createGUI(cal, locale, dateFormat, flat);
+ }
+
+ private void createGUI(Calendar cal, Locale locale, DateFormat dateFormat, boolean flat) {
+ this._locale = locale;
+ this._cal = Calendar.getInstance(locale);
+ this._cal.set(5, cal.get(5));
+ this._cal.set(2, cal.get(2));
+ this._cal.set(1, cal.get(1));
+ this._format = dateFormat;
+ this.setLayout(new GridBagLayout());
+ GridBagConstraints c = new GridBagConstraints();
+ this._month = this.createMonth();
+ this._month.addItemListener(this);
+ this.add((Component)this._month, c);
+ this._year = this.createYear();
+ this._year.addItemListener(this);
+ c.gridwidth = 0;
+ this.add((Component)this._year, c);
+ c.anchor = 10;
+ c.fill = 1;
+ c.insets = new Insets(1, 1, 1, 1);
+ this._monthPanel = new JMonthPanel(this._cal, this._locale);
+ this._monthPanel.addChangeListener(this);
+ this.add((Component)this._monthPanel, c);
+ c.insets = new Insets(0, 0, 1, 0);
+ this.add((Component)this.createButtonPanel(flat), c);
+ this._monthPanel.grabFocus();
+ }
+
+ private JPanel createButtonPanel(boolean flat) {
+ JButton yearRight;
+ JButton dayRight;
+ JButton today;
+ JButton dayLeft;
+ JButton yearLeft;
+ JPanel buttonpanel = new JPanel();
+ if (flat) {
+ yearLeft = new FlatButton("<<");
+ dayLeft = new FlatButton("<");
+ today = new FlatButton("Heute");
+ dayRight = new FlatButton(">");
+ yearRight = new FlatButton(">>");
+ } else {
+ yearLeft = new JButton("<<");
+ yearLeft.setMargin(new Insets(1, 1, 1, 1));
+ dayLeft = new JButton("<");
+ dayLeft.setMargin(new Insets(1, 1, 1, 1));
+ today = new JButton("Heute");
+ today.setMargin(new Insets(2, 2, 2, 2));
+ dayRight = new JButton(">");
+ dayRight.setMargin(new Insets(1, 1, 1, 1));
+ yearRight = new JButton(">>");
+ yearRight.setMargin(new Insets(1, 1, 1, 1));
+ }
+ buttonpanel.setLayout(new GridBagLayout());
+ GridBagConstraints c = new GridBagConstraints();
+ c.fill = 0;
+ c.insets = new Insets(0, 0, 0, 5);
+ yearLeft.setMargin(new Insets(1, 1, 1, 1));
+ yearLeft.setToolTipText("Letztes Jahr");
+ yearLeft.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+ if (JCalendarPanel.this._year.getSelectedIndex() > 0) {
+ int month = JCalendarPanel.this._cal.get(2);
+ JCalendarPanel.this._cal.set(1, JCalendarPanel.this._cal.get(1) - 1);
+ if (JCalendarPanel.this._cal.get(2) != month) {
+ JCalendarPanel.this._cal.set(2, month);
+ }
+ JCalendarPanel.this.setCalendar(JCalendarPanel.this._cal);
+ }
+ }
+ });
+ buttonpanel.add((Component)yearLeft, c);
+ dayLeft.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+ int monthIndex = JCalendarPanel.this._cal.get(2);
+ JCalendarPanel.this._cal.set(2, monthIndex - 1);
+ if (JCalendarPanel.this._cal.get(2) == monthIndex) {
+ JCalendarPanel.this._cal.set(5, 0);
+ }
+ JCalendarPanel.this.setCalendar(JCalendarPanel.this._cal);
+ }
+ });
+ dayLeft.setMargin(new Insets(1, 1, 1, 1));
+ dayLeft.setToolTipText("N\u00e4chstes Jahr");
+ buttonpanel.add((Component)dayLeft, c);
+ GridBagConstraints c2 = new GridBagConstraints();
+ c2.fill = 2;
+ c2.weightx = 1.0;
+ today.setMargin(new Insets(2, 2, 2, 2));
+ today.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+ JCalendarPanel.this.setCalendar(Calendar.getInstance());
+ }
+ });
+ buttonpanel.add((Component)today, c2);
+ c.insets = new Insets(0, 5, 0, 0);
+ dayRight.setMargin(new Insets(1, 1, 1, 1));
+ dayRight.setToolTipText("N\u00e4chster Monate");
+ dayRight.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+ int monthIndex = JCalendarPanel.this._cal.get(2);
+ JCalendarPanel.this._cal.set(2, monthIndex + 1);
+ if (JCalendarPanel.this._cal.get(2) != (monthIndex + 1) % 12) {
+ JCalendarPanel.this._cal.set(5, 0);
+ }
+ JCalendarPanel.this.setCalendar(JCalendarPanel.this._cal);
+ }
+ });
+ buttonpanel.add((Component)dayRight, c);
+ yearRight.setMargin(new Insets(1, 1, 1, 1));
+ yearRight.setToolTipText("N\u00e4chstes Jahr");
+ yearRight.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+ if (JCalendarPanel.this._year.getSelectedIndex() < JCalendarPanel.this._year.getItemCount() - 1) {
+ int month = JCalendarPanel.this._cal.get(2);
+ JCalendarPanel.this._cal.set(1, JCalendarPanel.this._cal.get(1) + 1);
+ if (JCalendarPanel.this._cal.get(2) != month) {
+ JCalendarPanel.this._cal.set(2, month);
+ }
+ JCalendarPanel.this.setCalendar(JCalendarPanel.this._cal);
+ }
+ }
+ });
+ buttonpanel.add((Component)yearRight, c);
+ return buttonpanel;
+ }
+
+ private JComboBox createYear() {
+ JComboBox year = new JComboBox();
+ for (int i = 1900; i <= 2100; ++i) {
+ year.addItem("" + i);
+ }
+ year.setSelectedIndex(this._cal.get(1) - 1900);
+ return year;
+ }
+
+ private JComboBox createMonth() {
+ JComboBox month = new JComboBox();
+ SimpleDateFormat format = new SimpleDateFormat("MMMMM", this._locale);
+ Calendar currentCal = Calendar.getInstance(this._locale);
+ currentCal.set(5, 1);
+ for (int i = 0; i < 12; ++i) {
+ currentCal.set(2, i);
+ currentCal.set(1, this._cal.get(1));
+ String myString = format.format(currentCal.getTime());
+ month.addItem(myString);
+ }
+ month.setSelectedIndex(this._cal.get(2));
+ return month;
+ }
+
+ private void updateCalendar() {
+ if (!this._updating) {
+ this._updating = true;
+ this._cal.set(2, this._month.getSelectedIndex());
+ this._cal.set(1, this._year.getSelectedIndex() + 1900);
+ this._cal.set(5, this._monthPanel.getSelectedDayOfMonth());
+ this._monthPanel.setCalendar(this._cal);
+ this._monthPanel.grabFocus();
+ this._updating = false;
+ }
+ }
+
+ public Calendar getCalendar() {
+ this.updateCalendar();
+ return this._cal;
+ }
+
+ public void setCalendar(Calendar cal) {
+ this._updating = true;
+ this._cal.set(5, cal.get(5));
+ this._cal.set(2, cal.get(2));
+ this._cal.set(1, cal.get(1));
+ this._monthPanel.setCalendar(this._cal);
+ this._year.setSelectedIndex(this._cal.get(1) - 1900);
+ this._month.setSelectedIndex(this._cal.get(2));
+ this._monthPanel.grabFocus();
+ this._updating = false;
+ }
+
+ public String toString() {
+ this.updateCalendar();
+ return this._format.format(this._cal.getTime());
+ }
+
+ public String toString(DateFormat format) {
+ this.updateCalendar();
+ return format.format(this._cal.getTime());
+ }
+
+ public void itemStateChanged(ItemEvent e) {
+ this.updateCalendar();
+ if (this._listenermode == 1) {
+ this.fireChangeEvent();
+ }
+ }
+
+ public void stateChanged(ChangeEvent e) {
+ this.updateCalendar();
+ this.fireChangeEvent();
+ }
+
+ public void addChangeListener(ChangeListener listener) {
+ this._changeListener.add(listener);
+ }
+
+ public void removeChangeListener(ChangeListener listener) {
+ this._changeListener.remove(listener);
+ }
+
+ public ChangeListener[] getChangeListener() {
+ return (ChangeListener[])this._changeListener.toArray();
+ }
+
+ protected void fireChangeEvent() {
+ if (!this._fireingChangeEvent) {
+ this._fireingChangeEvent = true;
+ ChangeEvent event = new ChangeEvent(this);
+ for (ChangeListener cl : this._changeListener) {
+ cl.stateChanged(event);
+ }
+ this._fireingChangeEvent = false;
+ }
+ }
+
+ public void setListenerModus(int mode) {
+ this._listenermode = mode;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this._month.setEnabled(enabled);
+ this._year.setEnabled(enabled);
+ this._monthPanel.setEnabled(enabled);
+ }
+
+ public boolean isEnabled() {
+ return this._month.isEnabled();
+ }
+
+ public DateFormat getDateFormat() {
+ return this._format;
+ }
+}
+
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/JMonthPanel.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/JMonthPanel.java
new file mode 100755
index 00000000..65b4c251
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/controls/calendar/JMonthPanel.java
@@ -0,0 +1,227 @@
+package de.tklsoft.gui.controls.calendar;
+
+import de.tklsoft.gui.controls.calendar.DayLabel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.GridLayout;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Iterator;
+import java.util.Locale;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+public class JMonthPanel extends JPanel {
+
+ private boolean _enabled = true;
+ private Calendar _cal;
+ private Locale _locale;
+ private ArrayList _days;
+ private ArrayList _changeListener = new ArrayList();
+ private boolean _fireingChangeEvent = false;
+ public static final Color BACKGROUND_COLOR = UIManager.getColor("TextField.background");
+ public static final Color FONT_COLOR = UIManager.getColor("TextField.foreground");
+ public static final Color SELECTED_BACKGROUND_COLOR = UIManager.getColor("TextField.selectionBackground");
+ public static final Color SELECTED_FONT_COLOR = UIManager.getColor("TextField.selectionForeground");
+ public static final Color HEADER_BACKGROUND_COLOR = UIManager.getColor("TextField.inactiveForeground");
+ public static final Color HEADER_FONT_COLOR = UIManager.getColor("TextField.inactiveBackground");
+
+
+ public JMonthPanel() {
+ this.init(Calendar.getInstance(), Locale.getDefault());
+ }
+
+ public JMonthPanel(Calendar cal) {
+ this.init(cal, Locale.getDefault());
+ }
+
+ public JMonthPanel(Locale locale) {
+ this.init(Calendar.getInstance(locale), locale);
+ }
+
+ public JMonthPanel(Calendar cal, Locale locale) {
+ this.init(cal, locale);
+ }
+
+ private void init(Calendar cal, Locale loc) {
+ this._cal = Calendar.getInstance(loc);
+ this._cal.set(5, cal.get(5));
+ this._cal.set(2, cal.get(2));
+ this._cal.set(1, cal.get(1));
+ this._locale = loc;
+ this.createGUI();
+ }
+
+ private void createGUI() {
+ this.setLayout(new BorderLayout());
+ this.add(this.createHeader(), "North");
+ this.add(this.createTable(), "Center");
+ }
+
+ private JPanel createHeader() {
+ JPanel header = new JPanel();
+ header.setLayout(new GridLayout(1, 7, 1, 1));
+ header.setBackground(HEADER_BACKGROUND_COLOR);
+ SimpleDateFormat format = new SimpleDateFormat("E", this._locale);
+ Calendar cal = (Calendar)this._cal.clone();
+ char[] letters = new char[7];
+
+ int pos;
+ for(pos = 0; pos < 7; ++pos) {
+ letters[cal.get(7) - 1] = format.format(cal.getTime()).charAt(0);
+ cal.set(5, cal.get(5) + 1);
+ }
+
+ pos = cal.getFirstDayOfWeek() - 1;
+
+ for(int i = 0; i < 7; ++i) {
+ JLabel empty = new JLabel(String.valueOf(letters[pos]));
+ ++pos;
+ if(pos > 6) {
+ pos = 0;
+ }
+
+ empty.setHorizontalAlignment(4);
+ empty.setForeground(HEADER_FONT_COLOR);
+ header.add(empty);
+ }
+
+ return header;
+ }
+
+ private JPanel createTable() {
+ this._days = new ArrayList();
+ JPanel table = new JPanel();
+ table.setBackground(BACKGROUND_COLOR);
+ table.setLayout(new GridLayout(6, 7, 1, 1));
+ int position = 0;
+ Calendar today = Calendar.getInstance();
+ Calendar cal = (Calendar)this._cal.clone();
+ cal.set(5, 1);
+ int month = cal.get(2);
+ int firstDay = cal.get(7);
+ if(firstDay == 0) {
+ --firstDay;
+ } else {
+ firstDay -= cal.getFirstDayOfWeek();
+ }
+
+ if(firstDay < 0) {
+ firstDay += 7;
+ }
+
+ while(position < firstDay) {
+ JLabel curDay = new JLabel();
+ table.add(curDay);
+ ++position;
+ }
+
+ int var10 = this._cal.get(5);
+
+ while(position < 42 && cal.get(2) == month) {
+ boolean empty = false;
+ if(cal.get(1) == today.get(1) && cal.get(2) == today.get(2) && cal.get(5) == today.get(5)) {
+ empty = true;
+ }
+
+ DayLabel day = new DayLabel(cal.get(5), empty, this);
+ table.add(day);
+ this._days.add(day);
+ if(var10 == cal.get(5)) {
+ day.setSelected(true);
+ }
+
+ ++position;
+ cal.set(5, cal.get(5) + 1);
+ }
+
+ while(position < 42) {
+ JLabel var11 = new JLabel();
+ table.add(var11);
+ ++position;
+ }
+
+ return table;
+ }
+
+ public void setCalendar(Calendar cal) {
+ this._cal.set(5, cal.get(5));
+ this._cal.set(2, cal.get(2));
+ this._cal.set(1, cal.get(1));
+ this.removeAll();
+ this.createGUI();
+ this.updateUI();
+ DayLabel dayLabel = (DayLabel)this._days.get(cal.get(5) - 1);
+ dayLabel.grabFocus();
+ this.setBackground(BACKGROUND_COLOR);
+ }
+
+ public void grabFocus() {
+ super.grabFocus();
+ DayLabel dayLabel = (DayLabel)this._days.get(this._cal.get(5) - 1);
+ dayLabel.grabFocus();
+ }
+
+ public Calendar getCalendar() {
+ return this._cal;
+ }
+
+ public void setSelectedDayOfMonth(int day) {
+ if(this._enabled && day > 0 && day <= this._days.size()) {
+ int oldday = this._cal.get(5);
+ DayLabel dayLabel = (DayLabel)this._days.get(oldday - 1);
+ dayLabel.setSelected(false);
+ this._cal.set(5, day);
+ dayLabel = (DayLabel)this._days.get(day - 1);
+ dayLabel.setSelected(true);
+ this.updateUI();
+ this.fireChangeEvent();
+ }
+
+ }
+
+ public int getSelectedDayOfMonth() {
+ return this._cal.get(5);
+ }
+
+ public void addChangeListener(ChangeListener listener) {
+ this._changeListener.add(listener);
+ }
+
+ public void removeChangeListener(ChangeListener listener) {
+ this._changeListener.remove(listener);
+ }
+
+ public ChangeListener[] getChangeListener() {
+ return (ChangeListener[])((ChangeListener[])this._changeListener.toArray());
+ }
+
+ protected void fireChangeEvent() {
+ if(!this._fireingChangeEvent) {
+ this._fireingChangeEvent = true;
+ ChangeEvent event = new ChangeEvent(this);
+ Iterator i$ = this._changeListener.iterator();
+
+ while(i$.hasNext()) {
+ ChangeListener cl = (ChangeListener)i$.next();
+ cl.stateChanged(event);
+ }
+
+ this._fireingChangeEvent = false;
+ }
+
+ }
+
+ public void setEnabled(boolean enabled) {
+ this._enabled = enabled;
+ }
+
+ public boolean isEnabled() {
+ return this._enabled;
+ }
+
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/layout/Synchronizable.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/layout/Synchronizable.java
new file mode 100755
index 00000000..25a1b730
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/layout/Synchronizable.java
@@ -0,0 +1,10 @@
+package de.tklsoft.gui.layout;
+
+import java.awt.Dimension;
+
+public interface Synchronizable {
+
+ void setSynchronizer(Synchronizer var1);
+
+ Dimension getNormalSize();
+}
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/layout/Synchronizer.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/layout/Synchronizer.java
new file mode 100755
index 00000000..72b3ac5f
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/gui/layout/Synchronizer.java
@@ -0,0 +1,80 @@
+/*
+ * Decompiled with CFR 0.150.
+ */
+package de.tklsoft.gui.layout;
+
+import de.tklsoft.gui.layout.Synchronizable;
+import java.awt.Dimension;
+import java.util.HashSet;
+
+public class Synchronizer {
+ private HashSet items = new HashSet();
+ private final METHOD method;
+
+ public Synchronizer(METHOD method) {
+ this.method = method;
+ }
+
+ public void add(Synchronizable synchronizable) {
+ this.items.add(synchronizable);
+ synchronizable.setSynchronizer(this);
+ }
+
+ public Dimension getSize(Synchronizable synchronizable) {
+ if (this.method == METHOD.WIDTH) {
+ return this.getSizeByWidth(synchronizable);
+ }
+ if (this.method == METHOD.HEIGHT) {
+ return this.getSizeByHeight(synchronizable);
+ }
+ if (this.method == METHOD.WIGHT_AND_HEIGHT) {
+ return this.getSizeByWidthAndHeight();
+ }
+ return null;
+ }
+
+ private Dimension getSizeByWidthAndHeight() {
+ int height = 0;
+ int width = 0;
+ for (Synchronizable curSynchronizable : this.items) {
+ Dimension dim = curSynchronizable.getNormalSize();
+ if (dim.height > height) {
+ height = dim.height;
+ }
+ if (dim.width <= width) continue;
+ width = dim.width;
+ }
+ return new Dimension(width, height);
+ }
+
+ private Dimension getSizeByHeight(Synchronizable synchronizable) {
+ int height = 0;
+ for (Synchronizable curSynchronizable : this.items) {
+ Dimension dim = curSynchronizable.getNormalSize();
+ if (dim.height <= height) continue;
+ height = dim.height;
+ }
+ return new Dimension(synchronizable.getNormalSize().width, height);
+ }
+
+ private Dimension getSizeByWidth(Synchronizable synchronizable) {
+ int width = 0;
+ for (Synchronizable curSynchronizable : this.items) {
+ Dimension dim = curSynchronizable.getNormalSize();
+ if (dim.width <= width) continue;
+ width = dim.width;
+ }
+ return new Dimension(width, synchronizable.getNormalSize().height);
+ }
+
+ /*
+ * This class specifies class file version 49.0 but uses Java 6 signatures. Assumed Java 6.
+ */
+ public static enum METHOD {
+ WIDTH,
+ HEIGHT,
+ WIGHT_AND_HEIGHT;
+
+ }
+}
+
diff --git a/modules/AJCoreGUI/src/main/java/de/tklsoft/icon/IconManager.java b/modules/AJCoreGUI/src/main/java/de/tklsoft/icon/IconManager.java
new file mode 100755
index 00000000..b941ad33
--- /dev/null
+++ b/modules/AJCoreGUI/src/main/java/de/tklsoft/icon/IconManager.java
@@ -0,0 +1,44 @@
+package de.tklsoft.icon;
+
+import java.awt.Image;
+import java.io.File;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import javax.swing.ImageIcon;
+
+public class IconManager {
+
+ private static IconManager instance = null;
+ private Map icons = new HashMap();
+
+
+ public static IconManager getInstance() {
+ if(instance == null) {
+ instance = new IconManager();
+ }
+
+ return instance;
+ }
+
+ public ImageIcon getIcon(String key) {
+ ImageIcon result = null;
+
+ try {
+ if(this.icons.containsKey(key)) {
+ result = (ImageIcon)this.icons.get(key);
+ } else {
+ String url = System.getProperty("user.dir") + File.separator + "icons" + File.separator + key + ".gif";
+ Image img = (new ImageIcon(url)).getImage();
+ result = new ImageIcon(img);
+ this.icons.put(key, result);
+ }
+
+ return result;
+ } catch (Exception var6) {
+ var6.printStackTrace();
+ return null;
+ }
+ }
+
+}
diff --git a/modules/logviewer/logviewer.iml b/modules/logviewer/logviewer.iml
new file mode 100644
index 00000000..a3295787
--- /dev/null
+++ b/modules/logviewer/logviewer.iml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/logviewer/pom.xml b/modules/logviewer/pom.xml
new file mode 100644
index 00000000..03059dad
--- /dev/null
+++ b/modules/logviewer/pom.xml
@@ -0,0 +1,39 @@
+
+
+ 4.0.0
+ de.applejuicenet.client.gui.plugins
+ logviewer
+ 1.3.1
+ jar
+
+
+ de.applejuicenet.client
+ AJClientGUI
+ 1
+ ./../../pom.xml
+
+
+
+ UTF-8
+ 1.8
+ 1.8
+
+
+
+
+ de.applejuicenet.client.gui
+ AJCoreGUI
+ 0.83.3
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.2.0
+
+
+
+
diff --git a/AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/FileModificationDateComparator.java b/modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/FileModificationDateComparator.java
similarity index 100%
rename from AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/FileModificationDateComparator.java
rename to modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/FileModificationDateComparator.java
diff --git a/AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/FileNameListCellRenderer.java b/modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/FileNameListCellRenderer.java
similarity index 100%
rename from AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/FileNameListCellRenderer.java
rename to modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/FileNameListCellRenderer.java
diff --git a/AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/LogViewerPlugin.java b/modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/LogViewerPlugin.java
similarity index 100%
rename from AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/LogViewerPlugin.java
rename to modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/LogViewerPlugin.java
diff --git a/AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/LogViewerTestLoader.java b/modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/LogViewerTestLoader.java
similarity index 100%
rename from AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/LogViewerTestLoader.java
rename to modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/LogViewerTestLoader.java
diff --git a/AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/SortedStringListModel.java b/modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/SortedStringListModel.java
similarity index 100%
rename from AJClientGUI/plugin_src/logviewer/src/de/applejuicenet/client/gui/plugins/logviewer/SortedStringListModel.java
rename to modules/logviewer/src/main/java/de/applejuicenet/client/gui/plugins/logviewer/SortedStringListModel.java
diff --git a/AJClientGUI/plugin_src/logviewer/icons/icon.gif b/modules/logviewer/src/main/resources/icon.gif
similarity index 100%
rename from AJClientGUI/plugin_src/logviewer/icons/icon.gif
rename to modules/logviewer/src/main/resources/icon.gif
diff --git a/AJClientGUI/plugin_src/logviewer/plugin.properties b/modules/logviewer/src/main/resources/plugin.properties
similarity index 66%
rename from AJClientGUI/plugin_src/logviewer/plugin.properties
rename to modules/logviewer/src/main/resources/plugin.properties
index 4aa631f1..c6f734ed 100644
--- a/AJClientGUI/plugin_src/logviewer/plugin.properties
+++ b/modules/logviewer/src/main/resources/plugin.properties
@@ -1,7 +1,7 @@
general.title=LogViewer
-general.version=1.3
+general.version=1.3.1
general.author=loevenwong
general.contact=tloevenich@tkl-soft.de
-general.description=Mit dem Logviewer knnen die Logs angezeigt werden.
+general.description=Mit dem Logviewer können die Logs angezeigt werden.
general.istab=true
general.classname=de.applejuicenet.client.gui.plugins.logviewer.LogViewerPlugin
diff --git a/modules/serverwatcher/pom.xml b/modules/serverwatcher/pom.xml
new file mode 100644
index 00000000..8bbc1c1d
--- /dev/null
+++ b/modules/serverwatcher/pom.xml
@@ -0,0 +1,39 @@
+
+
+ 4.0.0
+ de.applejuicenet.client.gui.plugins
+ serverwatcher
+ 1.5.0
+ jar
+
+
+ de.applejuicenet.client
+ AJClientGUI
+ 1
+ ./../../pom.xml
+
+
+
+ UTF-8
+ 1.8
+ 1.8
+
+
+
+
+ de.applejuicenet.client.gui
+ AJCoreGUI
+ 0.83.0
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.2.0
+
+
+
+
diff --git a/modules/serverwatcher/serverwatcher.iml b/modules/serverwatcher/serverwatcher.iml
new file mode 100644
index 00000000..61fdfcde
--- /dev/null
+++ b/modules/serverwatcher/serverwatcher.iml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/NewServerDialog.java b/modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/NewServerDialog.java
similarity index 100%
rename from AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/NewServerDialog.java
rename to modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/NewServerDialog.java
diff --git a/AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerConfig.java b/modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerConfig.java
similarity index 93%
rename from AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerConfig.java
rename to modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerConfig.java
index 82b35fe3..6e687e3c 100644
--- a/AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerConfig.java
+++ b/modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerConfig.java
@@ -5,6 +5,8 @@
package de.applejuicenet.client.gui.plugins.serverwatcher;
+import java.util.Base64;
+
/**
* $Header: /home/xubuntu/berlios_backup/github/tmp-cvs/applejuicejava/Repository/AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerConfig.java,v 1.3 2009/01/12 10:19:56 maj0r Exp $
*
@@ -46,7 +48,7 @@ public ServerConfig(String dyn, String port, String userpass)
}
this.port = port;
- this.userpass = new sun.misc.BASE64Encoder().encode(userpass.getBytes());
+ this.userpass = Base64.getEncoder().withoutPadding().encodeToString(userpass.getBytes());
}
public String getBezeichnung()
diff --git a/AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerWatcherPlugin.java b/modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerWatcherPlugin.java
similarity index 100%
rename from AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerWatcherPlugin.java
rename to modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerWatcherPlugin.java
diff --git a/AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerWatcherTestLoader.java b/modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerWatcherTestLoader.java
similarity index 100%
rename from AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerWatcherTestLoader.java
rename to modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerWatcherTestLoader.java
diff --git a/AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerXML.java b/modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerXML.java
similarity index 93%
rename from AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerXML.java
rename to modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerXML.java
index 5fb69a9e..1141239a 100644
--- a/AJClientGUI/plugin_src/serverwatcher/src/de/applejuicenet/client/gui/plugins/serverwatcher/ServerXML.java
+++ b/modules/serverwatcher/src/main/java/de/applejuicenet/client/gui/plugins/serverwatcher/ServerXML.java
@@ -119,15 +119,7 @@ public static String getXMLPath()
{
String path;
- if(System.getProperty("os.name").toLowerCase().indexOf("windows") == -1)
- {
- path = System.getProperty("user.home") + File.separator + "appleJuice" + File.separator + "gui" + File.separator +
- "plugins" + File.separator + "serverwatcher.xml";
- }
- else
- {
- path = System.getProperty("user.dir") + File.separator + "plugins" + File.separator + "serverwatcher.xml";
- }
+ path = System.getProperty("user.home") + File.separator + "appleJuice" + File.separator + "gui" + File.separator + "plugins" + File.separator + "serverwatcher.xml";
return path;
}
diff --git a/AJClientGUI/plugin_src/ircplugin/icons/icon.gif b/modules/serverwatcher/src/main/resources/icon.gif
similarity index 100%
rename from AJClientGUI/plugin_src/ircplugin/icons/icon.gif
rename to modules/serverwatcher/src/main/resources/icon.gif
diff --git a/AJClientGUI/plugin_src/serverwatcher/plugin.properties b/modules/serverwatcher/src/main/resources/plugin.properties
similarity index 70%
rename from AJClientGUI/plugin_src/serverwatcher/plugin.properties
rename to modules/serverwatcher/src/main/resources/plugin.properties
index 74bce7bc..14c1d25a 100644
--- a/AJClientGUI/plugin_src/serverwatcher/plugin.properties
+++ b/modules/serverwatcher/src/main/resources/plugin.properties
@@ -1,7 +1,7 @@
general.title=ServerWatcher
-general.version=1.5
+general.version=1.5.0
general.author=Maj0r
general.contact=tkrall@tkl-soft.de
-general.description=Mit dem Serverwatcher kann der Status von Servern angezeigt werden. Bentigt wird ein GUI ab 0.70.4
+general.description=Mit dem Serverwatcher kann der Status von Servern angezeigt werden.
general.istab=true
-general.classname=de.applejuicenet.client.gui.plugins.serverwatcher.ServerWatcherPlugin
\ No newline at end of file
+general.classname=de.applejuicenet.client.gui.plugins.serverwatcher.ServerWatcherPlugin
diff --git a/modules/standardpwdlpolicy/pom.xml b/modules/standardpwdlpolicy/pom.xml
new file mode 100644
index 00000000..ed27527f
--- /dev/null
+++ b/modules/standardpwdlpolicy/pom.xml
@@ -0,0 +1,39 @@
+
+
+ 4.0.0
+ de.applejuicenet.client
+ StandardPwdlPolicy
+ 1.3.1
+ jar
+
+
+ de.applejuicenet.client
+ AJClientGUI
+ 1
+ ./../../pom.xml
+
+
+
+ UTF-8
+ 1.8
+ 1.8
+
+
+
+
+ de.applejuicenet.client.gui
+ AJCoreGUI
+ 0.83.3
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.2.0
+
+
+
+
diff --git a/AJClientGUI/pwdl_policy_src/standardpwdlpolicy/src/de/applejuicenet/client/gui/powerdownload/EinstellungenDialog.java b/modules/standardpwdlpolicy/src/main/java/de/applejuicenet/client/gui/powerdownload/EinstellungenDialog.java
similarity index 100%
rename from AJClientGUI/pwdl_policy_src/standardpwdlpolicy/src/de/applejuicenet/client/gui/powerdownload/EinstellungenDialog.java
rename to modules/standardpwdlpolicy/src/main/java/de/applejuicenet/client/gui/powerdownload/EinstellungenDialog.java
diff --git a/AJClientGUI/pwdl_policy_src/standardpwdlpolicy/src/de/applejuicenet/client/gui/powerdownload/StandardAutomaticPwdlPolicy.java b/modules/standardpwdlpolicy/src/main/java/de/applejuicenet/client/gui/powerdownload/StandardAutomaticPwdlPolicy.java
similarity index 96%
rename from AJClientGUI/pwdl_policy_src/standardpwdlpolicy/src/de/applejuicenet/client/gui/powerdownload/StandardAutomaticPwdlPolicy.java
rename to modules/standardpwdlpolicy/src/main/java/de/applejuicenet/client/gui/powerdownload/StandardAutomaticPwdlPolicy.java
index e6b97cb2..6e5f48f5 100644
--- a/AJClientGUI/pwdl_policy_src/standardpwdlpolicy/src/de/applejuicenet/client/gui/powerdownload/StandardAutomaticPwdlPolicy.java
+++ b/modules/standardpwdlpolicy/src/main/java/de/applejuicenet/client/gui/powerdownload/StandardAutomaticPwdlPolicy.java
@@ -18,7 +18,7 @@
* $Header:
* /cvsroot/applejuicejava/AJClientGUI/pwdl_policy_src/standardpwdlpolicy/src/de/applejuicenet/client/gui/powerdownload/StandardAutomaticPwdlPolicy.java,v
* 1.17 2005/02/17 22:22:21 loevenwong Exp $
- *
+ *
*
* Titel: AppleJuice Client-GUI
*
@@ -29,9 +29,9 @@
*
* Copyright: General Public License
*
- *
+ *
* @author: Maj0r [aj@tkl-soft.de]
- *
+ *
*/
public class StandardAutomaticPwdlPolicy extends AutomaticPowerdownloadPolicy {
@@ -169,7 +169,7 @@ public void informPaused() {
}
public String getVersion() {
- return "1.3";
+ return "1.3.1";
}
public String getDescription() {
@@ -223,11 +223,11 @@ public Sortierkriterium(Double prozentGeladen, Long groesse,
}
public Sortierkriterium(Download current) {
- this.prozentGeladen = new Double(current.getProzentGeladen());
- this.groesse = new Long(current.getGroesse());
- this.id = new Integer(current.getId());
+ this.prozentGeladen = current.getProzentGeladen();
+ this.groesse = (long) current.getGroesse();
+ this.id = current.getId();
if (current.getSources() != null) {
- this.quellenAnzahl = new Integer(current.getSources().length);
+ this.quellenAnzahl = current.getSources().length;
}
}
diff --git a/modules/versionchecker/pom.xml b/modules/versionchecker/pom.xml
new file mode 100644
index 00000000..009687ae
--- /dev/null
+++ b/modules/versionchecker/pom.xml
@@ -0,0 +1,39 @@
+
+
+ 4.0.0
+ de.applejuicenet.client.gui.plugins
+ versionchecker
+ 1.6.1
+ jar
+
+
+ de.applejuicenet.client
+ AJClientGUI
+ 1
+ ./../../pom.xml
+
+
+
+ UTF-8
+ 1.8
+ 1.8
+
+
+
+
+ de.applejuicenet.client.gui
+ AJCoreGUI
+ 0.83.3
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.2.0
+
+
+
+
diff --git a/AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/VersionChecker.java b/modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/VersionChecker.java
similarity index 100%
rename from AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/VersionChecker.java
rename to modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/VersionChecker.java
diff --git a/AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/VersioncheckerTestLoader.java b/modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/VersioncheckerTestLoader.java
similarity index 100%
rename from AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/VersioncheckerTestLoader.java
rename to modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/VersioncheckerTestLoader.java
diff --git a/AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/panels/MainPanel.java b/modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/panels/MainPanel.java
similarity index 100%
rename from AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/panels/MainPanel.java
rename to modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/panels/MainPanel.java
diff --git a/AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/panels/VersionHolder.java b/modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/panels/VersionHolder.java
similarity index 100%
rename from AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/panels/VersionHolder.java
rename to modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/panels/VersionHolder.java
diff --git a/AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/panels/VersionTableModel.java b/modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/panels/VersionTableModel.java
similarity index 100%
rename from AJClientGUI/plugin_src/versionchecker/src/de/applejuicenet/client/gui/plugins/versionchecker/panels/VersionTableModel.java
rename to modules/versionchecker/src/main/java/de/applejuicenet/client/gui/plugins/versionchecker/panels/VersionTableModel.java
diff --git a/AJClientGUI/plugin_src/serverwatcher/icons/icon.gif b/modules/versionchecker/src/main/resources/icon.gif
similarity index 100%
rename from AJClientGUI/plugin_src/serverwatcher/icons/icon.gif
rename to modules/versionchecker/src/main/resources/icon.gif
diff --git a/AJClientGUI/plugin_src/versionchecker/language_deutsch.properties b/modules/versionchecker/src/main/resources/language_deutsch.properties
similarity index 67%
rename from AJClientGUI/plugin_src/versionchecker/language_deutsch.properties
rename to modules/versionchecker/src/main/resources/language_deutsch.properties
index ff23b467..f4d2e7bd 100644
--- a/AJClientGUI/plugin_src/versionchecker/language_deutsch.properties
+++ b/modules/versionchecker/src/main/resources/language_deutsch.properties
@@ -1,3 +1,3 @@
language=deutsch
-language.description=Welche Core-Versionen sind zurzeit im Einsatz? Welche Betriebssysteme werden eingesetzt? Dieses Plugin beantwortet Deine Fragen. GUI ab 0.70.4 wird benigt.
-language.istab=true
\ No newline at end of file
+language.description=Welche Core-Versionen sind zurzeit im Einsatz? Welche Betriebssysteme werden eingesetzt? Dieses Plugin beantwortet Deine Fragen.
+language.istab=true
diff --git a/AJClientGUI/plugin_src/versionchecker/language_english.properties b/modules/versionchecker/src/main/resources/language_english.properties
similarity index 81%
rename from AJClientGUI/plugin_src/versionchecker/language_english.properties
rename to modules/versionchecker/src/main/resources/language_english.properties
index 7dced079..a3d615d4 100644
--- a/AJClientGUI/plugin_src/versionchecker/language_english.properties
+++ b/modules/versionchecker/src/main/resources/language_english.properties
@@ -1,2 +1,2 @@
language=english
-language.description=Which core-version are currently used? Which operating-systems are used? This plugins answers your questions. GUI 0.70.4 or higher is needed.
\ No newline at end of file
+language.description=Which core-version are currently used? Which operating-systems are used? This plugins answers your questions.
diff --git a/AJClientGUI/plugin_src/versionchecker/plugin.properties b/modules/versionchecker/src/main/resources/plugin.properties
similarity index 76%
rename from AJClientGUI/plugin_src/versionchecker/plugin.properties
rename to modules/versionchecker/src/main/resources/plugin.properties
index ae35dd7e..081eaf81 100644
--- a/AJClientGUI/plugin_src/versionchecker/plugin.properties
+++ b/modules/versionchecker/src/main/resources/plugin.properties
@@ -1,7 +1,7 @@
general.title=VersionChecker
-general.version=1.6
+general.version=1.6.1
general.author=Maj0r
general.contact=tkrall@tkl-soft.de
-general.description=Welche Core-Versionen sind zurzeit im Einsatz? Welche Betriebssysteme werden eingesetzt? Dieses Plugin beantwortet Deine Fragen. GUI ab 0.70.4 wird bentigt."
+general.description=Welche Core-Versionen sind zurzeit im Einsatz? Welche Betriebssysteme werden eingesetzt? Dieses Plugin beantwortet Deine Fragen.
general.istab=true
-general.classname=de.applejuicenet.client.gui.plugins.versionchecker.VersionChecker
\ No newline at end of file
+general.classname=de.applejuicenet.client.gui.plugins.versionchecker.VersionChecker
diff --git a/osx/AJCoreGUI.icns b/osx/AJCoreGUI.icns
new file mode 100644
index 00000000..4f8389e9
Binary files /dev/null and b/osx/AJCoreGUI.icns differ
diff --git a/osx/Info.plist b/osx/Info.plist
new file mode 100644
index 00000000..97f0b1c0
--- /dev/null
+++ b/osx/Info.plist
@@ -0,0 +1,56 @@
+
+
+
+
+ CFBundleDevelopmentRegion
+ German
+
+ CFBundleExecutable
+ universalJavaApplicationStub
+
+ CFBundleIconFile
+ AJCoreGUI.icns
+
+ CFBundleIdentifier
+ de.applejuicenet.client.AppleJuiceClient
+
+ CFBundleDisplayName
+ AJCoreGUI
+
+ CFBundleInfoDictionaryVersion
+ 6.0
+
+ CFBundleName
+ AJCoreGUI
+
+ CFBundlePackageType
+ APPL
+
+ NSHighResolutionCapable
+ True
+
+ CFBundleShortVersionString
+ 1.0.1
+
+ CFBundleSignature
+ agui
+
+ CFBundleVersion
+ 1.0.1
+
+ CFBundleURLTypes
+
+
+ CFBundleURLName
+ appleJuice Links
+ CFBundleURLSchemes
+
+ ajfsp
+
+
+
+
+ JVMMainClassName
+ de.applejuicenet.client.AppleJuiceClient
+
+
diff --git a/osx/universalJavaApplicationStub b/osx/universalJavaApplicationStub
new file mode 100644
index 00000000..35255566
--- /dev/null
+++ b/osx/universalJavaApplicationStub
@@ -0,0 +1,797 @@
+#!/bin/bash
+##################################################################################
+# #
+# universalJavaApplicationStub #
+# #
+# A BASH based JavaApplicationStub for Java Apps on Mac OS X #
+# that works with both Apple's and Oracle's plist format. #
+# #
+# Inspired by Ian Roberts stackoverflow answer #
+# at http://stackoverflow.com/a/17546508/1128689 #
+# #
+# @author Tobias Fischer #
+# @url https://github.com/tofi86/universalJavaApplicationStub #
+# @date 2020-03-19 #
+# @version 3.0.6 #
+# #
+##################################################################################
+# #
+# The MIT License (MIT) #
+# #
+# Copyright (c) 2014-2020 Tobias Fischer #
+# #
+# Permission is hereby granted, free of charge, to any person obtaining a copy #
+# of this software and associated documentation files (the "Software"), to deal #
+# in the Software without restriction, including without limitation the rights #
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell #
+# copies of the Software, and to permit persons to whom the Software is #
+# furnished to do so, subject to the following conditions: #
+# #
+# The above copyright notice and this permission notice shall be included in all #
+# copies or substantial portions of the Software. #
+# #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE #
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, #
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #
+# SOFTWARE. #
+# #
+##################################################################################
+
+
+
+# function 'stub_logger()'
+#
+# A logger which logs to the macOS Console.app using the 'syslog' command
+#
+# @param1 the log message
+# @return void
+################################################################################
+function stub_logger() {
+ syslog -s -k \
+ Facility com.apple.console \
+ Level Notice \
+ Sender "$(basename "$0")" \
+ Message "[$$][${CFBundleName:-$(basename "$0")}] $1"
+}
+
+
+
+# set the directory abspath of the current
+# shell script with symlinks being resolved
+############################################
+
+PRG=$0
+while [ -h "$PRG" ]; do
+ ls=$(ls -ld "$PRG")
+ link=$(expr "$ls" : '^.*-> \(.*\)$' 2>/dev/null)
+ if expr "$link" : '^/' 2> /dev/null >/dev/null; then
+ PRG="$link"
+ else
+ PRG="$(dirname "$PRG")/$link"
+ fi
+done
+PROGDIR=$(dirname "$PRG")
+stub_logger "[StubDir] $PROGDIR"
+
+
+
+# set files and folders
+############################################
+
+# the absolute path of the app package
+cd "$PROGDIR"/../../ || exit 11
+AppPackageFolder=$(pwd)
+
+# the base path of the app package
+cd .. || exit 12
+AppPackageRoot=$(pwd)
+
+# set Apple's Java folder
+AppleJavaFolder="${AppPackageFolder}"/Contents/Resources/Java
+
+# set Apple's Resources folder
+AppleResourcesFolder="${AppPackageFolder}"/Contents/Resources
+
+# set Oracle's Java folder
+OracleJavaFolder="${AppPackageFolder}"/Contents/Java
+
+# set Oracle's Resources folder
+OracleResourcesFolder="${AppPackageFolder}"/Contents/Resources
+
+# set path to Info.plist in bundle
+InfoPlistFile="${AppPackageFolder}"/Contents/Info.plist
+
+# set the default JVM Version to a null string
+JVMVersion=""
+JVMMaxVersion=""
+
+
+
+# function 'plist_get()'
+#
+# read a specific Plist key with 'PlistBuddy' utility
+#
+# @param1 the Plist key with leading colon ':'
+# @return the value as String or Array
+################################################################################
+plist_get(){
+ /usr/libexec/PlistBuddy -c "print $1" "${InfoPlistFile}" 2> /dev/null
+}
+
+# function 'plist_get_java()'
+#
+# read a specific Plist key with 'PlistBuddy' utility
+# in the 'Java' or 'JavaX' dictionary ()
+#
+# @param1 the Plist :Java(X):Key with leading colon ':'
+# @return the value as String or Array
+################################################################################
+plist_get_java(){
+ plist_get ${JavaKey:-":Java"}$1
+}
+
+
+
+# read Info.plist and extract JVM options
+############################################
+
+# read the program name from CFBundleName
+CFBundleName=$(plist_get ':CFBundleName')
+
+# read the icon file name
+CFBundleIconFile=$(plist_get ':CFBundleIconFile')
+
+
+# check Info.plist for Apple style Java keys -> if key :Java is present, parse in apple mode
+/usr/libexec/PlistBuddy -c "print :Java" "${InfoPlistFile}" > /dev/null 2>&1
+exitcode=$?
+JavaKey=":Java"
+
+# if no :Java key is present, check Info.plist for universalJavaApplication style JavaX keys -> if key :JavaX is present, parse in apple mode
+if [ $exitcode -ne 0 ]; then
+ /usr/libexec/PlistBuddy -c "print :JavaX" "${InfoPlistFile}" > /dev/null 2>&1
+ exitcode=$?
+ JavaKey=":JavaX"
+fi
+
+
+# read 'Info.plist' file in Apple style if exit code returns 0 (true, ':Java' key is present)
+if [ $exitcode -eq 0 ]; then
+ stub_logger "[PlistStyle] Apple"
+
+ # set Java and Resources folder
+ JavaFolder="${AppleJavaFolder}"
+ ResourcesFolder="${AppleResourcesFolder}"
+
+ APP_PACKAGE="${AppPackageFolder}"
+ JAVAROOT="${AppleJavaFolder}"
+ USER_HOME="$HOME"
+
+
+ # read the Java WorkingDirectory
+ JVMWorkDir=$(plist_get_java ':WorkingDirectory' | xargs)
+ # set Working Directory based upon PList value
+ if [[ ! -z ${JVMWorkDir} ]]; then
+ WorkingDirectory="${JVMWorkDir}"
+ else
+ # AppPackageRoot is the standard WorkingDirectory when the script is started
+ WorkingDirectory="${AppPackageRoot}"
+ fi
+ # expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
+ WorkingDirectory=$(eval echo "${WorkingDirectory}")
+
+
+ # read the MainClass name
+ JVMMainClass="$(plist_get_java ':MainClass')"
+
+ # read the SplashFile name
+ JVMSplashFile=$(plist_get_java ':SplashFile')
+
+ # read the JVM Properties as an array and retain spaces
+ IFS=$'\t\n'
+ JVMOptions=($(xargs -n1 <<<$(plist_get_java ':Properties' | grep " =" | sed 's/^ */-D/g' | sed -E 's/ = (.*)$/="\1"/g')))
+ unset IFS
+ # post processing of the array follows further below...
+
+ # read the ClassPath in either Array or String style
+ JVMClassPath_RAW=$(plist_get_java ':ClassPath' | xargs)
+ if [[ $JVMClassPath_RAW == *Array* ]] ; then
+ JVMClassPath=.$(plist_get_java ':ClassPath' | grep " " | sed 's/^ */:/g' | tr -d '\n' | xargs)
+ else
+ JVMClassPath=${JVMClassPath_RAW}
+ fi
+ # expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
+ JVMClassPath=$(eval echo "${JVMClassPath}")
+
+ # read the JVM Options in either Array or String style
+ JVMDefaultOptions_RAW=$(plist_get_java ':VMOptions' | xargs)
+ if [[ $JVMDefaultOptions_RAW == *Array* ]] ; then
+ JVMDefaultOptions=$(plist_get_java ':VMOptions' | grep " " | sed 's/^ */ /g' | tr -d '\n' | xargs)
+ else
+ JVMDefaultOptions=${JVMDefaultOptions_RAW}
+ fi
+
+ # read StartOnMainThread and add as -XstartOnFirstThread
+ JVMStartOnMainThread=$(plist_get_java ':StartOnMainThread')
+ if [ "${JVMStartOnMainThread}" == "true" ]; then
+ JVMDefaultOptions+=" -XstartOnFirstThread"
+ fi
+
+ # read the JVM Arguments in either Array or String style (#76) and retain spaces
+ IFS=$'\t\n'
+ MainArgs_RAW=$(plist_get_java ':Arguments' | xargs)
+ if [[ $MainArgs_RAW == *Array* ]] ; then
+ MainArgs=($(xargs -n1 <<<$(plist_get_java ':Arguments' | tr -d '\n' | sed -E 's/Array \{ *(.*) *\}/\1/g' | sed 's/ */ /g')))
+ else
+ MainArgs=($(xargs -n1 <<<$(plist_get_java ':Arguments')))
+ fi
+ unset IFS
+ # post processing of the array follows further below...
+
+ # read the Java version we want to find
+ JVMVersion=$(plist_get_java ':JVMVersion' | xargs)
+ # post processing of the version string follows below...
+
+
+# read 'Info.plist' file in Oracle style
+else
+ stub_logger "[PlistStyle] Oracle"
+
+ # set Working Directory and Java and Resources folder
+ JavaFolder="${OracleJavaFolder}"
+ ResourcesFolder="${OracleResourcesFolder}"
+ WorkingDirectory="${OracleJavaFolder}"
+
+ APP_ROOT="${AppPackageFolder}"
+
+ # read the MainClass name
+ JVMMainClass="$(plist_get ':JVMMainClassName')"
+
+ # read the SplashFile name
+ JVMSplashFile=$(plist_get ':JVMSplashFile')
+
+ # read the JVM Options as an array and retain spaces
+ IFS=$'\t\n'
+ JVMOptions=($(plist_get ':JVMOptions' | grep " " | sed 's/^ *//g'))
+ unset IFS
+ # post processing of the array follows further below...
+
+ # read the ClassPath in either Array or String style
+ JVMClassPath_RAW=$(plist_get ':JVMClassPath')
+ if [[ $JVMClassPath_RAW == *Array* ]] ; then
+ JVMClassPath=.$(plist_get ':JVMClassPath' | grep " " | sed 's/^ */:/g' | tr -d '\n' | xargs)
+ # expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
+ JVMClassPath=$(eval echo "${JVMClassPath}")
+
+ elif [[ ! -z ${JVMClassPath_RAW} ]] ; then
+ JVMClassPath=${JVMClassPath_RAW}
+ # expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
+ JVMClassPath=$(eval echo "${JVMClassPath}")
+
+ else
+ #default: fallback to OracleJavaFolder
+ JVMClassPath="${JavaFolder}/*"
+ # Do NOT expand the default 'AppName.app/Contents/Java/*' classpath (#42)
+ fi
+
+ # read the JVM Default Options
+ JVMDefaultOptions=$(plist_get ':JVMDefaultOptions' | grep -o " \-.*" | tr -d '\n' | xargs)
+
+ # read the Main Arguments from JVMArguments key as an array and retain spaces (see #46 for naming details)
+ IFS=$'\t\n'
+ MainArgs=($(xargs -n1 <<<$(plist_get ':JVMArguments' | tr -d '\n' | sed -E 's/Array \{ *(.*) *\}/\1/g' | sed 's/ */ /g')))
+ unset IFS
+ # post processing of the array follows further below...
+
+ # read the Java version we want to find
+ JVMVersion=$(plist_get ':JVMVersion' | xargs)
+ # post processing of the version string follows below...
+fi
+
+
+# (#75) check for undefined icons or icon names without .icns extension and prepare
+# an osascript statement for those cases when the icon can be shown in the dialog
+DialogWithIcon=""
+if [ ! -z ${CFBundleIconFile} ]; then
+ if [[ ${CFBundleIconFile} == *.icns ]] && [[ -f "${ResourcesFolder}/${CFBundleIconFile}" ]] ; then
+ DialogWithIcon=" with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
+ elif [[ ${CFBundleIconFile} != *.icns ]] && [[ -f "${ResourcesFolder}/${CFBundleIconFile}.icns" ]] ; then
+ CFBundleIconFile+=".icns"
+ DialogWithIcon=" with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
+ fi
+fi
+
+
+# JVMVersion: post processing and optional splitting
+if [[ ${JVMVersion} == *";"* ]]; then
+ minMaxArray=(${JVMVersion//;/ })
+ JVMVersion=${minMaxArray[0]//+}
+ JVMMaxVersion=${minMaxArray[1]//+}
+fi
+stub_logger "[JavaRequirement] JVM minimum version: ${JVMVersion}"
+stub_logger "[JavaRequirement] JVM maximum version: ${JVMMaxVersion}"
+
+# MainArgs: replace occurences of $APP_ROOT with its content
+MainArgsArr=()
+for i in "${MainArgs[@]}"
+do
+ MainArgsArr+=("$(eval echo "$i")")
+done
+
+# JVMOptions: replace occurences of $APP_ROOT with its content
+JVMOptionsArr=()
+for i in "${JVMOptions[@]}"
+do
+ JVMOptionsArr+=("$(eval echo "$i")")
+done
+
+
+# internationalized messages
+############################################
+
+LANG=$(defaults read -g AppleLocale)
+stub_logger "[Language] $LANG"
+
+# French localization
+if [[ $LANG == fr* ]] ; then
+ MSG_ERROR_LAUNCHING="ERREUR au lancement de '${CFBundleName}'."
+ MSG_MISSING_MAINCLASS="'MainClass' n'est pas spécifié.\nL'application Java ne peut pas être lancée."
+ MSG_JVMVERSION_REQ_INVALID="La syntaxe de la version de Java demandée est invalide: %s\nVeuillez contacter le développeur de l'application."
+ MSG_NO_SUITABLE_JAVA="La version de Java installée sur votre système ne convient pas.\nCe programme nécessite Java %s"
+ MSG_JAVA_VERSION_OR_LATER="ou ultérieur"
+ MSG_JAVA_VERSION_LATEST="(dernière mise à jour)"
+ MSG_JAVA_VERSION_MAX="à %s"
+ MSG_NO_SUITABLE_JAVA_CHECK="Merci de bien vouloir installer la version de Java requise."
+ MSG_INSTALL_JAVA="Java doit être installé sur votre système.\nRendez-vous sur java.com et suivez les instructions d'installation..."
+ MSG_LATER="Plus tard"
+ MSG_VISIT_JAVA_DOT_COM="Java by Oracle"
+ MSG_VISIT_ADOPTOPENJDK="Java by AdoptOpenJDK"
+
+# German localization
+elif [[ $LANG == de* ]] ; then
+ MSG_ERROR_LAUNCHING="FEHLER beim Starten von '${CFBundleName}'."
+ MSG_MISSING_MAINCLASS="Die 'MainClass' ist nicht spezifiziert!\nDie Java-Anwendung kann nicht gestartet werden!"
+ MSG_JVMVERSION_REQ_INVALID="Die Syntax der angeforderten Java-Version ist ungültig: %s\nBitte kontaktieren Sie den Entwickler der App."
+ MSG_NO_SUITABLE_JAVA="Es wurde keine passende Java-Version auf Ihrem System gefunden!\nDieses Programm benötigt Java %s"
+ MSG_JAVA_VERSION_OR_LATER="oder neuer"
+ MSG_JAVA_VERSION_LATEST="(neuste Unterversion)"
+ MSG_JAVA_VERSION_MAX="bis %s"
+ MSG_NO_SUITABLE_JAVA_CHECK="Stellen Sie sicher, dass die angeforderte Java-Version installiert ist."
+ MSG_INSTALL_JAVA="Auf Ihrem System muss die 'Java'-Software installiert sein.\nBesuchen Sie java.com für weitere Installationshinweise."
+ MSG_LATER="Später"
+ MSG_VISIT_JAVA_DOT_COM="Java von Oracle"
+ MSG_VISIT_ADOPTOPENJDK="Java von AdoptOpenJDK"
+
+# Simplifyed Chinese localization
+elif [[ $LANG == zh* ]] ; then
+ MSG_ERROR_LAUNCHING="无法启动 '${CFBundleName}'."
+ MSG_MISSING_MAINCLASS="没有指定 'MainClass'！\nJava程序无法启动!"
+ MSG_JVMVERSION_REQ_INVALID="Java版本参数语法错误: %s\n请联系该应用的开发者。"
+ MSG_NO_SUITABLE_JAVA="没有在系统中找到合适的Java版本！\n必须安装Java %s才能够使用该程序！"
+ MSG_JAVA_VERSION_OR_LATER="及以上版本"
+ MSG_JAVA_VERSION_LATEST="（最新版本）"
+ MSG_JAVA_VERSION_MAX="最高为 %s"
+ MSG_NO_SUITABLE_JAVA_CHECK="请确保系统中安装了所需的Java版本"
+ MSG_INSTALL_JAVA="你需要在Mac中安装Java运行环境！\n访问 java.com 了解如何安装。"
+ MSG_LATER="稍后"
+ MSG_VISIT_JAVA_DOT_COM="Java by Oracle"
+ MSG_VISIT_ADOPTOPENJDK="Java by AdoptOpenJDK"
+
+# English default localization
+else
+ MSG_ERROR_LAUNCHING="ERROR launching '${CFBundleName}'."
+ MSG_MISSING_MAINCLASS="'MainClass' isn't specified!\nJava application cannot be started!"
+ MSG_JVMVERSION_REQ_INVALID="The syntax of the required Java version is invalid: %s\nPlease contact the App developer."
+ MSG_NO_SUITABLE_JAVA="No suitable Java version found on your system!\nThis program requires Java %s"
+ MSG_JAVA_VERSION_OR_LATER="or later"
+ MSG_JAVA_VERSION_LATEST="(latest update)"
+ MSG_JAVA_VERSION_MAX="up to %s"
+ MSG_NO_SUITABLE_JAVA_CHECK="Make sure you install the required Java version."
+ MSG_INSTALL_JAVA="You need to have JAVA installed on your Mac!\nVisit java.com for installation instructions..."
+ MSG_LATER="Later"
+ MSG_VISIT_JAVA_DOT_COM="Java by Oracle"
+ MSG_VISIT_ADOPTOPENJDK="Java by AdoptOpenJDK"
+fi
+
+
+
+# function 'get_java_version_from_cmd()'
+#
+# returns Java version string from 'java -version' command
+# works for both old (1.8) and new (9) version schema
+#
+# @param1 path to a java JVM executable
+# @return the Java version number as displayed in 'java -version' command
+################################################################################
+function get_java_version_from_cmd() {
+ # second sed command strips " and -ea from the version string
+ echo $("$1" -version 2>&1 | awk '/version/{print $3}' | sed -E 's/"//g;s/-ea//g')
+}
+
+
+# function 'extract_java_major_version()'
+#
+# extract Java major version from a version string
+#
+# @param1 a Java version number ('1.8.0_45') or requirement string ('1.8+')
+# @return the major version (e.g. '7', '8' or '9', etc.)
+################################################################################
+function extract_java_major_version() {
+ echo $(echo "$1" | sed -E 's/^1\.//;s/^([0-9]+)(-ea|(\.[0-9_.]{1,7})?)(-b[0-9]+-[0-9]+)?[+*]?$/\1/')
+}
+
+
+# function 'get_comparable_java_version()'
+#
+# return comparable version for a Java version number or requirement string
+#
+# @param1 a Java version number ('1.8.0_45') or requirement string ('1.8+')
+# @return an 8 digit numeral ('1.8.0_45'->'08000045'; '9.1.13'->'09001013')
+################################################################################
+function get_comparable_java_version() {
+ # cleaning: 1) remove leading '1.'; 2) remove build string (e.g. '-b14-468'); 3) remove 'a-Z' and '-*+' (e.g. '-ea'); 4) replace '_' with '.'
+ local cleaned=$(echo "$1" | sed -E 's/^1\.//g;s/-b[0-9]+-[0-9]+$//g;s/[a-zA-Z+*\-]//g;s/_/./g')
+ # splitting at '.' into an array
+ local arr=( ${cleaned//./ } )
+ # echo a string with left padded version numbers
+ echo "$(printf '%02s' ${arr[0]})$(printf '%03s' ${arr[1]})$(printf '%03s' ${arr[2]})"
+}
+
+
+# function 'is_valid_requirement_pattern()'
+#
+# check whether the Java requirement is a valid requirement pattern
+#
+# supported requirements are for example:
+# - 1.6 requires Java 6 (any update) [1.6, 1.6.0_45, 1.6.0_88]
+# - 1.6* requires Java 6 (any update) [1.6, 1.6.0_45, 1.6.0_88]
+# - 1.6+ requires Java 6 or higher [1.6, 1.6.0_45, 1.8, 9, etc.]
+# - 1.6.0 requires Java 6 (any update) [1.6, 1.6.0_45, 1.6.0_88]
+# - 1.6.0_45 requires Java 6u45 [1.6.0_45]
+# - 1.6.0_45+ requires Java 6u45 or higher [1.6.0_45, 1.6.0_88, 1.8, etc.]
+# - 9 requires Java 9 (any update) [9.0.*, 9.1, 9.3, etc.]
+# - 9* requires Java 9 (any update) [9.0.*, 9.1, 9.3, etc.]
+# - 9+ requires Java 9 or higher [9.0, 9.1, 10, etc.]
+# - 9.1 requires Java 9.1 (any update) [9.1.*, 9.1.2, 9.1.13, etc.]
+# - 9.1* requires Java 9.1 (any update) [9.1.*, 9.1.2, 9.1.13, etc.]
+# - 9.1+ requires Java 9.1 or higher [9.1, 9.2, 10, etc.]
+# - 9.1.3 requires Java 9.1.3 [9.1.3]
+# - 9.1.3* requires Java 9.1.3 (any update) [9.1.3]
+# - 9.1.3+ requires Java 9.1.3 or higher [9.1.3, 9.1.4, 9.2.*, 10, etc.]
+# - 10-ea requires Java 10 (early access release)
+#
+# unsupported requirement patterns are for example:
+# - 1.2, 1.3, 1.9 Java 2, 3 are not supported
+# - 1.9 Java 9 introduced a new versioning scheme
+# - 6u45 known versioning syntax, but unsupported
+# - 9-ea*, 9-ea+ early access releases paired with */+
+# - 9., 9.*, 9.+ version ending with a .
+# - 9.1., 9.1.*, 9.1.+ version ending with a .
+# - 9.3.5.6 4 part version number is unsupported
+#
+# @param1 a Java requirement string ('1.8+')
+# @return boolean exit code: 0 (is valid), 1 (is not valid)
+################################################################################
+function is_valid_requirement_pattern() {
+ local java_req=$1
+ java8pattern='1\.[4-8](\.[0-9]+)?(\.0_[0-9]+)?[*+]?'
+ java9pattern='(9|1[0-9])(-ea|[*+]|(\.[0-9]+){1,2}[*+]?)?'
+ # test matches either old Java versioning scheme (up to 1.8) or new scheme (starting with 9)
+ if [[ ${java_req} =~ ^(${java8pattern}|${java9pattern})$ ]]; then
+ return 0
+ else
+ return 1
+ fi
+}
+
+
+
+# determine which JVM to use
+############################################
+
+# default Apple JRE plugin path (< 1.6)
+apple_jre_plugin="/Library/Java/Home/bin/java"
+apple_jre_version=$(get_java_version_from_cmd "${apple_jre_plugin}")
+# default Oracle JRE plugin path (>= 1.7)
+oracle_jre_plugin="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"
+oracle_jre_version=$(get_java_version_from_cmd "${oracle_jre_plugin}")
+
+
+# first check system variable "$JAVA_HOME" -> has precedence over any other System JVM
+stub_logger '[JavaSearch] Checking for $JAVA_HOME ...'
+if [ -n "$JAVA_HOME" ] ; then
+ stub_logger "[JavaSearch] ... found JAVA_HOME with value $JAVA_HOME"
+
+ # PR 26: Allow specifying "$JAVA_HOME" relative to "$AppPackageFolder"
+ # which allows for bundling a custom version of Java inside your app!
+ if [[ $JAVA_HOME == /* ]] ; then
+ # if "$JAVA_HOME" starts with a Slash it's an absolute path
+ JAVACMD="$JAVA_HOME/bin/java"
+ else
+ # otherwise it's a relative path to "$AppPackageFolder"
+ JAVACMD="$AppPackageFolder/$JAVA_HOME/bin/java"
+ fi
+ JAVACMD_version=$(get_comparable_java_version $(get_java_version_from_cmd "${JAVACMD}"))
+else
+ stub_logger "[JavaSearch] ... didn't found JAVA_HOME"
+fi
+
+
+# check for any other or a specific Java version
+# also if $JAVA_HOME exists but isn't executable
+if [ -z "${JAVACMD}" ] || [ ! -x "${JAVACMD}" ] ; then
+ stub_logger "[JavaSearch] Checking for JavaVirtualMachines on the system ..."
+ # reset variables
+ JAVACMD=""
+ JAVACMD_version=""
+
+ # first check whether JVMVersion string is a valid requirement string
+ if [ ! -z "${JVMVersion}" ] && ! is_valid_requirement_pattern ${JVMVersion} ; then
+ MSG_JVMVERSION_REQ_INVALID_EXPANDED=$(printf "${MSG_JVMVERSION_REQ_INVALID}" "${JVMVersion}")
+ # log exit cause
+ stub_logger "[EXIT 4] ${MSG_JVMVERSION_REQ_INVALID_EXPANDED}"
+ # display error message with AppleScript
+ osascript -e "tell application \"System Events\" to display dialog \"${MSG_ERROR_LAUNCHING}\n\n${MSG_JVMVERSION_REQ_INVALID_EXPANDED}\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1${DialogWithIcon}"
+ # exit with error
+ exit 4
+ fi
+ # then check whether JVMMaxVersion string is a valid requirement string
+ if [ ! -z "${JVMMaxVersion}" ] && ! is_valid_requirement_pattern ${JVMMaxVersion} ; then
+ MSG_JVMVERSION_REQ_INVALID_EXPANDED=$(printf "${MSG_JVMVERSION_REQ_INVALID}" "${JVMMaxVersion}")
+ # log exit cause
+ stub_logger "[EXIT 5] ${MSG_JVMVERSION_REQ_INVALID_EXPANDED}"
+ # display error message with AppleScript
+ osascript -e "tell application \"System Events\" to display dialog \"${MSG_ERROR_LAUNCHING}\n\n${MSG_JVMVERSION_REQ_INVALID_EXPANDED}\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1${DialogWithIcon}"
+ # exit with error
+ exit 5
+ fi
+
+
+ # find installed JavaVirtualMachines (JDK + JRE)
+ allJVMs=()
+ # read JDK's from '/usr/libexec/java_home -V' command
+ while read -r line; do
+ version=$(echo $line | awk -F $',' '{print $1;}')
+ path=$(echo $line | awk -F $'" ' '{print $2;}')
+ path+="/bin/java"
+ allJVMs+=("$version:$path")
+ done < <(/usr/libexec/java_home -V 2>&1 | grep '^[[:space:]]')
+ # unset while loop variables
+ unset version path
+
+ # add Apple JRE if available
+ if [ -x "${apple_jre_plugin}" ] ; then
+ allJVMs+=("$apple_jre_version:$apple_jre_plugin")
+ fi
+
+ # add Oracle JRE if available
+ if [ -x "${oracle_jre_plugin}" ] ; then
+ allJVMs+=("$oracle_jre_version:$oracle_jre_plugin")
+ fi
+
+ # debug output
+ for i in "${allJVMs[@]}"
+ do
+ stub_logger "[JavaSearch] ... found JVM: $i"
+ done
+
+
+ # determine JVMs matching the min/max version requirement
+ minC=$(get_comparable_java_version ${JVMVersion})
+ maxC=$(get_comparable_java_version ${JVMMaxVersion})
+ matchingJVMs=()
+
+ for i in "${allJVMs[@]}"
+ do
+ # split JVM string at ':' delimiter to retain spaces in $path substring
+ IFS=: arr=($i) ; unset IFS
+ # [0] JVM version number
+ ver=${arr[0]}
+ # comparable JVM version number
+ comp=$(get_comparable_java_version $ver)
+ # [1] JVM path
+ path="${arr[1]}"
+ # construct string item for adding to the "matchingJVMs" array
+ item="$comp:$ver:$path"
+
+ # pre-requisite: current version number needs to be greater than min version number
+ if [ "$comp" -ge "$minC" ] ; then
+
+ # perform max version checks if max version requirement is present
+ if [ ! -z ${JVMMaxVersion} ] ; then
+
+ # max version requirement ends with '*' modifier
+ if [[ ${JVMMaxVersion} == *\* ]] ; then
+
+ # use the '*' modifier from the max version string as wildcard for a 'starts with' comparison
+ # and check whether the current version number starts with the max version wildcard string
+ if [[ ${ver} == ${JVMMaxVersion} ]]; then
+ matchingJVMs+=("$item")
+
+ # or whether the current comparable version is lower than the comparable max version
+ elif [ "$comp" -le "$maxC" ] ; then
+ matchingJVMs+=("$item")
+ fi
+
+ # max version requirement ends with '+' modifier -> always add this version if it's greater than $min
+ # because a max requirement with + modifier doesn't make sense
+ elif [[ ${JVMMaxVersion} == *+ ]] ; then
+ matchingJVMs+=("$item")
+
+ # matches 6 zeros at the end of the max version string (e.g. for 1.8, 9)
+ # -> then the max version string should be treated like with a '*' modifier at the end
+ #elif [[ ${maxC} =~ ^[0-9]{2}0{6}$ ]] && [ "$comp" -le $(( ${maxC#0} + 999 )) ] ; then
+ # matchingJVMs+=("$item")
+
+ # matches 3 zeros at the end of the max version string (e.g. for 9.1, 10.3)
+ # -> then the max version string should be treated like with a '*' modifier at the end
+ #elif [[ ${maxC} =~ ^[0-9]{5}0{3}$ ]] && [ "$comp" -le "${maxC}" ] ; then
+ # matchingJVMs+=("$item")
+
+ # matches standard requirements without modifier
+ elif [ "$comp" -le "$maxC" ]; then
+ matchingJVMs+=("$item")
+ fi
+
+ # no max version requirement:
+
+ # min version requirement ends with '+' modifier
+ # -> always add the current version because it's greater than $min
+ elif [[ ${JVMVersion} == *+ ]] ; then
+ matchingJVMs+=("$item")
+
+ # min version requirement ends with '*' modifier
+ # -> use the '*' modifier from the min version string as wildcard for a 'starts with' comparison
+ # and check whether the current version number starts with the min version wildcard string
+ elif [[ ${JVMVersion} == *\* ]] ; then
+ if [[ ${ver} == ${JVMVersion} ]] ; then
+ matchingJVMs+=("$item")
+ fi
+
+ # compare the min version against the current version with an additional * wildcard for a 'starts with' comparison
+ # -> e.g. add 1.8.0_44 when the requirement is 1.8
+ elif [[ ${ver} == ${JVMVersion}* ]] ; then
+ matchingJVMs+=("$item")
+ fi
+ fi
+ done
+ # unset for loop variables
+ unset arr ver comp path item
+
+ # debug output
+ for i in "${matchingJVMs[@]}"
+ do
+ stub_logger "[JavaSearch] ... ... matches all requirements: $i"
+ done
+
+
+ # sort the matching JavaVirtualMachines by version number
+ # https://stackoverflow.com/a/11789688/1128689
+ IFS=$'\n' matchingJVMs=($(sort -nr <<<"${matchingJVMs[*]}"))
+ unset IFS
+
+
+ # get the highest matching JVM
+ for ((i = 0; i < ${#matchingJVMs[@]}; i++));
+ do
+ # split JVM string at ':' delimiter to retain spaces in $path substring
+ IFS=: arr=(${matchingJVMs[$i]}) ; unset IFS
+ # [0] comparable JVM version number
+ comp=${arr[0]}
+ # [1] JVM version number
+ ver=${arr[1]}
+ # [2] JVM path
+ path="${arr[2]}"
+
+ # use current value as JAVACMD if it's executable
+ if [ -x "$path" ] ; then
+ JAVACMD="$path"
+ JAVACMD_version=$comp
+ break
+ fi
+ done
+ # unset for loop variables
+ unset arr comp ver path
+fi
+
+# log the Java Command and the extracted version number
+stub_logger "[JavaCommand] '$JAVACMD'"
+stub_logger "[JavaVersion] $(get_java_version_from_cmd "${JAVACMD}")${JAVACMD_version:+ / $JAVACMD_version}"
+
+
+
+if [ -z "${JAVACMD}" ] || [ ! -x "${JAVACMD}" ] ; then
+
+ # different error messages when a specific JVM was required
+ if [ ! -z "${JVMVersion}" ] ; then
+ # display human readable java version (#28)
+ java_version_hr=$(echo ${JVMVersion} | sed -E 's/^1\.([0-9+*]+)$/ \1/g' | sed "s/+/ ${MSG_JAVA_VERSION_OR_LATER}/;s/*/ ${MSG_JAVA_VERSION_LATEST}/")
+ MSG_NO_SUITABLE_JAVA_EXPANDED=$(printf "${MSG_NO_SUITABLE_JAVA}" "${java_version_hr}").
+
+ if [ ! -z "${JVMMaxVersion}" ] ; then
+ java_version_hr=$(extract_java_major_version ${JVMVersion})
+ java_version_max_hr=$(echo ${JVMMaxVersion} | sed -E 's/^1\.([0-9+*]+)$/ \1/g' | sed "s/+//;s/*/ ${MSG_JAVA_VERSION_LATEST}/")
+ MSG_NO_SUITABLE_JAVA_EXPANDED="$(printf "${MSG_NO_SUITABLE_JAVA}" "${java_version_hr}") $(printf "${MSG_JAVA_VERSION_MAX}" "${java_version_max_hr}")"
+ fi
+
+ # log exit cause
+ stub_logger "[EXIT 3] ${MSG_NO_SUITABLE_JAVA_EXPANDED}"
+
+ # display error message with AppleScript
+ osascript -e "tell application \"System Events\" to display dialog \"${MSG_ERROR_LAUNCHING}\n\n${MSG_NO_SUITABLE_JAVA_EXPANDED}\n${MSG_NO_SUITABLE_JAVA_CHECK}\" with title \"${CFBundleName}\" buttons {\" OK \", \"${MSG_VISIT_JAVA_DOT_COM}\", \"${MSG_VISIT_ADOPTOPENJDK}\"} default button 1${DialogWithIcon}" \
+ -e "set response to button returned of the result" \
+ -e "if response is \"${MSG_VISIT_JAVA_DOT_COM}\" then open location \"https://www.java.com/download/\"" \
+ -e "if response is \"${MSG_VISIT_ADOPTOPENJDK}\" then open location \"https://adoptopenjdk.net/releases.html\""
+ # exit with error
+ exit 3
+
+ else
+ # log exit cause
+ stub_logger "[EXIT 1] ${MSG_ERROR_LAUNCHING}"
+ # display error message with AppleScript
+ osascript -e "tell application \"System Events\" to display dialog \"${MSG_ERROR_LAUNCHING}\n\n${MSG_INSTALL_JAVA}\" with title \"${CFBundleName}\" buttons {\"${MSG_LATER}\", \"${MSG_VISIT_JAVA_DOT_COM}\", \"${MSG_VISIT_ADOPTOPENJDK}\"} default button 1${DialogWithIcon}" \
+ -e "set response to button returned of the result" \
+ -e "if response is \"${MSG_VISIT_JAVA_DOT_COM}\" then open location \"https://www.java.com/download/\"" \
+ -e "if response is \"${MSG_VISIT_ADOPTOPENJDK}\" then open location \"https://adoptopenjdk.net/releases.html\""
+ # exit with error
+ exit 1
+ fi
+fi
+
+
+
+# MainClass check
+############################################
+
+if [ -z "${JVMMainClass}" ]; then
+ # log exit cause
+ stub_logger "[EXIT 2] ${MSG_MISSING_MAINCLASS}"
+ # display error message with AppleScript
+ osascript -e "tell application \"System Events\" to display dialog \"${MSG_ERROR_LAUNCHING}\n\n${MSG_MISSING_MAINCLASS}\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1${DialogWithIcon}"
+ # exit with error
+ exit 2
+fi
+
+
+
+# execute $JAVACMD and do some preparation
+############################################
+
+# enable drag&drop to the dock icon
+export CFProcessPath="$0"
+
+# remove Apples ProcessSerialNumber from passthru arguments (#39)
+if [[ "$*" == -psn* ]] ; then
+ ArgsPassthru=()
+else
+ ArgsPassthru=("$@")
+fi
+
+# change to Working Directory based upon Apple/Oracle Plist info
+cd "${WorkingDirectory}" || exit 13
+stub_logger "[WorkingDirectory] ${WorkingDirectory}"
+
+# execute Java and set
+# - classpath
+# - splash image
+# - dock icon
+# - app name
+# - JVM options / properties (-D)
+# - JVM default options (-X)
+# - main class
+# - main class arguments
+# - passthrough arguments from Terminal or Drag'n'Drop to Finder icon
+stub_logger "[Exec] \"$JAVACMD\" -cp \"${JVMClassPath}\" -splash:\"${ResourcesFolder}/${JVMSplashFile}\" -Xdock:icon=\"${ResourcesFolder}/${CFBundleIconFile}\" -Xdock:name=\"${CFBundleName}\" ${JVMOptionsArr:+$(printf "'%s' " "${JVMOptionsArr[@]}") }${JVMDefaultOptions:+$JVMDefaultOptions }${JVMMainClass}${MainArgsArr:+ $(printf "'%s' " "${MainArgsArr[@]}")}${ArgsPassthru:+ $(printf "'%s' " "${ArgsPassthru[@]}")}"
+exec "${JAVACMD}" \
+ -cp "${JVMClassPath}" \
+ -splash:"${ResourcesFolder}/${JVMSplashFile}" \
+ -Xdock:icon="${ResourcesFolder}/${CFBundleIconFile}" \
+ -Xdock:name="${CFBundleName}" \
+ ${JVMOptionsArr:+"${JVMOptionsArr[@]}" }\
+ ${JVMDefaultOptions:+$JVMDefaultOptions }\
+ "${JVMMainClass}"\
+ ${MainArgsArr:+ "${MainArgsArr[@]}"}\
+ ${ArgsPassthru:+ "${ArgsPassthru[@]}"}
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..95ad043e
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,75 @@
+
+
+ 4.0.0
+ de.applejuicenet.client
+ AJClientGUI
+ 1
+ pom
+
+
+ modules/AJCoreGUI
+ modules/logviewer
+ modules/versionchecker
+ modules/standardpwdlpolicy
+
+
+
+
+
+ false
+ maven-antrun-plugin
+ 3.0.0
+
+
+ antrun.package.archive
+ install
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ antrun.package.osx
+ install
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AJClientGUI/AJCoreGUI.exe b/resources/AJCoreGUI.exe
similarity index 100%
rename from AJClientGUI/AJCoreGUI.exe
rename to resources/AJCoreGUI.exe
diff --git a/AJClientGUI/icons/abbrechen.gif b/resources/icons/abbrechen.gif
similarity index 100%
rename from AJClientGUI/icons/abbrechen.gif
rename to resources/icons/abbrechen.gif
diff --git a/AJClientGUI/icons/about.gif b/resources/icons/about.gif
similarity index 100%
rename from AJClientGUI/icons/about.gif
rename to resources/icons/about.gif
diff --git a/AJClientGUI/icons/aelter24h.gif b/resources/icons/aelter24h.gif
similarity index 100%
rename from AJClientGUI/icons/aelter24h.gif
rename to resources/icons/aelter24h.gif
diff --git a/AJClientGUI/icons/amigaossymbol.gif b/resources/icons/amigaossymbol.gif
similarity index 100%
rename from AJClientGUI/icons/amigaossymbol.gif
rename to resources/icons/amigaossymbol.gif
diff --git a/resources/icons/applejuice.gif b/resources/icons/applejuice.gif
new file mode 100644
index 00000000..22255775
Binary files /dev/null and b/resources/icons/applejuice.gif differ
diff --git a/AJClientGUI/icons/applejuicebanner.gif b/resources/icons/applejuicebanner.gif
similarity index 100%
rename from AJClientGUI/icons/applejuicebanner.gif
rename to resources/icons/applejuicebanner.gif
diff --git a/AJClientGUI/icons/applejuiceinfobanner.gif b/resources/icons/applejuiceinfobanner.gif
similarity index 100%
rename from AJClientGUI/icons/applejuiceinfobanner.gif
rename to resources/icons/applejuiceinfobanner.gif
diff --git a/AJClientGUI/icons/archive.gif b/resources/icons/archive.gif
similarity index 100%
rename from AJClientGUI/icons/archive.gif
rename to resources/icons/archive.gif
diff --git a/AJClientGUI/icons/bereinigen.gif b/resources/icons/bereinigen.gif
similarity index 100%
rename from AJClientGUI/icons/bereinigen.gif
rename to resources/icons/bereinigen.gif
diff --git a/resources/icons/border_invalid.gif b/resources/icons/border_invalid.gif
new file mode 100755
index 00000000..f4429743
Binary files /dev/null and b/resources/icons/border_invalid.gif differ
diff --git a/AJClientGUI/icons/browsen.gif b/resources/icons/browsen.gif
similarity index 100%
rename from AJClientGUI/icons/browsen.gif
rename to resources/icons/browsen.gif
diff --git a/AJClientGUI/icons/chat.gif b/resources/icons/chat.gif
similarity index 100%
rename from AJClientGUI/icons/chat.gif
rename to resources/icons/chat.gif
diff --git a/AJClientGUI/icons/clipboard.gif b/resources/icons/clipboard.gif
similarity index 100%
rename from AJClientGUI/icons/clipboard.gif
rename to resources/icons/clipboard.gif
diff --git a/AJClientGUI/icons/cool.gif b/resources/icons/cool.gif
similarity index 100%
rename from AJClientGUI/icons/cool.gif
rename to resources/icons/cool.gif
diff --git a/AJClientGUI/icons/debug.gif b/resources/icons/debug.gif
similarity index 100%
rename from AJClientGUI/icons/debug.gif
rename to resources/icons/debug.gif
diff --git a/AJClientGUI/icons/decrease.gif b/resources/icons/decrease.gif
similarity index 100%
rename from AJClientGUI/icons/decrease.gif
rename to resources/icons/decrease.gif
diff --git a/AJClientGUI/icons/deutsch.gif b/resources/icons/deutsch.gif
similarity index 100%
rename from AJClientGUI/icons/deutsch.gif
rename to resources/icons/deutsch.gif
diff --git a/AJClientGUI/icons/diskette.gif b/resources/icons/diskette.gif
similarity index 100%
rename from AJClientGUI/icons/diskette.gif
rename to resources/icons/diskette.gif
diff --git a/AJClientGUI/icons/download.gif b/resources/icons/download.gif
similarity index 100%
rename from AJClientGUI/icons/download.gif
rename to resources/icons/download.gif
diff --git a/AJClientGUI/icons/eek.gif b/resources/icons/eek.gif
similarity index 100%
rename from AJClientGUI/icons/eek.gif
rename to resources/icons/eek.gif
diff --git a/AJClientGUI/icons/erneuern.gif b/resources/icons/erneuern.gif
similarity index 100%
rename from AJClientGUI/icons/erneuern.gif
rename to resources/icons/erneuern.gif
diff --git a/AJClientGUI/icons/firewall.gif b/resources/icons/firewall.gif
similarity index 100%
rename from AJClientGUI/icons/firewall.gif
rename to resources/icons/firewall.gif
diff --git a/AJClientGUI/icons/folderopen.gif b/resources/icons/folderopen.gif
similarity index 100%
rename from AJClientGUI/icons/folderopen.gif
rename to resources/icons/folderopen.gif
diff --git a/AJClientGUI/icons/freebsdsymbol.gif b/resources/icons/freebsdsymbol.gif
similarity index 100%
rename from AJClientGUI/icons/freebsdsymbol.gif
rename to resources/icons/freebsdsymbol.gif
diff --git a/AJClientGUI/icons/hide.gif b/resources/icons/hide.gif
similarity index 100%
rename from AJClientGUI/icons/hide.gif
rename to resources/icons/hide.gif
diff --git a/AJClientGUI/icons/hint.gif b/resources/icons/hint.gif
similarity index 100%
rename from AJClientGUI/icons/hint.gif
rename to resources/icons/hint.gif
diff --git a/AJClientGUI/icons/image.gif b/resources/icons/image.gif
similarity index 100%
rename from AJClientGUI/icons/image.gif
rename to resources/icons/image.gif
diff --git a/AJClientGUI/icons/increase.gif b/resources/icons/increase.gif
similarity index 100%
rename from AJClientGUI/icons/increase.gif
rename to resources/icons/increase.gif
diff --git a/AJClientGUI/icons/info.gif b/resources/icons/info.gif
similarity index 100%
rename from AJClientGUI/icons/info.gif
rename to resources/icons/info.gif
diff --git a/AJClientGUI/icons/irixsymbol.gif b/resources/icons/irixsymbol.gif
similarity index 100%
rename from AJClientGUI/icons/irixsymbol.gif
rename to resources/icons/irixsymbol.gif
diff --git a/AJClientGUI/icons/iso.gif b/resources/icons/iso.gif
similarity index 100%
rename from AJClientGUI/icons/iso.gif
rename to resources/icons/iso.gif
diff --git a/AJClientGUI/icons/juenger24h.gif b/resources/icons/juenger24h.gif
similarity index 100%
rename from AJClientGUI/icons/juenger24h.gif
rename to resources/icons/juenger24h.gif
diff --git a/AJClientGUI/icons/laufwerk.gif b/resources/icons/laufwerk.gif
similarity index 100%
rename from AJClientGUI/icons/laufwerk.gif
rename to resources/icons/laufwerk.gif
diff --git a/AJClientGUI/icons/led_gray.gif b/resources/icons/led_gray.gif
similarity index 100%
rename from AJClientGUI/icons/led_gray.gif
rename to resources/icons/led_gray.gif
diff --git a/AJClientGUI/icons/led_green.gif b/resources/icons/led_green.gif
similarity index 100%
rename from AJClientGUI/icons/led_green.gif
rename to resources/icons/led_green.gif
diff --git a/AJClientGUI/icons/led_red.gif b/resources/icons/led_red.gif
similarity index 100%
rename from AJClientGUI/icons/led_red.gif
rename to resources/icons/led_red.gif
diff --git a/AJClientGUI/icons/linuxsymbol.gif b/resources/icons/linuxsymbol.gif
similarity index 100%
rename from AJClientGUI/icons/linuxsymbol.gif
rename to resources/icons/linuxsymbol.gif
diff --git a/AJClientGUI/icons/macsymbol.gif b/resources/icons/macsymbol.gif
similarity index 100%
rename from AJClientGUI/icons/macsymbol.gif
rename to resources/icons/macsymbol.gif
diff --git a/AJClientGUI/icons/meinshare.gif b/resources/icons/meinshare.gif
similarity index 100%
rename from AJClientGUI/icons/meinshare.gif
rename to resources/icons/meinshare.gif
diff --git a/AJClientGUI/icons/mmonitor.gif b/resources/icons/mmonitor.gif
similarity index 100%
rename from AJClientGUI/icons/mmonitor.gif
rename to resources/icons/mmonitor.gif
diff --git a/AJClientGUI/icons/movie.gif b/resources/icons/movie.gif
similarity index 100%
rename from AJClientGUI/icons/movie.gif
rename to resources/icons/movie.gif
diff --git a/AJClientGUI/icons/netwaresymbol.gif b/resources/icons/netwaresymbol.gif
similarity index 100%
rename from AJClientGUI/icons/netwaresymbol.gif
rename to resources/icons/netwaresymbol.gif
diff --git a/AJClientGUI/icons/netzwerk.gif b/resources/icons/netzwerk.gif
similarity index 100%
rename from AJClientGUI/icons/netzwerk.gif
rename to resources/icons/netzwerk.gif
diff --git a/AJClientGUI/icons/neuedateiliste.gif b/resources/icons/neuedateiliste.gif
similarity index 100%
rename from AJClientGUI/icons/neuedateiliste.gif
rename to resources/icons/neuedateiliste.gif
diff --git a/AJClientGUI/icons/notshared.gif b/resources/icons/notshared.gif
similarity index 100%
rename from AJClientGUI/icons/notshared.gif
rename to resources/icons/notshared.gif
diff --git a/AJClientGUI/icons/openbsdsymbol.gif b/resources/icons/openbsdsymbol.gif
similarity index 100%
rename from AJClientGUI/icons/openbsdsymbol.gif
rename to resources/icons/openbsdsymbol.gif
diff --git a/AJClientGUI/icons/opt_ansicht.gif b/resources/icons/opt_ansicht.gif
similarity index 100%
rename from AJClientGUI/icons/opt_ansicht.gif
rename to resources/icons/opt_ansicht.gif
diff --git a/AJClientGUI/icons/opt_passwort.gif b/resources/icons/opt_passwort.gif
similarity index 100%
rename from AJClientGUI/icons/opt_passwort.gif
rename to resources/icons/opt_passwort.gif
diff --git a/AJClientGUI/icons/opt_plugins.gif b/resources/icons/opt_plugins.gif
similarity index 100%
rename from AJClientGUI/icons/opt_plugins.gif
rename to resources/icons/opt_plugins.gif
diff --git a/AJClientGUI/icons/opt_proxy.gif b/resources/icons/opt_proxy.gif
similarity index 100%
rename from AJClientGUI/icons/opt_proxy.gif
rename to resources/icons/opt_proxy.gif
diff --git a/AJClientGUI/icons/opt_standard.gif b/resources/icons/opt_standard.gif
similarity index 100%
rename from AJClientGUI/icons/opt_standard.gif
rename to resources/icons/opt_standard.gif
diff --git a/AJClientGUI/icons/opt_verbindung.gif b/resources/icons/opt_verbindung.gif
similarity index 100%
rename from AJClientGUI/icons/opt_verbindung.gif
rename to resources/icons/opt_verbindung.gif
diff --git a/AJClientGUI/icons/optionen.gif b/resources/icons/optionen.gif
similarity index 100%
rename from AJClientGUI/icons/optionen.gif
rename to resources/icons/optionen.gif
diff --git a/AJClientGUI/icons/os2symbol.gif b/resources/icons/os2symbol.gif
similarity index 100%
rename from AJClientGUI/icons/os2symbol.gif
rename to resources/icons/os2symbol.gif
diff --git a/AJClientGUI/icons/partliste.gif b/resources/icons/partliste.gif
similarity index 100%
rename from AJClientGUI/icons/partliste.gif
rename to resources/icons/partliste.gif
diff --git a/AJClientGUI/icons/pause.gif b/resources/icons/pause.gif
similarity index 100%
rename from AJClientGUI/icons/pause.gif
rename to resources/icons/pause.gif
diff --git a/AJClientGUI/icons/pdf.gif b/resources/icons/pdf.gif
similarity index 100%
rename from AJClientGUI/icons/pdf.gif
rename to resources/icons/pdf.gif
diff --git a/AJClientGUI/icons/server.gif b/resources/icons/server.gif
similarity index 100%
rename from AJClientGUI/icons/server.gif
rename to resources/icons/server.gif
diff --git a/AJClientGUI/icons/serverloeschen.gif b/resources/icons/serverloeschen.gif
similarity index 100%
rename from AJClientGUI/icons/serverloeschen.gif
rename to resources/icons/serverloeschen.gif
diff --git a/AJClientGUI/icons/serverneu.gif b/resources/icons/serverneu.gif
similarity index 100%
rename from AJClientGUI/icons/serverneu.gif
rename to resources/icons/serverneu.gif
diff --git a/AJClientGUI/icons/serververbinden.gif b/resources/icons/serververbinden.gif
similarity index 100%
rename from AJClientGUI/icons/serververbinden.gif
rename to resources/icons/serververbinden.gif
diff --git a/AJClientGUI/icons/serververbunden.gif b/resources/icons/serververbunden.gif
similarity index 100%
rename from AJClientGUI/icons/serververbunden.gif
rename to resources/icons/serververbunden.gif
diff --git a/AJClientGUI/icons/serverversuche.gif b/resources/icons/serverversuche.gif
similarity index 100%
rename from AJClientGUI/icons/serverversuche.gif
rename to resources/icons/serverversuche.gif
diff --git a/AJClientGUI/icons/sharedwosub.gif b/resources/icons/sharedwosub.gif
similarity index 100%
rename from AJClientGUI/icons/sharedwosub.gif
rename to resources/icons/sharedwosub.gif
diff --git a/AJClientGUI/icons/sharedwsub.gif b/resources/icons/sharedwsub.gif
similarity index 100%
rename from AJClientGUI/icons/sharedwsub.gif
rename to resources/icons/sharedwsub.gif
diff --git a/AJClientGUI/icons/skull.gif b/resources/icons/skull.gif
similarity index 100%
rename from AJClientGUI/icons/skull.gif
rename to resources/icons/skull.gif
diff --git a/AJClientGUI/icons/somethingshared.gif b/resources/icons/somethingshared.gif
similarity index 100%
rename from AJClientGUI/icons/somethingshared.gif
rename to resources/icons/somethingshared.gif
diff --git a/AJClientGUI/icons/sound.gif b/resources/icons/sound.gif
similarity index 100%
rename from AJClientGUI/icons/sound.gif
rename to resources/icons/sound.gif
diff --git a/AJClientGUI/icons/soundoff.gif b/resources/icons/soundoff.gif
similarity index 100%
rename from AJClientGUI/icons/soundoff.gif
rename to resources/icons/soundoff.gif
diff --git a/AJClientGUI/icons/soundon.gif b/resources/icons/soundon.gif
similarity index 100%
rename from AJClientGUI/icons/soundon.gif
rename to resources/icons/soundon.gif
diff --git a/AJClientGUI/icons/speichern.gif b/resources/icons/speichern.gif
similarity index 100%
rename from AJClientGUI/icons/speichern.gif
rename to resources/icons/speichern.gif
diff --git a/AJClientGUI/icons/splashscreen.gif b/resources/icons/splashscreen.gif
similarity index 100%
rename from AJClientGUI/icons/splashscreen.gif
rename to resources/icons/splashscreen.gif
diff --git a/AJClientGUI/icons/splashscreen.properties b/resources/icons/splashscreen.properties
similarity index 100%
rename from AJClientGUI/icons/splashscreen.properties
rename to resources/icons/splashscreen.properties
diff --git a/AJClientGUI/icons/start.gif b/resources/icons/start.gif
similarity index 100%
rename from AJClientGUI/icons/start.gif
rename to resources/icons/start.gif
diff --git a/AJClientGUI/icons/suchen.gif b/resources/icons/suchen.gif
similarity index 100%
rename from AJClientGUI/icons/suchen.gif
rename to resources/icons/suchen.gif
diff --git a/AJClientGUI/icons/sunossymbol.gif b/resources/icons/sunossymbol.gif
similarity index 100%
rename from AJClientGUI/icons/sunossymbol.gif
rename to resources/icons/sunossymbol.gif
diff --git a/AJClientGUI/icons/text.gif b/resources/icons/text.gif
similarity index 100%
rename from AJClientGUI/icons/text.gif
rename to resources/icons/text.gif
diff --git a/AJClientGUI/icons/tree.gif b/resources/icons/tree.gif
similarity index 100%
rename from AJClientGUI/icons/tree.gif
rename to resources/icons/tree.gif
diff --git a/AJClientGUI/icons/treeIndirekt.gif b/resources/icons/treeIndirekt.gif
similarity index 100%
rename from AJClientGUI/icons/treeIndirekt.gif
rename to resources/icons/treeIndirekt.gif
diff --git a/AJClientGUI/icons/treeRoot.gif b/resources/icons/treeRoot.gif
similarity index 100%
rename from AJClientGUI/icons/treeRoot.gif
rename to resources/icons/treeRoot.gif
diff --git a/AJClientGUI/icons/treeUebertrage.gif b/resources/icons/treeUebertrage.gif
similarity index 100%
rename from AJClientGUI/icons/treeUebertrage.gif
rename to resources/icons/treeUebertrage.gif
diff --git a/AJClientGUI/icons/treeWarteschlange.gif b/resources/icons/treeWarteschlange.gif
similarity index 100%
rename from AJClientGUI/icons/treeWarteschlange.gif
rename to resources/icons/treeWarteschlange.gif
diff --git a/AJClientGUI/icons/umbenennen.gif b/resources/icons/umbenennen.gif
similarity index 100%
rename from AJClientGUI/icons/umbenennen.gif
rename to resources/icons/umbenennen.gif
diff --git a/AJClientGUI/icons/unbekanntsymbol.gif b/resources/icons/unbekanntsymbol.gif
similarity index 100%
rename from AJClientGUI/icons/unbekanntsymbol.gif
rename to resources/icons/unbekanntsymbol.gif
diff --git a/AJClientGUI/icons/update.gif b/resources/icons/update.gif
similarity index 100%
rename from AJClientGUI/icons/update.gif
rename to resources/icons/update.gif
diff --git a/AJClientGUI/icons/upload.gif b/resources/icons/upload.gif
similarity index 100%
rename from AJClientGUI/icons/upload.gif
rename to resources/icons/upload.gif
diff --git a/AJClientGUI/icons/verbinden.gif b/resources/icons/verbinden.gif
similarity index 100%
rename from AJClientGUI/icons/verbinden.gif
rename to resources/icons/verbinden.gif
diff --git a/AJClientGUI/icons/verbindungUnbekannt.gif b/resources/icons/verbindungUnbekannt.gif
similarity index 100%
rename from AJClientGUI/icons/verbindungUnbekannt.gif
rename to resources/icons/verbindungUnbekannt.gif
diff --git a/AJClientGUI/icons/verzeichnislink.gif b/resources/icons/verzeichnislink.gif
similarity index 100%
rename from AJClientGUI/icons/verzeichnislink.gif
rename to resources/icons/verzeichnislink.gif
diff --git a/AJClientGUI/icons/vlc.gif b/resources/icons/vlc.gif
similarity index 100%
rename from AJClientGUI/icons/vlc.gif
rename to resources/icons/vlc.gif
diff --git a/AJClientGUI/icons/warnung.gif b/resources/icons/warnung.gif
similarity index 100%
rename from AJClientGUI/icons/warnung.gif
rename to resources/icons/warnung.gif
diff --git a/AJClientGUI/icons/warten.gif b/resources/icons/warten.gif
similarity index 100%
rename from AJClientGUI/icons/warten.gif
rename to resources/icons/warten.gif
diff --git a/AJClientGUI/icons/web.gif b/resources/icons/web.gif
similarity index 100%
rename from AJClientGUI/icons/web.gif
rename to resources/icons/web.gif
diff --git a/AJClientGUI/icons/winsymbol.gif b/resources/icons/winsymbol.gif
similarity index 100%
rename from AJClientGUI/icons/winsymbol.gif
rename to resources/icons/winsymbol.gif
diff --git a/AJClientGUI/icons/wizardbanner.gif b/resources/icons/wizardbanner.gif
similarity index 100%
rename from AJClientGUI/icons/wizardbanner.gif
rename to resources/icons/wizardbanner.gif
diff --git a/AJClientGUI/icons/zielordner.gif b/resources/icons/zielordner.gif
similarity index 100%
rename from AJClientGUI/icons/zielordner.gif
rename to resources/icons/zielordner.gif
diff --git a/AJClientGUI/language/deutsch.gif b/resources/language/deutsch.gif
similarity index 100%
rename from AJClientGUI/language/deutsch.gif
rename to resources/language/deutsch.gif
diff --git a/AJClientGUI/language/deutsch.properties b/resources/language/deutsch.properties
similarity index 64%
rename from AJClientGUI/language/deutsch.properties
rename to resources/language/deutsch.properties
index bbb96228..0d4d6ab8 100644
--- a/AJClientGUI/language/deutsch.properties
+++ b/resources/language/deutsch.properties
@@ -1,48 +1,48 @@
#
#Mon Jan 12 09:26:29 CET 2009
-addserverform.caption=Server hinzuf\u00FCgen
+addserverform.caption=Server hinzufügen
addserverform.okbtn.caption=OK
addserverform.portlbl.caption=Port
addserverform.serverlbl.caption=DynIP vom Server
-assistant.backbutton.caption=Zur\u00FCck
+assistant.backbutton.caption=Zurück
assistant.caption=Willkommen bei Applejuice
-assistant.closebutton.caption=Schlie\u00DFen
+assistant.closebutton.caption=Schließen
assistant.finishtext=Ende
assistant.Label1.caption=Willkommen bei appleJuice
assistant.Label2.caption=Falls du appleJuice vorher noch nicht benutzt hast, kann dir dieser Assistent bei den Einstellungen helfen.
-assistant.Label3.caption=Fortgeschrittene Anwender k\u00F6nnen die Einstellungen in den Optionen vornehmen. Klicke auf Schie\u00DFen um den Assistent jederzeit zu beenden.
-assistant.Label4.caption=F\u00FCr die optimale Performance ben\u00F6tigt appleJuice noch ein paar kleine Informationen \u00FCber deine Internetverbindung.
-assistant.Label5.caption=W\u00E4hle die Art der Verbindung\:
-assistant.Label6.caption=Das wars \! appleJuice ist konfiguriert, um auf deinen Computer zu arbeiten. Solltest du die Einstellungen wieder \u00E4ndern wollen, kannst du den Assistenten durch den Link auf der Startseite wieder starten. Viel Spa\u00DF mit appleJuice \!\!\! ;-)
+assistant.Label3.caption=Fortgeschrittene Anwender können die Einstellungen in den Optionen vornehmen. Klicke auf Schießen um den Assistent jederzeit zu beenden.
+assistant.Label4.caption=Für die optimale Performance benötigt appleJuice noch ein paar kleine Informationen über deine Internetverbindung.
+assistant.Label5.caption=Wäle die Art der Verbindung\:
+assistant.Label6.caption=Das wars \! appleJuice ist konfiguriert, um auf deinen Computer zu arbeiten. Solltest du die Einstellungen wieder ändern wollen, kannst du den Assistenten durch den Link auf der Startseite wieder starten. Viel Spaß mit appleJuice \!\!\! ;-)
assistant.Label7.caption=Bitte gebe deinen Benutzernamen ein. "nonick" ist ein nicht erlaubter Benutzername.
-assistant.Label8.caption=Bitte w\u00E4hle eine Sprache.
+assistant.Label8.caption=Bitte wäle eine Sprache.
assistant.nextbutton.caption=Weiter
assistant.nexttext=Weiter
chatform.caption=Chat
chatform.sendbtn.caption=Senden
-closeform.caption=Schlie\u00DFen
-closeform.closecoreradio.caption=GUI und Core schlie\u00DFen
-closeform.closeradio.caption=GUI schlie\u00DFen
+closeform.caption=Schließen
+closeform.closecoreradio.caption=GUI und Core schließen
+closeform.closeradio.caption=GUI schließen
closeform.minimizeradio.caption=minimiere ins Tray
closeform.neveraskbox.caption=Nie wieder Fragen
closeform.okbtn.caption=OK
closeform.reconnectradio.caption=Zum Core neu verbinden
connect.Button1.caption=OK
-connect.Button2.caption=Abbruch/Schlie\u00DFen
+connect.Button2.caption=Abbruch/Schließen
connect.caption=Verbinde zum Core....
connect.CheckBox1.caption=Nie wieder fragen
-connect.infolabel.caption=Du hast 127.0.0.1 f\u00FCr den Core eingegeben, aber er wurde nicht gefunden. Der Core wird gestartet, wenn du auf OK klickst.
+connect.infolabel.caption=Du hast 127.0.0.1 für den Core eingegeben, aber er wurde nicht gefunden. Der Core wird gestartet, wenn du auf OK klickst.
connect.Label1.caption=Core
-connect.Label2.caption=Pa\u00DFwort
+connect.Label2.caption=Paßwort
connect.remember.caption=Speichern
einstform.autoconn.caption=Automatisch Verbinden
einstform.browallow.caption=Erlaube das Browsen
einstform.Button1.caption=OK
einstform.Button2.caption=Abbruch
-einstform.Button3.caption=Password \u00E4ndern
+einstform.Button3.caption=Password ändern
einstform.caption=Optionen
einstform.closeask.caption=Fragen, wie Applejuice geschlossen werden soll?
-einstform.connask.caption=\u00DCberpr\u00FCfe Verbindung
+einstform.connask.caption=Überprüfe Verbindung
einstform.connectionsheet.caption=Verbindung
einstform.downcolumns.caption=Spalten in der Downloadliste
einstform.dwncol1.caption=Bereits geladen
@@ -50,17 +50,17 @@ einstform.dwncol2.caption=Prozent fertig geladen
einstform.dwncol3.caption=Noch zu laden
einstform.graphicview.caption=Graphische Anzeige, was schon geladen worden ist
einstform.GroupBox1.caption=Statusbar
-einstform.Label1.caption=Achtung\! Alle Benutzer k\u00F6nnen die Dateien sehen, die du anbietest\!
+einstform.Label1.caption=Achtung\! Alle Benutzer können die Dateien sehen, die du anbietest\!
einstform.Label10.caption=Sprache
einstform.Label11.caption=Hier sind alle geladenen Plugins aufgelistet
einstform.Label12.caption=Aktualisiere alle (in Sekunden) 0 \= Keine Aktualisierung
einstform.Label13.caption=Max. Downloadgeschwindigkeit in kb/s
-einstform.Label14.caption=Sendepriorit\u00E4t der Downloads
-einstform.Label15.caption=Altes Pa\u00DFwort
-einstform.Label16.caption=Neues Pa\u00DFwort
-einstform.Label17.caption=Password best\u00E4tigen
+einstform.Label14.caption=Sendepriorität der Downloads
+einstform.Label15.caption=Altes Paßwort
+einstform.Label16.caption=Neues Paßwort
+einstform.Label17.caption=Password bestätigen
einstform.Label18.caption=Ping Grenze wegen den Uploadslots in ms
-einstform.Label19.caption=URL f\u00FCrs pingen wegen den Uploadslots
+einstform.Label19.caption=URL fürs pingen wegen den Uploadslots
einstform.Label2.caption=Temp-Verzeichnis
einstform.Label3.caption=Core-Port
einstform.Label4.caption=Max. Verbindungen
@@ -70,21 +70,21 @@ einstform.Label7.caption=Fertige Dateien
einstform.Label8.caption=Benutzername
einstform.Label9.caption=Anzahl der Dateien beim Download
einstform.languagesheet.caption=Sprache
-einstform.pwsheet.caption=Pa\u00DFwort
+einstform.pwsheet.caption=Paßwort
einstform.questionsheet.caption=Abfrage
einstform.securitysheet.caption=Sicherheit
einstform.simplebar.caption=einfache Statusleiste
einstform.standardsheet.caption=Standard
einstform.TabSheet1.caption=Plugins
einstform.visualsheet.caption=Anzeige
-javagui.checkupdate.keineNeueVersion=Es ist keine neuere Version verf\u00FCgbar.
-javagui.downloadform.aktiveuebertragung=aktive \u00DCbertragung
+javagui.checkupdate.keineNeueVersion=Es ist keine neuere Version verfügbar.
+javagui.downloadform.aktiveuebertragung=aktive Übertragung
javagui.downloadform.bereitsgeladen='%s' bereits herunter geladen.
javagui.downloadform.datawirderstellt=*.data wird erstellt
javagui.downloadform.dreckigerrest=dreckiger Rest
javagui.downloadform.eigeneslimiterreicht=Eigenes Limit erreicht
-javagui.downloadform.einfuegen=Einf\u00FCgen
-javagui.downloadform.falscherlink='%s' ist ung\u00FCltig.
+javagui.downloadform.einfuegen=Einfügen
+javagui.downloadform.falscherlink='%s' ist ungültig.
javagui.downloadform.fehlerbeimfertigstellen=Fehler beim Fertigstellen
javagui.downloadform.getlinkwithsources=Link mit Source in Ablage kopieren
javagui.downloadform.indverbindungabgelehnt=indirekte Verbindung abgelehnt
@@ -95,14 +95,14 @@ javagui.downloadform.partlisteanzeigen=Partliste anzeigen
javagui.downloadform.quellen=\ Quelle(n)
javagui.downloadform.sonstigerlinkfehlerkurz=Coreseitiger Fehler
javagui.downloadform.sonstigerlinkfehlerlang=Es wurde coreseitig ein Fehler beim Starten des Downloads gemeldet. Bitte schauen Sie in die Core-Konsole.
-javagui.downloadform.uebertragen=% \u00FCbertragen
-javagui.downloadform.verbindungunmoeglich=keine Verbindung m\u00F6glich
-javagui.downloadform.verfuegbar=%s% verf\u00FCgbar
+javagui.downloadform.uebertragen=% übertragen
+javagui.downloadform.verbindungunmoeglich=keine Verbindung möglich
+javagui.downloadform.verfuegbar=%s% verfügbar
javagui.downloadform.waitnodetext=bitte warten...
javagui.downloadform.wartendedownloads=in Warteschlange
javagui.downloadform.warteschlangevoll=Warteschlange voll
javagui.downloadform.zielverzeichnis=Zielverzeichnis
-javagui.downloadtab.btnOK=\u00DCbernehmen
+javagui.downloadtab.btnOK=Übernehmen
javagui.downloadtab.label1=Automatischer Powerdownload
javagui.downloadtab.pdlAb=ab
javagui.downloadtab.pdlBis=bis
@@ -113,11 +113,11 @@ javagui.mainform.fortsetzen=Fortsetzen
javagui.mainform.keinserver=
javagui.mainform.nichtverbunden=Nicht verbunden...
javagui.mainform.pause=Pause
-javagui.mainform.themesupportnachricht=Bist du dir sicher? Das GUI m\u00FCsste neu gestartet werden.
+javagui.mainform.themesupportnachricht=Bist du dir sicher? Das GUI müsste neu gestartet werden.
javagui.mainform.verbinden=Verbinden...
javagui.mainform.verbunden=Verbunden...
javagui.menu.aktivieren=aktivieren
-javagui.menu.bestaetigung=Bist du sicher, dass du den Core beenden willst? Du wirst die Kontrolle \u00FCber den Core verlieren\!
+javagui.menu.bestaetigung=Bist du sicher, dass du den Core beenden willst? Du wirst die Kontrolle über den Core verlieren\!
javagui.menu.corebeenden=Core beenden
javagui.menu.corebeendenhint=Mit dieser Funktionen kannst du deinen Core beenden.
javagui.menu.dateiliste=Dateiliste importieren
@@ -132,10 +132,10 @@ javagui.options.ansicht.caption=Ansicht
javagui.options.ansicht.downloadansicht=Partliste bei Mausklick anzeigen
javagui.options.ansicht.fertigerdownload=fertiger Download
javagui.options.ansicht.hintergrundfarben=Hintergrundfarben
-javagui.options.ansicht.hintergrundfarbewaehlen=Hintergrundfarbe w\u00E4hlen
+javagui.options.ansicht.hintergrundfarbewaehlen=Hintergrundfarbe wälen
javagui.options.ansicht.quelle=Quelle
-javagui.options.ansicht.ttipp_farbewaehlen=Um die Farbe zu \u00E4ndern, klicke auf die Farbe|und w\u00E4hle eine neue Farbe aus.
-javagui.options.ansicht.zeigestartscreen=Startscreen beim n\u00E4chsten Start des GUI anzeigen?
+javagui.options.ansicht.ttipp_farbewaehlen=Um die Farbe zu ändern, klicke auf die Farbe|und wäle eine neue Farbe aus.
+javagui.options.ansicht.zeigestartscreen=Startscreen beim nächsten Start des GUI anzeigen?
javagui.options.ansicht.zeigetooltipps=Tooltipp anzeigen
javagui.options.logging.debug=Debuginfos
javagui.options.logging.info=Infos
@@ -145,7 +145,7 @@ javagui.options.plugins.autor=Autor
javagui.options.plugins.beschreibung=Beschreibung
javagui.options.plugins.einstellungen=Einstellungen
javagui.options.plugins.name=Name
-javagui.options.plugins.schliessen=Schlie\u00DFen
+javagui.options.plugins.schliessen=Schließen
javagui.options.plugins.version=Version
javagui.options.proxy.benutzername=Benutzername
javagui.options.proxy.caption=Proxy
@@ -154,22 +154,19 @@ javagui.options.proxy.passwort=Passwort
javagui.options.proxy.port=Port
javagui.options.proxy.verwenden=wird verwendet
javagui.options.remote.caption=Fernzugriff
-javagui.options.remote.fehlertext=Du hast ung\u00FCltige Angaben im Bereich Fernzugriff gemacht. Dieser Bereich wurde nicht gespeichert.
+javagui.options.remote.fehlertext=Du hast ungültige Angaben im Bereich Fernzugriff gemacht. Dieser Bereich wurde nicht gespeichert.
javagui.options.remote.host=Host
javagui.options.remote.passwortAlt=Altes Passwort
javagui.options.remote.passwortNeu=Neues Passwort
javagui.options.remote.verwenden=Fernzugriff verwenden
javagui.options.standard.ladeplugins=Plugins beim Start laden
javagui.options.standard.standardbrowser=Standardbrowser
-javagui.options.standard.startemitstandard=\u00D6ffne mit Standardprogramm
-javagui.options.standard.ttipp_nick=Diese Einstellung wird erst nach einem|erneuten Verbindungsaufbau zu einem Server g\u00FCltig.
-javagui.options.standard.ttipp_port=Eine \u00C4nderung hat die Beendigung aller|offenen Chatsessions, Uploads und eventuell|der aktuellen Downloads zur Folge.|Nach \u00C4nderung dieser Einstellung ist ein erneutes|Verbinden mit einem Server notwendig.|1024
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/snap/gui/applejuice-gui.desktop b/snap/gui/applejuice-gui.desktop
new file mode 100644
index 00000000..089cc719
--- /dev/null
+++ b/snap/gui/applejuice-gui.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=appleJuice GUI
+GenericName=appleJuice GUI
+Comment=appleJuice GUI (connect to appleJuice Client)
+Exec=applejuice-gui.ajgui %u
+Icon=${SNAP}/meta/gui/applejuice-gui.png
+Terminal=false
+Type=Application
+Categories=Java;Application;Network;
+MimeType=x-scheme-handler/ajfsp;
+StartupWMClass=AJCoreGUI
diff --git a/snap/gui/applejuice-gui.png b/snap/gui/applejuice-gui.png
new file mode 100644
index 00000000..0bf9cf9e
Binary files /dev/null and b/snap/gui/applejuice-gui.png differ
diff --git a/snap/local/launcher b/snap/local/launcher
new file mode 100755
index 00000000..d97e0786
--- /dev/null
+++ b/snap/local/launcher
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+cd $SNAP/app/
+
+# first start, copy plugins
+if [ ! -e ~/appleJuice/gui/plugins ]; then
+ mkdir -p ~/appleJuice/gui/plugins
+ cp ./plugins/*.jar ~/appleJuice/gui/plugins/
+fi
+
+java -jar AJCoreGUI.jar "${@}"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 00000000..0fd53477
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,55 @@
+name: applejuice-gui
+title: appleJuice Gui
+summary: appleJuice GUI for appleJuice Client
+description: appleJuice GUI for appleJuice Client
+version: 0.83.3
+icon: snap/gui/applejuice-gui.png
+license: GPL-2.0
+
+grade: stable
+confinement: strict
+base: core18
+
+layout:
+ /usr/bin/xprop:
+ bind-file: $SNAP/usr/bin/xprop
+
+apps:
+ ajgui:
+ command: $SNAP/app/launcher
+ extensions:
+ - gnome-3-28
+ environment:
+ JAVA_HOME: $SNAP/usr/lib/jvm/java-8-openjdk-amd64/
+ PATH: $JAVA_HOME/jre/bin:$PATH
+ plugs:
+ - home
+ - desktop
+ - desktop-legacy
+ - network
+ - network-bind
+ - audio-playback
+ - x11
+
+parts:
+ ajgui:
+ plugin: dump
+ source: https://github.com/applejuicenet/gui-java/releases/download/$SNAPCRAFT_PROJECT_VERSION/AJCoreGUI.zip
+ organize:
+ '*': app/
+
+ jre:
+ plugin: nil
+ build-packages:
+ - ca-certificates
+ - ca-certificates-java
+ - openjdk-8-jre
+ stage-packages:
+ - openjdk-8-jre
+ - x11-utils
+
+ launcher:
+ plugin: dump
+ source: ./snap/local
+ organize:
+ '*': app/
diff --git a/AJClientGUI/starterexe/AJCoreGUI.dpr b/starterexe/AJCoreGUI.lpr
similarity index 60%
rename from AJClientGUI/starterexe/AJCoreGUI.dpr
rename to starterexe/AJCoreGUI.lpr
index 97c7b216..c4a1cbdf 100644
--- a/AJClientGUI/starterexe/AJCoreGUI.dpr
+++ b/starterexe/AJCoreGUI.lpr
@@ -1,19 +1,22 @@
-program AJCoreGUI;
-uses ShellAPI, SysUtils;
-
-var verzeichnis, argumente, arg: string;
- i: integer;
-begin
-verzeichnis:=ExtractFilePath(ParamStr(0));
-if fileexists(verzeichnis+'\AJCoreGUI.jar')=true then begin
- argumente:='-jar AJCoreGUI.jar';
- i:=1;
- while ParamStr(i)<>'' do begin
- arg:=ParamStr(i);
- if copy(arg,0,8)='ajfsp://' then arg:='-link='+arg;
- argumente:=argumente+' "'+arg+'"';
- i:=i+1;
- end;
- ShellExecute(0, 'open' ,PChar('javaw.exe'), PChar(argumente), PChar(verzeichnis), 1);
- end;
-end.
+program AJCoreGUI;
+uses ShellAPI, SysUtils;
+
+{$R project.rc}
+
+var verzeichnis, argumente, arg: string;
+ i: integer;
+begin
+verzeichnis:=ExtractFilePath(ParamStr(0));
+if fileexists(verzeichnis+'\AJCoreGUI.jar')=true then begin
+ argumente:='-jar AJCoreGUI.jar';
+ i:=1;
+
+ for i := 1 to paramCount() do
+ begin
+ argumente:=argumente+' '+paramStr(i);
+ end;
+
+ ShellExecute(0, 'open' ,PChar('javaw.exe'), PChar(argumente), PChar(verzeichnis), 1);
+
+ end;
+end.
diff --git a/starterexe/ajgui.ico b/starterexe/ajgui.ico
new file mode 100644
index 00000000..d03e2ba0
Binary files /dev/null and b/starterexe/ajgui.ico differ
diff --git a/starterexe/project.rc b/starterexe/project.rc
new file mode 100644
index 00000000..324b0f11
--- /dev/null
+++ b/starterexe/project.rc
@@ -0,0 +1 @@
+MAINICON ICON "ajgui.ico"