Skip to content

Jessica Hawkwell / lang-toolkit

Go to a project
Commit 782f0f36 by Jessica Hawkwell
Options

Merge branch '5-refactor-common-code' into 'master' 

Common code now lives in libraries.

Closes #5

See merge request !4
2 parents b71bdb6e f5d3405e
Inline Side-by-side
Showing with 156 additions and 23 deletions
apps/bootstrap/pom.xml
......@@ -18,6 +18,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependencies>
<dependency>
<groupId>me.felinewith.lang-toolkit.library</groupId>
<artifactId>libbootstrap</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
</dependency>
......
apps/bootstrap/src/main/java/me/felinewith/lang_toolkit/apps/bootstrap/BootstrapApp.java
package me.felinewith.lang_toolkit.apps.bootstrap;
import me.felinewith.lang_toolkit.library.IStrappedPlugin;
import me.felinewith.lang_toolkit.library.IStrappedApp;
import java.io.IOException;
import java.net.URL;
import java.util.Enumeration;
......
apps/langbuilder/pom.xml
......@@ -18,6 +18,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependencies>
<dependency>
<groupId>me.felinewith.lang-toolkit.library</groupId>
<artifactId>libbootstrap</artifactId>
</dependency>
<dependency>
<groupId>me.felinewith.lang-toolkit.library</groupId>
<artifactId>liblangbuilder</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
</dependency>
......@@ -33,10 +41,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<groupId>org.freedesktop.tango</groupId>
<artifactId>tango-icon-theme</artifactId>
</dependency>
<dependency>
<groupId>me.felinewith.lang-toolkit.apps</groupId>
<artifactId>bootstrap</artifactId>
</dependency>
</dependencies>
</project>
......
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/LangBuilder.java
......@@ -20,11 +20,11 @@ import javax.swing.JToolBar;
import javax.swing.JTree;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import me.felinewith.lang_toolkit.apps.bootstrap.IStrappedApp;
import me.felinewith.lang_toolkit.apps.bootstrap.IStrappedPlugin;
import me.felinewith.lang_toolkit.apps.langbuilder.actions.ListenAttach;
import me.felinewith.lang_toolkit.apps.langbuilder.util.ConfigHelper;
import me.felinewith.lang_toolkit.apps.langbuilder.util.DesktopMenu;
import me.felinewith.lang_toolkit.library.IStrappedApp;
import me.felinewith.lang_toolkit.library.IStrappedPlugin;
import me.felinewith.lang_toolkit.library.actions.ListenAttach;
import me.felinewith.lang_toolkit.library.helpers.ConfigHelper;
import me.felinewith.lang_toolkit.library.helpers.DesktopMenu;
import me.felinewith.lang_toolkit.apps.langbuilder.window.WindowUnifiedListener;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.XMLConfiguration;
......
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/ui/WelcomeWindow.java
......@@ -3,7 +3,7 @@ package me.felinewith.lang_toolkit.apps.langbuilder.ui;
import java.awt.BorderLayout;
import javax.swing.JEditorPane;
import javax.swing.JPanel;
import me.felinewith.lang_toolkit.apps.bootstrap.IStrappedPlugin;
import me.felinewith.lang_toolkit.library.IStrappedPlugin;
/**
*
......
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/window/WindowUnifiedListener.java
......@@ -4,8 +4,8 @@ import java.awt.Component;
import java.awt.Rectangle;
import java.awt.event.WindowEvent;
import javax.swing.JFrame;
import me.felinewith.lang_toolkit.apps.langbuilder.actions.ActionHandle;
import me.felinewith.lang_toolkit.apps.langbuilder.actions.UnifiedListener;
import me.felinewith.lang_toolkit.library.actions.ActionHandle;
import me.felinewith.lang_toolkit.library.actions.UnifiedListener;
import org.apache.commons.configuration2.Configuration;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
......
library/libbootstrap/nb-configuration.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<netbeans.compile.on.save>none</netbeans.compile.on.save>
</properties>
</project-shared-configuration>
library/libbootstrap/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.felinewith.lang-toolkit.library</groupId>
<artifactId>libbootstrap</artifactId>
<packaging>jar</packaging>
<name>Bootstrap Common</name>
<version>1.0-SNAPSHOT</version>
<inceptionYear>2017</inceptionYear>
<description>Code common to Bootstrap and the apps that use it.</description>
<parent>
<groupId>me.felinewith</groupId>
<artifactId>lang-toolkit</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
</dependencies>
</project>
apps/bootstrap/src/main/java/me/felinewith/lang_toolkit/apps/bootstrap/IStrappedApp.java → library/libbootstrap/src/main/java/me/felinewith/lang_toolkit/library/IStrappedApp.java
package me.felinewith.lang_toolkit.apps.bootstrap;
package me.felinewith.lang_toolkit.library;
import org.apache.commons.configuration2.Configuration;
......
apps/bootstrap/src/main/java/me/felinewith/lang_toolkit/apps/bootstrap/IStrappedPlugin.java → library/libbootstrap/src/main/java/me/felinewith/lang_toolkit/library/IStrappedPlugin.java
package me.felinewith.lang_toolkit.apps.bootstrap;
package me.felinewith.lang_toolkit.library;
import javax.swing.JButton;
import javax.swing.JInternalFrame;
......
library/liblangbuilder/nb-configuration.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<netbeans.compile.on.save>none</netbeans.compile.on.save>
</properties>
</project-shared-configuration>
library/liblangbuilder/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>me.felinewith.lang-toolkit.library</groupId>
<artifactId>liblangbuilder</artifactId>
<packaging>jar</packaging>
<name>LangBuilder Common</name>
<version>1.0-SNAPSHOT</version>
<inceptionYear>2017</inceptionYear>
<description>Code common to LangBuilder and its plugins.</description>
<parent>
<groupId>me.felinewith</groupId>
<artifactId>lang-toolkit</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.freedesktop.tango</groupId>
<artifactId>tango-icon-theme</artifactId>
</dependency>
</dependencies>
</project>
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/actions/ActionHandle.java → library/liblangbuilder/src/main/java/me/felinewith/lang_toolkit/library/actions/ActionHandle.java
package me.felinewith.lang_toolkit.apps.langbuilder.actions;
package me.felinewith.lang_toolkit.library.actions;
import java.awt.event.ActionEvent;
import java.awt.event.ComponentEvent;
......
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/actions/ActionTypes.java → library/liblangbuilder/src/main/java/me/felinewith/lang_toolkit/library/actions/ActionTypes.java
package me.felinewith.lang_toolkit.apps.langbuilder.actions;
package me.felinewith.lang_toolkit.library.actions;
import java.awt.event.ActionEvent;
import java.awt.event.ComponentEvent;
......
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/actions/ListenAttach.java → library/liblangbuilder/src/main/java/me/felinewith/lang_toolkit/library/actions/ListenAttach.java
package me.felinewith.lang_toolkit.apps.langbuilder.actions;
package me.felinewith.lang_toolkit.library.actions;
import java.awt.Component;
import java.lang.reflect.InvocationTargetException;
......
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/actions/UnifiedListener.java → library/liblangbuilder/src/main/java/me/felinewith/lang_toolkit/library/actions/UnifiedListener.java
package me.felinewith.lang_toolkit.apps.langbuilder.actions;
package me.felinewith.lang_toolkit.library.actions;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
......
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/actions/UnifiedRepeater.java → library/liblangbuilder/src/main/java/me/felinewith/lang_toolkit/library/actions/UnifiedRepeater.java
package me.felinewith.lang_toolkit.apps.langbuilder.actions;
package me.felinewith.lang_toolkit.library.actions;
import java.util.ArrayList;
import java.util.function.Consumer;
......
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/util/ConfigHelper.java → library/liblangbuilder/src/main/java/me/felinewith/lang_toolkit/library/helpers/ConfigHelper.java
package me.felinewith.lang_toolkit.apps.langbuilder.util;
package me.felinewith.lang_toolkit.library.helpers;
import java.math.BigDecimal;
import java.math.BigInteger;
......
apps/langbuilder/src/main/java/me/felinewith/lang_toolkit/apps/langbuilder/util/DesktopMenu.java → library/liblangbuilder/src/main/java/me/felinewith/lang_toolkit/library/helpers/DesktopMenu.java
package me.felinewith.lang_toolkit.apps.langbuilder.util;
package me.felinewith.lang_toolkit.library.helpers;
import java.awt.Component;
import java.awt.Dimension;
......
pom.xml
......@@ -73,6 +73,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
</scm>
<modules>
<module>library/libbootstrap</module>
<module>library/liblangbuilder</module>
<module>apps/bootstrap</module>
<module>apps/langbuilder</module>
</modules>
......@@ -173,6 +176,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<artifactId>langbuilder</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>me.felinewith.lang-toolkit.library</groupId>
<artifactId>libbootstrap</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>me.felinewith.lang-toolkit.library</groupId>
<artifactId>liblangbuilder</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!