Skip to content
Permalink
Browse files

Update to 1.8

  • Loading branch information...
Dakkra committed Jul 11, 2015
1 parent 3c3aa8c commit 58fe138727bc9183b4af8466cefcc16800a0f36d
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -14,7 +14,7 @@ apply plugin: 'com.github.johnrengelman.shadow'

mainClassName = 'com.dakkra.pyxleos.PyxleOS'

sourceCompatibility = 1.7
sourceCompatibility = 1.8
version = '0.2.7'

jar {
@@ -8,6 +8,7 @@
import java.io.InputStream;

import javax.imageio.ImageIO;
import javax.swing.SwingUtilities;

import com.dakkra.pyxleos.modules.canvas.Canvas;
import com.dakkra.pyxleos.modules.textedit.TextEdit;
@@ -19,6 +20,12 @@
public static void main(String[] args) {
System.out.println("Initializing PyxleOS");

SwingUtilities.invokeLater(() -> initPyxleOS());

System.out.println("Ready!");
}

public static void initPyxleOS() {
Image tileLoad = null;

try {
@@ -33,7 +40,7 @@ public static void main(String[] args) {
tileG.dispose();

UISettings uis = new UISettings();

MainWindow mw = new MainWindow(uis);

mw.initUIS();
@@ -60,7 +67,5 @@ public static void main(String[] args) {
}
te.setText(greetingMessage);
te.setSize(new Dimension(620, 512));

System.out.println("Ready!");
}
}
@@ -4,6 +4,7 @@
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;

@@ -15,7 +16,6 @@

import com.dakkra.pyxleos.ui.MainWindow;
import com.dakkra.pyxleos.util.Util;
import com.sun.glass.events.KeyEvent;

public class Module {
protected MainWindow mw;
@@ -6,6 +6,7 @@
import java.awt.Graphics2D;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -25,7 +26,6 @@

import com.dakkra.pyxleos.modules.Module;
import com.dakkra.pyxleos.ui.MainWindow;
import com.sun.glass.events.KeyEvent;

import net.miginfocom.swing.MigLayout;

@@ -4,6 +4,7 @@
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;

import javax.swing.JButton;
import javax.swing.JInternalFrame;
@@ -17,7 +18,6 @@

import com.dakkra.pyxleos.ui.MainWindow;
import com.dakkra.pyxleos.util.Util;
import com.sun.glass.events.KeyEvent;

import net.miginfocom.swing.MigLayout;

@@ -6,6 +6,7 @@
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.io.File;

import javax.swing.JFileChooser;
@@ -20,7 +21,6 @@
import com.dakkra.pyxleos.modules.Module;
import com.dakkra.pyxleos.ui.MainWindow;
import com.dakkra.pyxleos.util.Util;
import com.sun.glass.events.KeyEvent;

public class TextEdit extends Module {
private MainWindow mw;
@@ -7,6 +7,7 @@
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyEvent;

import javax.swing.JButton;
import javax.swing.JColorChooser;
@@ -21,7 +22,6 @@

import com.dakkra.pyxleos.ui.components.UIColorButton;
import com.dakkra.pyxleos.util.Util;
import com.sun.glass.events.KeyEvent;

import net.miginfocom.swing.MigLayout;

0 comments on commit 58fe138

Please sign in to comment.
You can’t perform that action at this time.