Java 8 adaption

Author: DanielGronau

.gitignore

@@ -0,0 +1,26 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+

pom.xml

@@ -7,6 +7,10 @@
     <groupId>sirtet</groupId>
     <artifactId>sirtet</artifactId>
     <version>1.0-SNAPSHOT</version>
-
+    
+    <properties>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+    </properties>
 
 </project>

src/main/java/triest/Triest.java

@@ -7,7 +7,7 @@
 
 public class Triest {
     public static void main(String[] args) {
-         View view =  new Gui().getView(new Grid(10,20)); //view
-         new GameLoop(view);  //controller
+        View view = new Gui().getView(new Grid(10, 20)); //view
+        new GameLoop(view);  //controller
     }
 }

src/main/java/triest/model/Pos.java

@@ -4,7 +4,7 @@ public class Pos {
     public final int x;
     public final int y;
 
-    public Pos(int x, int y) {
+    Pos(int x, int y) {
         this.x = x;
         this.y = y;
     }

src/main/java/triest/model/Shape.java

@@ -15,7 +15,7 @@ public enum Shape {
 
     private boolean[][] shape;
 
-    private Shape(boolean[][] shape) {
+    Shape(boolean[][] shape) {
        this.shape = shape;
     }
 

src/main/java/triest/view/GridPanel.java

@@ -23,7 +23,7 @@ public class GridPanel extends JPanel implements View {
     private int posX = 0;
     private int posY = 0;
 
-    public GridPanel(final Grid grid) {
+    GridPanel(final Grid grid) {
         this.grid = grid;
         this.size = new Dimension(grid.width * BLOCK_SIZE, grid.height * BLOCK_SIZE);
         this.addMouseMotionListener(new MouseMotionAdapter() {
@@ -75,10 +75,9 @@ public void setPiece(Piece piece) {
     }
 
     public boolean newGame() {
-        return JOptionPane.showConfirmDialog(this, "Play again?","Game Over!",JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
+        return JOptionPane.showConfirmDialog(this, "Play again?", "Game Over!", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
     }
 
-    @Override
     public Grid getGrid() {
         return grid;
     }
@@ -99,13 +98,13 @@ private void drawBlocks(Graphics2D g2) {
         for (int y = 0; y < grid.height; y++) {
             double f = (double) y / grid.height;
             int green = (int) (120 + f * (240 - 120));
-            int red = (int) (120 + (1-f) * (240 - 120));
+            int red = (int) (120 + (1 - f) * (240 - 120));
             Color blockColor = new Color(red, green, 100);
             for (int x = 0; x < grid.width; x++) {
                 if (grid.get(x, y)) {
                     g2.setPaint(new GradientPaint(
-                            x * BLOCK_SIZE, y * BLOCK_SIZE, blockColor,
-                            (x + 1) * BLOCK_SIZE, (y + 1) * BLOCK_SIZE, blockColor.darker())
+                        x * BLOCK_SIZE, y * BLOCK_SIZE, blockColor,
+                        (x + 1) * BLOCK_SIZE, (y + 1) * BLOCK_SIZE, blockColor.darker())
                     );
                     g2.fillRect(x * BLOCK_SIZE, y * BLOCK_SIZE, BLOCK_SIZE, BLOCK_SIZE);
                     g2.setPaint(null);
@@ -142,6 +141,6 @@ private void drawHud(Graphics2D g2) {
         g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         g2.setFont(hudFont);
         g2.setColor(hudColor);
-        g2.drawString(String.format("%05d pieces, %03d lines",grid.getPieceCount(), grid.getLineCount()), 10, 20);
+        g2.drawString(String.format("%05d pieces, %03d lines", grid.getPieceCount(), grid.getLineCount()), 10, 20);
     }
 }

src/main/java/triest/view/Gui.java

@@ -10,18 +10,15 @@ public class Gui {
     //returns the component that needs to be repainted
     public View getView(Grid grid) {
         final GridPanel gridPanel = new GridPanel(grid);
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                JFrame frame = new JFrame("Triest");
-                frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-                frame.setLayout(new GridLayout(1, 1));
-                frame.add(gridPanel);
-                frame.setResizable(false);
-                frame.pack();
-                centerOnScreen(frame);
-                frame.setVisible(true);
-            }
+        SwingUtilities.invokeLater(() -> {
+            JFrame frame = new JFrame("Triest");
+            frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+            frame.setLayout(new GridLayout(1, 1));
+            frame.add(gridPanel);
+            frame.setResizable(false);
+            frame.pack();
+            centerOnScreen(frame);
+            frame.setVisible(true);
         });
         return gridPanel;
     }

src/main/java/triest/view/View.java

@@ -5,12 +5,12 @@
 
 public interface View {
 
-    public void repaint();
+    void repaint();
 
-    public void setPiece(Piece piece);
+    void setPiece(Piece piece);
 
-    public boolean newGame();
+    boolean newGame();
 
-    public Grid getGrid();
+    Grid getGrid();
 
 }

triest.iml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>