[Git][java-team/jameica][upstream] New upstream version 2.8.6+dfsg
Jochen Sprickerhof
gitlab at salsa.debian.org
Mon Nov 4 21:05:36 GMT 2019
Jochen Sprickerhof pushed to branch upstream at Debian Java Maintainers / jameica
Commits:
15e7c0c8 by Jochen Sprickerhof at 2019-11-04T20:10:31Z
New upstream version 2.8.6+dfsg
- - - - -
24 changed files:
- .classpath
- .settings/org.eclipse.jdt.core.prefs
- build.gradle
- build/BUILD
- build/ChangeLog
- build/Info.plist
- − build/Info64.plist
- build/build.properties
- build/build.xml
- − build/jameica-macos.sh
- build/jameica-macos64.sh
- build/jameica.sh
- build/launch4j-win32.xml
- build/launch4j-win64.xml
- plugin.xml
- src/de/willuhn/jameica/gui/GUI.java
- src/de/willuhn/jameica/gui/internal/action/RepositoryAdd.java
- src/de/willuhn/jameica/gui/internal/buttons/Back.java
- src/de/willuhn/jameica/gui/internal/dialogs/About.java
- src/de/willuhn/jameica/gui/internal/dialogs/BackupRestoreDialog.java
- src/de/willuhn/jameica/gui/internal/parts/PluginDetailPart.java
- src/de/willuhn/jameica/gui/internal/parts/RepositoryList.java
- src/de/willuhn/jameica/services/RepositoryService.java
- src/lang/system_messages_en.properties
Changes:
=====================================
.classpath
=====================================
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="test-bin" path="test"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="module" value="true"/>
</attributes>
@@ -26,7 +26,7 @@
<classpathentry kind="lib" path="lib/swt/com.ibm.icu_52.1.0.v201404241930.jar"/>
<classpathentry exported="true" kind="lib" path="lib/bouncycastle/bcpkix-jdk15on-1.56.jar"/>
<classpathentry exported="true" kind="lib" path="lib/bouncycastle/bcprov-jdk15on-1.56.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/h2/h2-1.4.197.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/h2/h2-1.4.199.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta_commons/commons-cli-1.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta_commons/commons-collections-3.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta_commons/commons-logging-1.2.jar"/>
=====================================
.settings/org.eclipse.jdt.core.prefs
=====================================
@@ -1,18 +1,19 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -20,20 +21,23 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -105,7 +109,6 @@ org.eclipse.jdt.core.formatter.indentation.size=2
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
@@ -126,11 +129,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -161,6 +165,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -185,13 +191,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -239,6 +249,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -275,9 +287,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -313,8 +328,12 @@ org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=2
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
=====================================
build.gradle
=====================================
@@ -29,6 +29,10 @@ dependencies {
compile 'org.apache.velocity:velocity:+'
compile 'oro:oro:+'
+ // Java EE. Ab Java 11 nicht mehr in Java enthalten
+ compile 'javax.xml.ws:jaxws-api:2.3.1'
+ compile 'org.glassfish.jaxb:jaxb-runtime:2.4.0-b180830.0438'
+ compile 'org.glassfish.main.javaee-api:javax.jws:3.1.2.2'
}
task download(type: Copy) {
=====================================
build/BUILD
=====================================
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
-#Tue Jan 29 15:28:30 CET 2019
-build.number=452
+#Fri Sep 06 12:05:41 CEST 2019
+build.number=455
=====================================
build/ChangeLog
=====================================
@@ -1,20 +1,40 @@
+2019-09-06 Version 2.8.5
+
+2019-11-01 Version 2.8.6
+
+ * DEL: 0126 Support für 32Bit MacOS entfernt
+ * NEW: 0125 Unterstützung für Linux ARM64
+ * NEW: 0124 Bei Win32, Win64 und MacOS64 ist jetzt eine embedded JRE mit enthalten
+
+2019-09-06 Version 2.8.5
+
+ * BUG: 0123 Fehler werfen, wenn ein Plugin zwar signiert ist, die zugehörige Plugin-Gruppe im Repository aber kein Zertifikat zur Validierung enthält
+ * NEW: 0122 Shortcut "CTRL+Q" zum Beenden des Programms
+ * NEW: 0121 Repository-URL von JVerein auf HTTPS umgestellt
+ * CHG: 0120 Aktualisiere Windows-Launcher mit Launch4J 3.12 und optionaler Suche in "%JAVA_HOME%" (nötig für OpenJDK, weil das nicht installiert sondern nur entpackt wird und damit nicht in der Windows-Registry registriert wird)
+ * CHG: 0119 Button-Beschriftung beim erneuten Installieren nochmal angepasst. "Aktualisieren..." wenn die verfügbare Version neuer ist, sonst "Erneut installieren..."
+ * NEW: 0118 Aktualisierte H2-Version h2-1.4.199
+ * BUG: 0117 Dialog "Über..." konnte u.U. wegen falschem XML-Escaping nicht angezeigt werden
+ * CHG: 0116 Button-Beschriftung beim erneuten Installieren eines bereits installierten Plugins geändert von "Aktualisieren..." zu "Erneut installieren..."
+ * NEW: 0115 Aktualisierte H2-Version h2-1.4.198
+
2019-02-11 Version 2.8.4
- * BUG: In der Liste der verfügbaren Plugins kam es zu einem Fehler, wenn in der Liste der Plugins Scripting-Plugins enthalten waren - Proxy.newProxyInstance hat scheinbar in Java das Verhalten geändert, wenn der Classloader NULL ist
+ * BUG: 0114 In der Liste der verfügbaren Plugins kam es zu einem Fehler, wenn in der Liste der Plugins Scripting-Plugins enthalten waren - Proxy.newProxyInstance hat scheinbar in Java das Verhalten geändert, wenn der Classloader NULL ist
2019-01-29 Version 2.8.3
- * CHG: Popups verwenden jetzt als Fallback eigene Farben für Vorder- und Hintergrund, wenn keine Systemfarben vorgegeben sind oder Vorder- und Hintergrund identisch wären
- * CHG: Jameica verwendet jetzt unter Linux per Default GTK3 (siehe "SWT_GTK3=1" in jameica.sh)
- * NEW: Update auf SWT 4.9 (in 4.10 gibt es keine 32Bit-Unterstützung mehr)
- * NEW: Hostname für das beim ersten Start zu erstellende System-Zertifikat kann jetzt per Konfigurationsdatei vorgegeben werden (Parameter "jameica.hostname" in "de.willuhn.jameica.system.ApplicationCallback.properties") - siehe https://homebanking-hilfe.de/forum/topic.php?p=141994#real141994
- * CHG: JVM-Parameter "-Dswt.autoScale=quarter" bei den Windows-Launchern hinzugefuegt - siehe https://github.com/willuhn/jameica/commit/82d253c0e1aec918b98eb378027ebf2d2e5fb411
- * BUG: Kleiner Darstellungsfehler: Beim mehrfachen Überfahren der Panelbuttons mit der Maus oben rechts wurde unter dem Button eine 1 Pixel schmale dunkle Linie angezeigt
- * BUG: Die Bibliothek "oro" fehlte im Ordner "lib/velocity". Dadurch kam es zu einer ClassNotFoundException in SynTAX beim Erstellen der IDEA-Auswertung
- * BUG: Zoom-Faktor bei HiDPI-Displays wurde beim Druck von Dokumenten via de.willuhn.jameica.gui.internal.action.Print nicht deaktiviert, sodass Dokumente zu gross gedruckt wurden
- * NEW: MySQL-Treiber von 5.1.41 auf 5.1.47 aktualisiert
- * CHG: Settings nur noch maximal 1 mal pro Sekunde neu laden
- * NEW: Annotation "@Resource" unterstützt jetzt auch Services des Typs "Bootable".
+ * CHG: 0113 Popups verwenden jetzt als Fallback eigene Farben für Vorder- und Hintergrund, wenn keine Systemfarben vorgegeben sind oder Vorder- und Hintergrund identisch wären
+ * CHG: 0112 Jameica verwendet jetzt unter Linux per Default GTK3 (siehe "SWT_GTK3=1" in jameica.sh)
+ * NEW: 0111 Update auf SWT 4.9 (in 4.10 gibt es keine 32Bit-Unterstützung mehr)
+ * NEW: 0110 Hostname für das beim ersten Start zu erstellende System-Zertifikat kann jetzt per Konfigurationsdatei vorgegeben werden (Parameter "jameica.hostname" in "de.willuhn.jameica.system.ApplicationCallback.properties") - siehe https://homebanking-hilfe.de/forum/topic.php?p=141994#real141994
+ * CHG: 0109 JVM-Parameter "-Dswt.autoScale=quarter" bei den Windows-Launchern hinzugefuegt - siehe https://github.com/willuhn/jameica/commit/82d253c0e1aec918b98eb378027ebf2d2e5fb411
+ * BUG: 0108 Kleiner Darstellungsfehler: Beim mehrfachen Überfahren der Panelbuttons mit der Maus oben rechts wurde unter dem Button eine 1 Pixel schmale dunkle Linie angezeigt
+ * BUG: 0107 Die Bibliothek "oro" fehlte im Ordner "lib/velocity". Dadurch kam es zu einer ClassNotFoundException in SynTAX beim Erstellen der IDEA-Auswertung
+ * BUG: 0106 Zoom-Faktor bei HiDPI-Displays wurde beim Druck von Dokumenten via de.willuhn.jameica.gui.internal.action.Print nicht deaktiviert, sodass Dokumente zu gross gedruckt wurden
+ * NEW: 0105 MySQL-Treiber von 5.1.41 auf 5.1.47 aktualisiert
+ * CHG: 0104 Settings nur noch maximal 1 mal pro Sekunde neu laden
+ * NEW: 0103 Annotation "@Resource" unterstützt jetzt auch Services des Typs "Bootable".
* NEW: 0102 BUGZILLA 1867 - HTTP-Redirects (für Wechsel von HTTP auf HTTPS) berücksichtigen
2018-09-17 Version 2.8.2
=====================================
build/Info.plist
=====================================
@@ -3,11 +3,11 @@
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
- <string>jameica-macos.sh</string>
+ <string>jameica-macos64.sh</string>
<key>CFBundleGetInfoString</key>
- <string>Jameica for Apple OS X</string>
+ <string>Jameica for Apple OS X</string>
<key>CFBundleIconFile</key>
- <string>jameica-icon.icns</string>
+ <string>jameica-icon.icns</string>
<key>CFBundleIdentifier</key>
<string>de.willuhn.jameica</string>
<key>CFBundleInfoDictionaryVersion</key>
=====================================
build/Info64.plist deleted
=====================================
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleExecutable</key>
- <string>jameica-macos64.sh</string>
- <key>CFBundleGetInfoString</key>
- <string>Jameica for Apple OS X</string>
- <key>CFBundleIconFile</key>
- <string>jameica-icon.icns</string>
- <key>CFBundleIdentifier</key>
- <string>de.willuhn.jameica</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>Jameica</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.3-0</string>
- <key>CFBundleSignature</key>
- <string>?????</string>
- <key>CFBundleVersion</key>
- <string>1.0</string>
- <key>NSPrincipalClass</key>
- <string>NSApplication</string>
-</dict>
-</plist>
=====================================
build/build.properties
=====================================
@@ -4,15 +4,15 @@ lang.dir = ${src.dir}/lang
help.dir = ${src.dir}/help
define.encoding = ISO-8859-1
-define.java.version = 1.7
+define.java.version = 1.8
define.projectname = jameica
define.jarfilename = ${define.projectname}.jar
define.jarfilename.win32 = ${define.projectname}-win32.jar
define.jarfilename.win64 = ${define.projectname}-win64.jar
-define.jarfilename.macos = ${define.projectname}-macos.jar
define.jarfilename.macos64 = ${define.projectname}-macos64.jar
define.jarfilename.linux = ${define.projectname}-linux.jar
define.jarfilename.linux64 = ${define.projectname}-linux64.jar
+define.jarfilename.linuxarm64 = ${define.projectname}-linuxarm64.jar
define.jarfilename.openbsd = ${define.projectname}-openbsd.jar
define.srcfilename = ${define.projectname}-${system.version}.src.zip
define.javadocfilename = ${define.projectname}.javadoc.zip
@@ -64,7 +64,7 @@ project.zipfilename.win32 = ${define.projectname}-win32-${system.version}.
project.zipfilename.win64 = ${define.projectname}-win64-${system.version}.zip
project.zipfilename.linux = ${define.projectname}-linux-${system.version}.zip
project.zipfilename.linux64 = ${define.projectname}-linux64-${system.version}.zip
-project.zipfilename.macos = ${define.projectname}-macos-${system.version}.zip
+project.zipfilename.linuxarm64 = ${define.projectname}-linuxarm64-${system.version}.zip
project.zipfilename.macos64 = ${define.projectname}-macos64-${system.version}.zip
project.zipfilename.openbsd = ${define.projectname}-openbsd-${system.version}.zip
@@ -72,10 +72,17 @@ classpath.win32 = ${define.jarfilename} lib/swt/win32/swt.jar ${
classpath.win64 = ${define.jarfilename} lib/swt/win64/swt.jar ${define.commonlibs}
classpath.linux = ${define.jarfilename} lib/swt/linux/swt.jar ${define.commonlibs}
classpath.linux64 = ${define.jarfilename} lib/swt/linux64/swt.jar ${define.commonlibs}
-classpath.macos = ${define.jarfilename} lib/swt/macos/swt.jar ${define.commonlibs}
+classpath.linuxarm64 = ${define.jarfilename} lib/swt/linux-arm64/swt.jar ${define.commonlibs}
classpath.macos64 = ${define.jarfilename} lib/swt/macos64/swt.jar ${define.commonlibs}
classpath.openbsd = ${define.jarfilename} /usr/local/share/java/classes/swt.jar ${define.commonlibs}
+## Wenn fuer Win32/Win64/MacOS64 ein JRE gebundelt werden soll, muss hier der Pfad zu der ZIP/TAR.GZ-Datei des JRE angegeben werden
+## Ausserdem muss Ant dann mit dem Parameter "-Djre.embedd=true" aufgerufen werden
+## Beispiel:
+define.jre.win32 = ../jre/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.5_10.zip
+define.jre.win64 = ../jre/OpenJDK11U-jre_x64_windows_hotspot_11.0.5_10.zip
+define.jre.macos64 = ../jre/OpenJDK11U-jre_x64_mac_hotspot_11.0.5_10.tar.gz
+
signjar.keystore = /home/willuhn/.jameica/jameica.ca/jameica.ca.keystore
signjar.storepass = /home/willuhn/.jameica/jameica.ca/jameica.ca.storepass
signjar.alias = cn=jameica updates,o=olaf willuhn,ou=jameica.org,c=de
=====================================
build/build.xml
=====================================
@@ -121,6 +121,10 @@
<param name="param.filename" value="${define.jarfilename.linux64}" />
<param name="param.classpath" value="${classpath.linux64}" />
</antcall>
+ <antcall target="sub_jar_create">
+ <param name="param.filename" value="${define.jarfilename.linuxarm64}" />
+ <param name="param.classpath" value="${classpath.linuxarm64}" />
+ </antcall>
<antcall target="sub_jar_create">
<param name="param.filename" value="${define.jarfilename.win32}" />
<param name="param.classpath" value="${classpath.win32}" />
@@ -129,10 +133,6 @@
<param name="param.filename" value="${define.jarfilename.win64}" />
<param name="param.classpath" value="${classpath.win64}" />
</antcall>
- <antcall target="sub_jar_create">
- <param name="param.filename" value="${define.jarfilename.macos}" />
- <param name="param.classpath" value="${classpath.macos}" />
- </antcall>
<antcall target="sub_jar_create">
<param name="param.filename" value="${define.jarfilename.macos64}" />
<param name="param.classpath" value="${classpath.macos64}" />
@@ -162,7 +162,6 @@
<include name="jameica-icon.icns" />
<include name="README" />
<include name="Info.plist" />
- <include name="Info64.plist" />
</fileset>
<fileset dir="${basedir}">
<include name="LICENSE" />
@@ -170,6 +169,20 @@
</fileset>
</copy>
<copy file="plugin.xml" todir="${project.zipdir}" />
+
+ <!-- Embedded JREs -->
+ <antcall target="sub_addjre_zip">
+ <param name="param.target" value="${project.zipdir}/jre-win64" />
+ <param name="param.source" value="${define.jre.win64}" />
+ </antcall>
+ <antcall target="sub_addjre_zip">
+ <param name="param.target" value="${project.zipdir}/jre-win32" />
+ <param name="param.source" value="${define.jre.win32}" />
+ </antcall>
+ <antcall target="sub_addjre_tar">
+ <param name="param.target" value="${project.zipdir}/jre-macos64" />
+ <param name="param.source" value="${define.jre.macos64}" />
+ </antcall>
<!-- ZIP-File fuer Linux -->
<zip destfile="${project.release}/${project.zipfilename.linux}" duplicate="fail">
@@ -189,6 +202,7 @@
<exclude name="${define.projectname}/lib/swt/win*/**" />
<exclude name="${define.projectname}/lib/swt/macos*/**" />
<exclude name="${define.projectname}/lib/swt/linux64/**" />
+ <exclude name="${define.projectname}/lib/swt/linux-arm64/**" />
<exclude name="${define.projectname}/*.icns" />
<exclude name="${define.projectname}/*.plist" />
</zipfileset>
@@ -217,6 +231,36 @@
<exclude name="${define.projectname}/lib/swt/win*/**" />
<exclude name="${define.projectname}/lib/swt/macos*/**" />
<exclude name="${define.projectname}/lib/swt/linux/**" />
+ <exclude name="${define.projectname}/lib/swt/linux-arm64/**" />
+ <exclude name="${define.projectname}/*.icns" />
+ <exclude name="${define.projectname}/*.plist" />
+ </zipfileset>
+ <zipfileset dir="${project.release}" filemode="755">
+ <include name="${define.projectname}/jameica.sh" />
+ <include name="${define.projectname}/jameicaserver.sh" />
+ <include name="${define.projectname}/rcjameica*" />
+ </zipfileset>
+ </zip>
+
+ <!-- ZIP-File fuer Linux-ARM64 -->
+ <zip destfile="${project.release}/${project.zipfilename.linuxarm64}" duplicate="fail">
+ <zipfileset dir="${project.release}">
+ <include name="${define.projectname}" />
+ <include name="${define.projectname}/plugin.xml" />
+ <include name="${define.projectname}/${define.jarfilename}" />
+ <include name="${define.projectname}/${define.jarfilename.linuxarm64}" />
+ <include name="${define.projectname}/LICENSE" />
+ <include name="${define.projectname}/COPYING" />
+ <include name="${define.projectname}/README" />
+ <include name="${define.projectname}/.jameica" />
+ <include name="${define.projectname}/jameica-icon.png" />
+ <include name="${define.projectname}/plugins" />
+ <include name="${define.projectname}/lib/**" />
+
+ <exclude name="${define.projectname}/lib/swt/win*/**" />
+ <exclude name="${define.projectname}/lib/swt/macos*/**" />
+ <exclude name="${define.projectname}/lib/swt/linux/**" />
+ <exclude name="${define.projectname}/lib/swt/linux64/**" />
<exclude name="${define.projectname}/*.icns" />
<exclude name="${define.projectname}/*.plist" />
</zipfileset>
@@ -227,7 +271,6 @@
</zipfileset>
</zip>
- <!-- ZIP-File fuer Win32 -->
<zip destfile="${project.release}/${project.zipfilename.win32}">
<zipfileset dir="${project.release}">
<include name="${define.projectname}" />
@@ -240,6 +283,7 @@
<include name="${define.projectname}/jameica-win32.exe" />
<include name="${define.projectname}/plugins" />
<include name="${define.projectname}/lib/**" />
+ <include name="${define.projectname}/jre-win32/**" />
<exclude name="${define.projectname}/lib/swt/win64/**" />
<exclude name="${define.projectname}/lib/swt/macos*/**" />
@@ -262,6 +306,7 @@
<include name="${define.projectname}/jameica-win64.exe" />
<include name="${define.projectname}/plugins" />
<include name="${define.projectname}/lib/**" />
+ <include name="${define.projectname}/jre-win64/**" />
<exclude name="${define.projectname}/lib/swt/win32/**" />
<exclude name="${define.projectname}/lib/swt/macos*/**" />
@@ -271,33 +316,6 @@
</zipfileset>
</zip>
- <!-- ZIP-File fuer MacOS -->
- <mkdir dir="${project.tmp}/${define.projectname}.app" />
- <copy todir="${project.tmp}/${define.projectname}.app">
- <fileset dir="${project.release}/${define.projectname}">
- <include name="plugin.xml" />
- <include name="${define.jarfilename}" />
- <include name="${define.jarfilename.macos}" />
- <include name="LICENSE" />
- <include name="COPYING" />
- <include name="README" />
- <include name="Info.plist" />
- <include name="jameica-macos.sh" />
- <include name="jameica-icon.icns" />
- <include name="plugins" />
- <include name="lib/**" />
- <exclude name="Info64.plist" />
- <exclude name="lib/swt/win*/**" />
- <exclude name="lib/swt/linux*/**" />
- <exclude name="lib/swt/macos64/**" />
- </fileset>
- </copy>
- <zip destfile="${project.release}/${project.zipfilename.macos}">
- <zipfileset dir="${project.tmp}" filemode="755">
- <include name="${define.projectname}.app/**" />
- </zipfileset>
- </zip>
-
<!-- ZIP-File fuer MacOS64 -->
<delete dir="${project.tmp}/${define.projectname}.app" />
<mkdir dir="${project.tmp}/${define.projectname}.app" />
@@ -309,18 +327,17 @@
<include name="LICENSE" />
<include name="COPYING" />
<include name="README" />
- <include name="Info64.plist" />
+ <include name="Info.plist" />
<include name="jameica-macos64.sh" />
<include name="jameica-icon.icns" />
<include name="plugins" />
+ <include name="jre-macos64/**" />
<include name="lib/**" />
- <exclude name="Info.plist" />
<exclude name="lib/swt/win*/**" />
<exclude name="lib/swt/linux*/**" />
<exclude name="lib/swt/macos/**" />
</fileset>
</copy>
- <move file="${project.tmp}/${define.projectname}.app/Info64.plist" tofile="${project.tmp}/${define.projectname}.app/Info.plist" />
<zip destfile="${project.release}/${project.zipfilename.macos64}">
<zipfileset dir="${project.tmp}" filemode="755">
<include name="${define.projectname}.app/**" />
@@ -428,7 +445,7 @@
<checksum format="MD5SUM" algorithm="SHA" file="${project.release}/${project.zipfilename.win64}" />
<checksum format="MD5SUM" algorithm="SHA" file="${project.release}/${project.zipfilename.linux}" />
<checksum format="MD5SUM" algorithm="SHA" file="${project.release}/${project.zipfilename.linux64}" />
- <checksum format="MD5SUM" algorithm="SHA" file="${project.release}/${project.zipfilename.macos}" />
+ <checksum format="MD5SUM" algorithm="SHA" file="${project.release}/${project.zipfilename.linuxarm64}" />
<checksum format="MD5SUM" algorithm="SHA" file="${project.release}/${project.zipfilename.macos64}" />
<checksum format="MD5SUM" algorithm="SHA" file="${project.release}/${project.zipfilename.openbsd}" />
<echo message="Creating PGP signatures" />
@@ -453,7 +470,7 @@
<arg line="-asb --use-agent ${project.release}/${project.zipfilename.linux64}" />
</exec>
<exec executable="gpg" failonerror="true" timeout="60000">
- <arg line="-asb --use-agent ${project.release}/${project.zipfilename.macos}" />
+ <arg line="-asb --use-agent ${project.release}/${project.zipfilename.linuxarm64}" />
</exec>
<exec executable="gpg" failonerror="true" timeout="60000">
<arg line="-asb --use-agent ${project.release}/${project.zipfilename.macos64}" />
@@ -474,7 +491,7 @@
<copy file="${project.release}/${project.zipfilename}" todir="${project.nightly}" />
<copy file="${project.release}/${project.zipfilename.linux}" todir="${project.nightly}" />
<copy file="${project.release}/${project.zipfilename.linux64}" todir="${project.nightly}" />
- <copy file="${project.release}/${project.zipfilename.macos}" todir="${project.nightly}" />
+ <copy file="${project.release}/${project.zipfilename.linuxarm64}" todir="${project.nightly}" />
<copy file="${project.release}/${project.zipfilename.macos64}" todir="${project.nightly}" />
<copy file="${project.release}/${project.zipfilename.win32}" todir="${project.nightly}" />
<copy file="${project.release}/${project.zipfilename.win64}" todir="${project.nightly}" />
@@ -497,6 +514,32 @@
<!-- Sub-Routinen -->
+ <!--
+ Fuegt das Embedded JRE aus einem ZIP hinzu
+ @param.target: Zielordner fuer das JRE
+ @param.source: Quelldatei mit dem ZIP des JRE
+ //-->
+ <target name="sub_addjre_zip" if="jre.embedd">
+ <echo message="embedding JRE ${param.source} to ${param.target}"></echo>
+ <mkdir dir="${param.target}" />
+ <unzip dest="${param.target}" src="${param.source}">
+ <cutdirsmapper dirs="1" />
+ </unzip>
+ </target>
+
+ <!--
+ Fuegt das Embedded JRE aus einem TAR.GZ hinzu
+ @param.target: Zielordner fuer das JRE
+ @param.source: Quelldatei mit dem TAR.GZ des JRE
+ //-->
+ <target name="sub_addjre_tar" if="jre.embedd">
+ <echo message="embedding JRE ${param.source} to ${param.target}"></echo>
+ <mkdir dir="${param.target}" />
+ <untar compression="gzip" dest="${param.target}" src="${param.source}">
+ <cutdirsmapper dirs="1" />
+ </untar>
+ </target>
+
<!--
Erzeugt die plattform-spezifische JAR-Datei
@param param.filename Dateiname der zu erzeugenden JAR-Datei
=====================================
build/jameica-macos.sh deleted
=====================================
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# MacOS Start-Script fuer regulaeren Standalone-Betrieb.
-# Jameica wird hierbei mit GUI gestartet.
-
-TERM="xterm"
-
-JAVACMD="$JAVA_HOME/bin/java"
-
-# use Apple's "/usr/libexec/java_home" utility to get installed JVMs
-if [ ! -x $JAVACMD ] && [ -x /usr/libexec/java_home ] && /usr/libexec/java_home -F 2> /dev/null; then
- JAVACMD="`/usr/libexec/java_home 2> /dev/null`/bin/java"
-fi
-
-# try Oracle JRE (which now only is installed as internet plugin)
-if [ ! -x $JAVACMD ]; then
- JAVACMD="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"
-fi
-
-# Siehe Mail von Volker vom 31.12.2014
-if [ ! -x "$JAVACMD" ]; then
- JAVACMD="/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java"
-fi
-
-# try old Apple Java
-if [ ! -x $JAVACMD ] && [ -h /Library/Java/Home ]; then
- JAVACMD="/Library/Java/Home/bin/java"
-fi
-
-# last resort - does not really help on mac as java in $PATH is a wrapper
-if [ ! -x "$JAVACMD" ]; then
- JAVACMD="`which java`"
-fi
-
-if [ ! -x "$JAVACMD" ]; then
- echo Fehler: Java nicht gefunden.
- exit 1
-fi
-
-BASEDIR=$(dirname "$0")
-cd "${BASEDIR}"
-
-exec "${JAVACMD}" -Xdock:name="Jameica" -Xmx512m -Xss64m -XstartOnFirstThread -jar "${BASEDIR}/jameica-macos.jar" -o "$@" >/dev/null
=====================================
build/jameica-macos64.sh
=====================================
@@ -1,43 +1,11 @@
#!/bin/sh
-# MacOS64 Start-Script fuer regulaeren Standalone-Betrieb.
-# Jameica wird hierbei mit GUI gestartet.
-
TERM="xterm"
-JAVACMD="$JAVA_HOME/bin/java"
-
-# use Apple's "/usr/libexec/java_home" utility to get installed JVMs
-if [ ! -x $JAVACMD ] && [ -x /usr/libexec/java_home ] && /usr/libexec/java_home -F 2> /dev/null; then
- JAVACMD="`/usr/libexec/java_home 2> /dev/null`/bin/java"
-fi
-
-# try Oracle JRE (which now only is installed as internet plugin)
-if [ ! -x $JAVACMD ]; then
- JAVACMD="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"
-fi
-
-# Siehe Mail von Volker vom 31.12.2014
-if [ ! -x "$JAVACMD" ]; then
- JAVACMD="/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java"
-fi
-
-# try old Apple Java
-if [ ! -x $JAVACMD ] && [ -h /Library/Java/Home ]; then
- JAVACMD="/Library/Java/Home/bin/java"
-fi
-
-# last resort - does not really help on mac as java in $PATH is a wrapper
-if [ ! -x "$JAVACMD" ]; then
- JAVACMD="`which java`"
-fi
-
-if [ ! -x "$JAVACMD" ]; then
- echo Fehler: Java nicht gefunden.
- exit 1
-fi
-
BASEDIR=$(dirname "$0")
cd "${BASEDIR}"
+## Wir verwenden generell nur noch die embedded Java-Version unter MacOS
+JAVACMD="${BASEDIR}/jre-macos64/Contents/Home/bin/java"
+
exec "${JAVACMD}" -Xdock:name="Jameica" -Xmx512m -Xss64m -XstartOnFirstThread -jar "${BASEDIR}/jameica-macos64.jar" -o "$@" >/dev/null
=====================================
build/jameica.sh
=====================================
@@ -12,7 +12,12 @@ link=$(readlink -f "$0")
dir=$(dirname "$link")
cd "$dir"
-if uname -m |grep -q 64; then
+_JLP=""
+
+if uname -m |grep -q aarch64; then
+ archsuffix="arm64"
+ _JLP=" -Djava.library.path=lib/swt/linux-arm64"
+elif uname -m |grep -q 64; then
archsuffix="64"
else
archsuffix=""
@@ -20,4 +25,4 @@ fi
# Zur Anpassung der Skalierung auf HiDPI-Displays kann der Parameter "-Dswt.autoScale" verwendet werden.
# Siehe https://www.willuhn.de/wiki/doku.php?id=develop:highdpi
-LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=1 exec java -Djava.net.preferIPv4Stack=true -Xmx512m -Xss64m $_JCONSOLE -jar jameica-linux${archsuffix}.jar $@
+LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=1 exec java $_JLP -Djava.net.preferIPv4Stack=true -Xmx512m -Xss64m $_JCONSOLE -jar jameica-linux${archsuffix}.jar $@
=====================================
build/launch4j-win32.xml
=====================================
@@ -8,34 +8,34 @@
<cmdLine></cmdLine>
<chdir>.</chdir>
<priority>normal</priority>
- <downloadUrl>http://java.com/download</downloadUrl>
+ <downloadUrl>https://www.java.com/de/</downloadUrl>
<supportUrl></supportUrl>
<stayAlive>false</stayAlive>
<restartOnCrash>false</restartOnCrash>
<manifest></manifest>
<icon>/work/willuhn/git/hibiscus/icons/hibiscus.ico</icon>
<jre>
- <path></path>
+ <path>jre-win32</path>
<bundledJre64Bit>false</bundledJre64Bit>
- <bundledJreAsFallback>false</bundledJreAsFallback>
- <minVersion>1.8.0</minVersion>
+ <bundledJreAsFallback>true</bundledJreAsFallback>
+ <minVersion></minVersion>
<maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference>
- <runtimeBits>64/32</runtimeBits>
+ <runtimeBits>32/64</runtimeBits>
<opt>-Xmx512m -Djava.net.preferIPv4Stack=true -Dswt.autoScale=quarter</opt>
</jre>
<versionInfo>
- <fileVersion>2.8.2.0</fileVersion>
- <txtFileVersion>2.8.2</txtFileVersion>
+ <fileVersion>2.8.4.0</fileVersion>
+ <txtFileVersion>2.8.4</txtFileVersion>
<fileDescription>Jameica</fileDescription>
<copyright>Olaf Willuhn</copyright>
- <productVersion>2.8.2.0</productVersion>
- <txtProductVersion>2.8.2</txtProductVersion>
+ <productVersion>2.8.4.0</productVersion>
+ <txtProductVersion>2.8.4</txtProductVersion>
<productName>Jameica</productName>
<companyName>Olaf Willuhn</companyName>
<internalName>jameica-win32</internalName>
<originalFilename>jameica-win32.exe</originalFilename>
<trademarks></trademarks>
- <language>ENGLISH_US</language>
+ <language>GERMAN</language>
</versionInfo>
</launch4jConfig>
\ No newline at end of file
=====================================
build/launch4j-win64.xml
=====================================
@@ -8,34 +8,34 @@
<cmdLine></cmdLine>
<chdir>.</chdir>
<priority>normal</priority>
- <downloadUrl>http://java.com/download</downloadUrl>
+ <downloadUrl>https://www.java.com/de/</downloadUrl>
<supportUrl></supportUrl>
<stayAlive>false</stayAlive>
<restartOnCrash>false</restartOnCrash>
<manifest></manifest>
<icon>/work/willuhn/git/hibiscus/icons/hibiscus.ico</icon>
<jre>
- <path></path>
- <bundledJre64Bit>false</bundledJre64Bit>
- <bundledJreAsFallback>false</bundledJreAsFallback>
- <minVersion>1.8.0</minVersion>
+ <path>jre-win64</path>
+ <bundledJre64Bit>true</bundledJre64Bit>
+ <bundledJreAsFallback>true</bundledJreAsFallback>
+ <minVersion></minVersion>
<maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference>
<runtimeBits>64/32</runtimeBits>
<opt>-Xmx512m -Xss64m -Djava.net.preferIPv4Stack=true -Dswt.autoScale=quarter</opt>
</jre>
<versionInfo>
- <fileVersion>2.8.2.0</fileVersion>
- <txtFileVersion>2.8.2</txtFileVersion>
+ <fileVersion>2.8.4.0</fileVersion>
+ <txtFileVersion>2.8.4</txtFileVersion>
<fileDescription>Jameica</fileDescription>
<copyright>Olaf Willuhn</copyright>
- <productVersion>2.8.2.0</productVersion>
- <txtProductVersion>2.8.2</txtProductVersion>
+ <productVersion>2.8.4.0</productVersion>
+ <txtProductVersion>2.8.4</txtProductVersion>
<productName>Jameica</productName>
<companyName>Olaf Willuhn</companyName>
<internalName>jameica-win64</internalName>
<originalFilename>jameica-win64.exe</originalFilename>
<trademarks></trademarks>
- <language>ENGLISH_US</language>
+ <language>GERMAN</language>
</versionInfo>
</launch4jConfig>
\ No newline at end of file
=====================================
plugin.xml
=====================================
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<system name="Jameica" version="2.8.4">
+<system name="Jameica" version="2.8.6">
<description>Jameica - Java based messages interchange</description>
- <url>https://www.willuhn.de/products/jameica/releases/2.8/jameica/jameica-2.8.4.zip</url>
+ <url>https://www.willuhn.de/products/jameica/releases/2.8/jameica/jameica-2.8.6.zip</url>
<homepage>https://www.willuhn.de/projects/jameica</homepage>
<license>GPL - http://www.gnu.org/copyleft/gpl.html</license>
@@ -23,7 +23,7 @@
<item name="-" />
<item id="jameica.menu.masterpassword" name="&Master-Passwort ndern" icon="stock_keyring.png" action="de.willuhn.jameica.gui.internal.action.ChangePassword" />
<item name="-" />
- <item id="jameica.menu.quit" name="Beenden" icon="window-close.png" action="de.willuhn.jameica.gui.internal.action.FileClose" />
+ <item id="jameica.menu.quit" name="Beenden" shortcut="CTRL+Q" icon="window-close.png" action="de.willuhn.jameica.gui.internal.action.FileClose" />
</item>
<item name="Hilfe">
<item name="&ber" icon="gtk-info.png" action="de.willuhn.jameica.gui.internal.action.About" />
=====================================
src/de/willuhn/jameica/gui/GUI.java
=====================================
@@ -32,6 +32,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import de.willuhn.datasource.BeanUtil;
import de.willuhn.jameica.gui.extension.Extendable;
import de.willuhn.jameica.gui.extension.ExtensionRegistry;
import de.willuhn.jameica.gui.internal.parts.BackgroundTaskMonitor;
@@ -650,8 +651,16 @@ public class GUI implements ApplicationController
// Und nochwas: Wenn die neue Seite und und die aktuelle
// sowie deren Objekte identisch sind, muessen wir sie
// nicht der History hinzufuegen
- if (gui.currentView.getCurrentObject() != o ||
- !gui.currentView.getClass().getName().equals(view.getClass().getName()))
+ boolean same = false;
+ try
+ {
+ same = BeanUtil.equals(gui.currentView.getCurrentObject(),o);
+ }
+ catch (Exception e)
+ {
+ Logger.write(Level.TRACE,"unable to compare objects",e);
+ }
+ if (!same || !gui.currentView.getClass().getName().equals(view.getClass().getName()))
{
HistoryEntry entry = new HistoryEntry(gui.currentView);
gui.history.push(entry);
=====================================
src/de/willuhn/jameica/gui/internal/action/RepositoryAdd.java
=====================================
@@ -38,7 +38,7 @@ public class RepositoryAdd implements Action
String url = null;
try
{
- String s = i18n.tr("Bitte geben Sie die URL des Repository ein");
+ String s = i18n.tr("Bitte geben Sie die URL des Repository ein") + ":";
url = Application.getCallback().askUser(s,i18n.tr("Neue URL"));
if (url == null || url.length() == 0)
return;
=====================================
src/de/willuhn/jameica/gui/internal/buttons/Back.java
=====================================
@@ -21,7 +21,6 @@ public class Back extends Button
/**
* ct.
* Der Button ist als Default-Button markiert.
- * @deprecated Ist nicht mehr noetig, da Jameica inzwischen einen globalen Back-Button besitzt
*/
public Back()
{
@@ -31,21 +30,9 @@ public class Back extends Button
/**
* ct.
* @param isDefault true, wenn es der Default-Button sein soll.
- * @deprecated Ist nicht mehr noetig, da Jameica inzwischen einen globalen Back-Button besitzt
*/
public Back(boolean isDefault)
{
super(Application.getI18n().tr("Zurck"),new de.willuhn.jameica.gui.internal.action.Back(),null,isDefault,"go-previous.png");
}
}
-
-
-/**********************************************************************
- * $Log: Back.java,v $
- * Revision 1.2 2011/04/26 12:01:42 willuhn
- * @D javadoc Fixes
- *
- * Revision 1.1 2009-01-20 10:51:51 willuhn
- * @N Mehr Icons - fuer Buttons
- *
- **********************************************************************/
=====================================
src/de/willuhn/jameica/gui/internal/dialogs/About.java
=====================================
@@ -62,7 +62,7 @@ public class About extends AbstractDialog
"SWT-Version: " + SWT.getVersion() + " / " + SWT.getPlatform() + "<br/>" +
"Java-Version: " + System.getProperty("java.version") + " / " + System.getProperty("os.name") + " " + System.getProperty("os.arch") + "<br/>" +
"Build: " + Application.getBuildnumber() + " [Datum " + Application.getBuildDate() + "]</p>" +
- "<p>Benutzerverzeichnis: " + StringEscapeUtils.escapeHtml(Application.getConfig().getWorkDir()) + "</p>" +
+ "<p>Benutzerverzeichnis: " + StringEscapeUtils.escapeXml(Application.getConfig().getWorkDir()) + "</p>" +
"</form>");
container.addPart(text);
=====================================
src/de/willuhn/jameica/gui/internal/dialogs/BackupRestoreDialog.java
=====================================
@@ -71,7 +71,7 @@ public class BackupRestoreDialog extends AbstractDialog
"Unter Umständen werden nicht alle Daten aus dem Backup wiederhergestellt."),true,Color.ERROR);
}
- container.addHeadline(Application.getI18n().tr("Warnung"));
+ container.addHeadline(Application.getI18n().tr("Achtung"));
container.addText(Application.getI18n().tr("Sind Sie sicher, dass Sie dieses Backup wiederherstellen möchten?\n" +
"Die Anwendung wird daraufhin beendet, die Wiederherstellung erfolgt automatisch beim nächsten Start."),true);
@@ -100,30 +100,3 @@ public class BackupRestoreDialog extends AbstractDialog
}
}
-
-
-/*********************************************************************
- * $Log: BackupRestoreDialog.java,v $
- * Revision 1.5 2011/04/26 11:50:41 willuhn
- * @C Dialog etwas hoeher
- *
- * Revision 1.4 2010-09-21 10:14:59 willuhn
- * @C Keine Warnung mehr anzeigen, wenn die Benutzerdaten des Backups eine aeltere Version des Plugins enthalten. Die Daten werden dann ohnehin automatisch auf den aktuellen Stand gebracht. Der Warnhinweis verwirrte manche User unnoetig und sie glaubten, das Backup nicht einspielen zu koennen.
- *
- * Revision 1.3 2008/03/11 10:23:42 willuhn
- * @N Sofortiges Shutdown bei Aktivierung eines Backup-Restore. Soll verhindern, dass der User nach Auswahl eines wiederherzustellenden Backups noch Aenderungen am Datenbestand vornehmen kann
- *
- * Revision 1.2 2008/03/05 23:58:36 willuhn
- * @N Backup: Warnhinweis, wenn ein Plugin zwar installiert, aber nicht im ausgewaehlten Backup enthalten ist
- *
- * Revision 1.1 2008/03/04 00:49:25 willuhn
- * @N GUI fuer Backup fertig
- *
- * Revision 1.2 2008/03/03 09:43:54 willuhn
- * @N DateUtil-Patch von Heiner
- * @N Weiterer Code fuer das Backup-System
- *
- * Revision 1.1 2008/02/29 19:02:31 willuhn
- * @N Weiterer Code fuer Backup-System
- *
- **********************************************************************/
\ No newline at end of file
=====================================
src/de/willuhn/jameica/gui/internal/parts/PluginDetailPart.java
=====================================
@@ -165,7 +165,20 @@ public class PluginDetailPart extends InfoPanel
super.handleAction(getSelectedVersion());
}
};
- Button install = new Button(i18n.tr(Application.getPluginLoader().getManifest(this.manifest.getPluginClass()) != null ? "Aktualisieren..." : "Installieren..."),download,null,false,"document-save.png");
+
+ Manifest installed = Application.getPluginLoader().getManifest(this.manifest.getPluginClass());
+ String text = "Installieren...";
+ if (installed != null)
+ {
+ // Checken, ob die verfuegbare Version neuer ist
+ Version vi = installed.getVersion();
+ Version vn = this.manifest.getVersion();
+ text = "Erneut installieren...";
+ if (vi != null && vn != null && vn.compareTo(vi) > 0)
+ text = "Aktualisieren...";
+ }
+
+ Button install = new Button(i18n.tr(text),download,null,false,"document-save.png");
this.addButton(install);
}
else if (this.type == Type.UPDATE && this.plugins != null && this.plugins.size() > 0)
=====================================
src/de/willuhn/jameica/gui/internal/parts/RepositoryList.java
=====================================
@@ -332,7 +332,7 @@ public class RepositoryList extends TablePart
catch (Exception e)
{
Logger.error("unable to updating url status",e);
- Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Fehler beim Aktualisieren der der URL: {}",e.getMessage()),StatusBarMessage.TYPE_ERROR));
+ Application.getMessagingFactory().sendMessage(new StatusBarMessage(i18n.tr("Fehler beim Aktualisieren der der URL: {0}",e.getMessage()),StatusBarMessage.TYPE_ERROR));
}
}
});
=====================================
src/de/willuhn/jameica/services/RepositoryService.java
=====================================
@@ -79,7 +79,7 @@ public class RepositoryService implements Bootable
public final static String[] WELL_KNOWN =
{
"https://www.willuhn.de/products/jameica/updates/extensions",
- "http://www.jverein.de/updates/",
+ "https://www.jverein.de/updates/",
"https://scripting-updates.derrichter.de/",
"https://www.open4me.de/hibiscus/"
};
@@ -423,8 +423,8 @@ public class RepositoryService implements Bootable
if (cert == null)
{
- Logger.warn("plugin may be " + plugin.getName() + " signed, but no certificate found for verification in repository group " + group.getName() + " of " + group.getRepository().getUrl());
- return;
+ Logger.error("plugin " + plugin.getName() + " may be signed, but no certificate found for verification in repository group " + group.getName() + " of " + group.getRepository().getUrl());
+ throw new ApplicationException(Application.getI18n().tr("Repository enthlt kein gltiges Zertifikat \"{0}\". Installation abgebrochen",plugin.getName()));
}
InputStream is1 = null;
=====================================
src/lang/system_messages_en.properties
=====================================
@@ -331,7 +331,7 @@ Text\ in\ Zwischenablage\ kopiert.=Copied\ text\ into\ clipboard.
Plugin\ "{0}"\ installieren\ in...=Install\ Plugin\ "{0}"\ into...
Bitte\ w\u00E4hlen\ Sie\ den\ Ordner,\ in\ dem\ das\ Plugin\ "{0}"\ installiert\ werden\ soll.=Please\ select\ the\ folder,\ where\ the\ plugin\ "{0}"\ shall\ be\ installed.
Plugin-Ordner=Plugin-Folder
-Benutzer-Ordner\ (nur\ f\u00FCr\ aktuellen\ Benutzer)=User-Folder\ (only\ for\ actual\ user)
+Benutzer-Ordner\ (nur\ f\u00FCr\ aktuellen\ Benutzer)=User-Folder\ (only\ for\ current\ user)
Programm-Ordner\ (f\u00FCr\ alle\ Benutzer\ der\ Jameica-Installation)=Program-Folder\ (for\ all\ users\ of\ Jameica)
Bitte\ l\u00F6schen\ Sie\ den\ Ordner\ {0}=Please\ delete\ folder\ {0}
Plugin\ doppelt\ installiert=Plugin\ is\ installed\ twice
View it on GitLab: https://salsa.debian.org/java-team/jameica/commit/15e7c0c8fc1e12cf0f165f57b43290cca78234fe
--
View it on GitLab: https://salsa.debian.org/java-team/jameica/commit/15e7c0c8fc1e12cf0f165f57b43290cca78234fe
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20191104/11240e24/attachment.html>
More information about the pkg-java-commits
mailing list