diff --git a/pom.xml b/pom.xml index b138e0b..e8e4a69 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ istlab.KisoJikkenNWP KisoJikkenNWP jar - 0.79 + 0.80 KisoJikkenNWP http://maven.apache.org @@ -13,8 +13,8 @@ 11 UTF-8 UTF-8 - 11 - 11 + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 11 + + + + org.codehaus.mojo exec-maven-plugin 3.0.0 diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 38c840b..0000000 --- a/src/.DS_Store +++ /dev/null Binary files differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store deleted file mode 100644 index 3c86d58..0000000 --- a/src/main/.DS_Store +++ /dev/null Binary files differ diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store deleted file mode 100644 index 18563db..0000000 --- a/src/main/java/.DS_Store +++ /dev/null Binary files differ diff --git a/src/main/java/istlab/KisoJikken/App.java b/src/main/java/istlab/KisoJikken/App.java index a4a38e1..9980c9a 100644 --- a/src/main/java/istlab/KisoJikken/App.java +++ b/src/main/java/istlab/KisoJikken/App.java @@ -187,7 +187,7 @@ if (res == JOptionPane.YES_OPTION) { // JGitをもちいる try { - Git git = Git.cloneRepository() + Git.cloneRepository() .setURI(gitrepos) .setDirectory(new File(userhome + nwp)) .call(); diff --git a/src/main/java/istlab/KisoJikken/CCellRenderer.java b/src/main/java/istlab/KisoJikken/CCellRenderer.java index a5e2f02..d7881ca 100644 --- a/src/main/java/istlab/KisoJikken/CCellRenderer.java +++ b/src/main/java/istlab/KisoJikken/CCellRenderer.java @@ -16,7 +16,6 @@ import org.fife.ui.autocomplete.FunctionCompletion; import org.fife.ui.autocomplete.VariableCompletion; - /** * The cell renderer used for the C programming language. * @@ -28,7 +27,6 @@ private Icon variableIcon; private Icon functionIcon; - /** * Constructor. */ @@ -37,42 +35,38 @@ functionIcon = getIcon("img/function.png"); } - /** * {@inheritDoc} */ @Override - protected void prepareForOtherCompletion(JList list, + protected void prepareForOtherCompletion(@SuppressWarnings("rawtypes") JList list, Completion c, int index, boolean selected, boolean hasFocus) { super.prepareForOtherCompletion(list, c, index, selected, hasFocus); setIcon(getEmptyIcon()); } - /** * {@inheritDoc} */ @Override - protected void prepareForVariableCompletion(JList list, + protected void prepareForVariableCompletion(@SuppressWarnings("rawtypes") JList list, VariableCompletion vc, int index, boolean selected, boolean hasFocus) { super.prepareForVariableCompletion(list, vc, index, selected, - hasFocus); + hasFocus); setIcon(variableIcon); } - /** * {@inheritDoc} */ @Override - protected void prepareForFunctionCompletion(JList list, + protected void prepareForFunctionCompletion(@SuppressWarnings("rawtypes") JList list, FunctionCompletion fc, int index, boolean selected, boolean hasFocus) { super.prepareForFunctionCompletion(list, fc, index, selected, - hasFocus); + hasFocus); setIcon(functionIcon); } - } diff --git a/src/main/java/istlab/KisoJikken/Editor.java b/src/main/java/istlab/KisoJikken/Editor.java index 7162e2c..7ba3219 100644 --- a/src/main/java/istlab/KisoJikken/Editor.java +++ b/src/main/java/istlab/KisoJikken/Editor.java @@ -179,12 +179,15 @@ public void save() { String src = textArea.getText(); // System.out.println(src); + PrintWriter out = null; try { - PrintWriter out = new PrintWriter(file.getAbsolutePath(), "UTF-8"); + out = new PrintWriter(file.getAbsolutePath(), "UTF-8"); out.println(src); out.flush(); } catch (FileNotFoundException | UnsupportedEncodingException e) { e.printStackTrace(); + } finally { + out.close(); } System.out.println("保存しました"); saveB.setEnabled(false); diff --git a/src/main/java/istlab/KisoJikken/JTAConsole.java b/src/main/java/istlab/KisoJikken/JTAConsole.java index 8ea34d4..0e633f9 100644 --- a/src/main/java/istlab/KisoJikken/JTAConsole.java +++ b/src/main/java/istlab/KisoJikken/JTAConsole.java @@ -26,9 +26,10 @@ import javax.swing.JFrame; import javax.swing.JOptionPane; -import javax.swing.JScrollPane; import javax.swing.text.BadLocationException; +import org.fife.ui.rtextarea.RTextScrollPane; + import com.github.difflib.text.DiffRow; import com.github.difflib.text.DiffRowGenerator; import com.google.gson.Gson; @@ -61,7 +62,7 @@ // pb = prob; frame = new JFrame(title); - frame.getContentPane().add(new JScrollPane(this)); + frame.getContentPane().add(new RTextScrollPane(this)); frame.setSize(500, win_height); frame.setVisible(true); frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); @@ -83,13 +84,6 @@ addKeyListener(this); addMouseListener(this); - // if (lastActivePoint != null){ - // frame.setLocation(lastActivePoint.x+500, lastActivePoint.y); - // } else if (lastWindow != null && lastWindow.isVisible()){ - // Point lastFrameP = lastWindow.frame.getLocationOnScreen(); - // frame.setLocation(lastFrameP.x+500, lastFrameP.y); - // } - // lastWindow = this; winStack.push(this); originalContent = new StringBuilder(); } @@ -299,25 +293,21 @@ @Override public void mousePressed(MouseEvent e) { - // TODO Auto-generated method stub } @Override public void mouseReleased(MouseEvent e) { - // TODO Auto-generated method stub } @Override public void mouseEntered(MouseEvent e) { - // TODO Auto-generated method stub } @Override public void mouseExited(MouseEvent e) { - // TODO Auto-generated method stub } diff --git a/src/main/java/istlab/KisoJikken/Launcher.java b/src/main/java/istlab/KisoJikken/Launcher.java index 55c313e..68eb38d 100644 --- a/src/main/java/istlab/KisoJikken/Launcher.java +++ b/src/main/java/istlab/KisoJikken/Launcher.java @@ -32,7 +32,7 @@ public class Launcher extends JFrame implements MouseInputListener, KeyListener, Runnable { public static Launcher theapp; - public static String version = "0.79"; + public static String version = "0.80"; static int reboot_msec = 2000; // JPanel mainP; @@ -332,43 +332,36 @@ @Override public void mousePressed(MouseEvent e) { - // TODO Auto-generated method stub } @Override public void mouseReleased(MouseEvent e) { - // TODO Auto-generated method stub } @Override public void mouseEntered(MouseEvent e) { - // TODO Auto-generated method stub } @Override public void mouseExited(MouseEvent e) { - // TODO Auto-generated method stub } @Override public void mouseDragged(MouseEvent e) { - // TODO Auto-generated method stub } @Override public void mouseMoved(MouseEvent e) { - // TODO Auto-generated method stub } @Override public void keyTyped(KeyEvent e) { - // TODO Auto-generated method stub } @@ -389,7 +382,6 @@ @Override public void keyReleased(KeyEvent e) { - // TODO Auto-generated method stub } diff --git a/src/main/java/istlab/KisoJikken/Test/AfterRewrite.php b/src/main/java/istlab/KisoJikken/Test/AfterRewrite.php old mode 100755 new mode 100644 diff --git a/src/main/java/org/.DS_Store b/src/main/java/org/.DS_Store deleted file mode 100644 index bb868b8..0000000 --- a/src/main/java/org/.DS_Store +++ /dev/null Binary files differ diff --git a/src/main/java/org/mdkt/.DS_Store b/src/main/java/org/mdkt/.DS_Store deleted file mode 100644 index 973f3e4..0000000 --- a/src/main/java/org/mdkt/.DS_Store +++ /dev/null Binary files differ