[simplyhtml] 02/04: Imported Upstream version 0.16.15
Felix Natter
fnatter-guest at moszumanska.debian.org
Mon Apr 11 10:15:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository simplyhtml.
commit 27e0ac4a38cab6ba3edc1a2c399e343bc79de5d0
Author: Felix Natter <fnatter at gmx.net>
Date: Mon Apr 11 12:11:06 2016 +0200
Imported Upstream version 0.16.15
---
build.gradle | 114 +++++++++++++++++++++
dist.gradle | 42 ++++++++
src/build.xml | 2 +-
src/com/lightdev/app/shtm/DynamicResource.java | 5 +
src/com/lightdev/app/shtm/FrmMain.java | 2 +-
.../lightdev/app/shtm/SHTMLEditorKitActions.java | 2 +-
src/com/lightdev/app/shtm/help/JavaHelpSearch/DOCS | Bin 0 -> 16100 bytes
.../lightdev/app/shtm/help/JavaHelpSearch/OFFSETS | Bin 0 -> 398 bytes
.../app/shtm/help/JavaHelpSearch/POSITIONS | Bin 0 -> 55642 bytes
src/com/lightdev/app/shtm/help/JavaHelpTOC.jar | Bin 0 -> 35599 bytes
10 files changed, 164 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..164d825
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,114 @@
+plugins {
+ id "com.jfrog.bintray" version "1.6"
+}
+
+apply plugin: 'java'
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
+
+group 'com.lightdev.app.shtm.simplyhtml'
+version = '0.16.15'
+
+targetCompatibility='1.7'
+sourceCompatibility='1.7'
+
+repositories {
+ jcenter()
+ maven { url "http://dl.bintray.com/freeplane/freeplane" }
+}
+
+bintray {
+ user = System.getenv('BINTRAY_USER')
+ key = System.getenv('BINTRAY_KEY')
+ publications = ['simplyhtml']
+ pkg {
+ repo = 'freeplane'
+ name = 'simplyhtml'
+ userOrg = 'freeplane'
+ licenses = ['GPL-3.0', 'GPL-2.0']
+ vcsUrl = 'https://github.com/dpolivaev/simplyhtml.git'
+ version {
+ name = project.version
+ }
+ }
+}
+
+dependencies {
+ compile 'javax.help:javahelp:2.0.05',
+ 'gnu-regexp:gnu-regexp:1.1.4',
+ 'org.dpolivaev.mnemonicsetter:mnemonicsetter:0.3'
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src'
+ }
+ }
+ main {
+ resources {
+ srcDir 'src'
+ include 'com/lightdev/app/shtm/resources/**'
+ include 'com/lightdev/app/shtm/help/**'
+ }
+ }
+}
+
+// holds classes included into SimplyHTMLHelp.jar so they are to be excluded from SimplyHTML.jar
+ext.helpExcludes = []
+
+// help.jar
+task helpJar(type: Jar) {
+ baseName = 'SimplyHTMLHelp'
+ from(sourceSets.main.output) {
+ include "com/lightdev/app/shtm/help/**"
+ project.ext.helpExcludes.addAll(includes)
+ }
+}
+
+// lib.jar
+task mainJar(type: Jar, dependsOn: classes) {
+ baseName = 'SimplyHTML'
+ from(sourceSets.main.output) {
+ exclude project.ext.helpExcludes
+ }
+ manifest {
+ def classPath = (configurations.compile.collect { it.name } +
+ helpJar.outputs.files.collect { it.name }).join(' ')
+ attributes(
+ 'Implementation-Title': project.name,
+ 'Implementation-Version': project.version,
+ 'Main-Class': 'com.lightdev.app.shtm.App',
+ 'Class-Path': classPath
+ )
+ }
+}
+
+task sourceJar(type: Jar) {
+ classifier = 'sources'
+ from sourceSets.main.allSource
+}
+
+build.dependsOn mainJar
+build.dependsOn javadoc
+
+publishing {
+ publications {
+ simplyhtml(MavenPublication) {
+ from components.java
+ artifactId 'SimplyHTML'
+ artifacts = [mainJar]
+ artifact sourceJar {
+ classifier "sources"
+ }
+ }
+ }
+}
+
+javadoc {
+ enabled = true
+ options.encoding = "UTF-8"
+ failOnError = false
+}
+
+apply from: './dist.gradle'
\ No newline at end of file
diff --git a/dist.gradle b/dist.gradle
new file mode 100644
index 0000000..4071b6f
--- /dev/null
+++ b/dist.gradle
@@ -0,0 +1,42 @@
+task binDistrib(type: Zip) {
+ archiveName = 'simplyhtml_bin-' + project.version + '.zip'
+ destinationDir = rootDir
+
+ from(configurations.compile)
+ from(mainJar.outputs.files)
+ from(helpJar.outputs.files)
+ from(rootDir) {
+ include('*.txt')
+ }
+
+ into('simplyhtml-' + project.version)
+
+ dependsOn mainJar
+ dependsOn helpJar
+}
+
+task sourceDistrib(type: Tar) {
+ archiveName = 'simplyhtml_src-' + project.version + '.tar.gz'
+ destinationDir = rootDir
+ compression = 'GZIP'
+ includeEmptyDirs = false
+
+ from(rootDir) {
+ include('src/**')
+ include('*.txt')
+ include('*.gradle')
+ }
+
+ into('simplyhtml-' + project.version)
+}
+
+task dist {
+ dependsOn binDistrib
+ dependsOn sourceDistrib
+}
+
+task cleanDist(type: Delete) {
+ delete binDistrib.outputs.files
+ delete sourceDistrib.outputs.files
+}
+clean.dependsOn cleanDist
diff --git a/src/build.xml b/src/build.xml
index 7fbf205..bc0b040 100644
--- a/src/build.xml
+++ b/src/build.xml
@@ -1,5 +1,5 @@
<project name="SimplyHTML" default="dist" basedir=".">
- <property name="version" value="0_16_13" />
+ <property name="version" value="0_16_14" />
<property name="src" value="." />
<property name="help" value="${src}/com/lightdev/app/shtm/help" />
<property name="lib" value="../lib" />
diff --git a/src/com/lightdev/app/shtm/DynamicResource.java b/src/com/lightdev/app/shtm/DynamicResource.java
index 9460781..f37ad17 100644
--- a/src/com/lightdev/app/shtm/DynamicResource.java
+++ b/src/com/lightdev/app/shtm/DynamicResource.java
@@ -41,6 +41,8 @@ import javax.swing.KeyStroke;
import javax.swing.event.MenuEvent;
import javax.swing.event.MenuListener;
+import org.dpolivaev.mnemonicsetter.MenuMnemonicSetter;
+
/**
* Provides methods to dynamically combine components and resource bundles.
*
@@ -151,6 +153,7 @@ class DynamicResource {
mb.add(m);
}
}
+ MenuMnemonicSetter.INSTANCE.setComponentMnemonics(mb);
return mb;
}
@@ -184,6 +187,7 @@ class DynamicResource {
* store the menu in the menus hashtable for possible later use
*/
menus.put(key, menu);
+ MenuMnemonicSetter.INSTANCE.setComponentMnemonics(menu.getPopupMenu());
return menu;
}
@@ -212,6 +216,7 @@ class DynamicResource {
menu.add(mi);
}
}
+ MenuMnemonicSetter.INSTANCE.setComponentMnemonics(menu);
return menu;
}
diff --git a/src/com/lightdev/app/shtm/FrmMain.java b/src/com/lightdev/app/shtm/FrmMain.java
index fd32e44..335e542 100644
--- a/src/com/lightdev/app/shtm/FrmMain.java
+++ b/src/com/lightdev/app/shtm/FrmMain.java
@@ -51,7 +51,7 @@ import javax.swing.JFrame;
*/
class FrmMain extends JFrame {
public static final String APP_NAME = "SimplyHTML";
- public static final String VERSION = "0.16.13";
+ public static final String VERSION = "0.16.15";
/** static reference to this instance of class FrmMain */
private SHTMLPanelImpl mainPane;
diff --git a/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java b/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java
index 7f5c40c..9a1b9c8 100644
--- a/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java
+++ b/src/com/lightdev/app/shtm/SHTMLEditorKitActions.java
@@ -1917,7 +1917,7 @@ class SHTMLEditorKitActions {
private final SHTMLPanelImpl panel;
public MoveTableRowDownAction(final SHTMLPanelImpl panel) {
- super(SHTMLPanelImpl.moveTableRowUpAction);
+ super(SHTMLPanelImpl.moveTableRowDownAction);
this.panel = panel;
getProperties();
}
diff --git a/src/com/lightdev/app/shtm/help/JavaHelpSearch/DOCS b/src/com/lightdev/app/shtm/help/JavaHelpSearch/DOCS
new file mode 100644
index 0000000..34f0c97
Binary files /dev/null and b/src/com/lightdev/app/shtm/help/JavaHelpSearch/DOCS differ
diff --git a/src/com/lightdev/app/shtm/help/JavaHelpSearch/OFFSETS b/src/com/lightdev/app/shtm/help/JavaHelpSearch/OFFSETS
new file mode 100644
index 0000000..e892db7
Binary files /dev/null and b/src/com/lightdev/app/shtm/help/JavaHelpSearch/OFFSETS differ
diff --git a/src/com/lightdev/app/shtm/help/JavaHelpSearch/POSITIONS b/src/com/lightdev/app/shtm/help/JavaHelpSearch/POSITIONS
new file mode 100644
index 0000000..3db3925
Binary files /dev/null and b/src/com/lightdev/app/shtm/help/JavaHelpSearch/POSITIONS differ
diff --git a/src/com/lightdev/app/shtm/help/JavaHelpTOC.jar b/src/com/lightdev/app/shtm/help/JavaHelpTOC.jar
new file mode 100644
index 0000000..a437129
Binary files /dev/null and b/src/com/lightdev/app/shtm/help/JavaHelpTOC.jar differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git
More information about the pkg-java-commits
mailing list