編集履歴

回答編集履歴

コードを少し小さく

2021/08/13 11:20

投稿

スコア12659

test CHANGED Viewed

@@ -252,13 +252,13 @@
-    setTrumps();
+    setCards();
-  }
+  }
-  void setTrumps() {
+  void setCards() {
     //シャッフル
@@ -370,6 +370,8 @@
+      removeMouseListener();
       Trump cardOne = (Trump)labelOne.getClientProperty(TRUMP_PROPERTY);
       if (cardTwo.getNumber() == cardOne.getNumber()) { //2枚目と1枚目が同じカード
@@ -398,14 +400,48 @@
+  abstract class DelayWorker extends SwingWorker<Object,Object> {
+    private long delay;
+    DelayWorker(long delay) {
+      this.delay = delay;
+    }
+    @Override
+    public Object doInBackground() {
+      try {
+        Thread.sleep(delay);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+      return null;
+    }
+  }
   //1秒後に One,Two それぞれを非表示状態にし再表示する
-  class InvisibleWorker extends SwingWorker<Object,Object> {
+  class InvisibleWorker extends DelayWorker {
     private JLabel labelOne, labelTwo;
     InvisibleWorker(JLabel labelOne, JLabel labelTwo) {
+      super(1000);
       this.labelOne = labelOne;
       this.labelTwo = labelTwo;
@@ -414,21 +450,27 @@
     @Override
-    public Object doInBackground() {
+    protected void done() {
+      labelOne.setVisible(false);
+      labelTwo.setVisible(false);
+      repaint();
-      removeMouseListener();
+      setMouseListener();
-      try {
-        Thread.sleep(1000);
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
+    }
+  }
+  //1秒後にリスタート状態にする
+  class RestartWorker extends DelayWorker {
+    RestartWorker() {
-      return null;
+      super(1000);
     }
@@ -436,9 +478,7 @@
     protected void done() {
-      labelOne.setVisible(false);
+      setCards();
-      labelTwo.setVisible(false);
       repaint();
@@ -450,35 +490,39 @@
-  //1秒後にリスタート状態にする
+  //1秒後に One,Two それぞれを close 状態にし再表示する
-  class RestartWorker extends SwingWorker<Object,Object> {
+  class RedoWorker extends DelayWorker {
+    private JLabel labelOne, labelTwo;
+    private Trump cardOne, cardTwo;
+    RedoWorker(JLabel labelOne, Trump cardOne, JLabel labelTwo, Trump cardTwo) {
+      super(1000);
+      this.labelOne = labelOne;
+      this.cardOne = cardOne;
+      this.labelTwo = labelTwo;
+      this.cardTwo = cardTwo;
+    }
     @Override
-    public Object doInBackground() {
-      removeMouseListener();
-      try {
-        Thread.sleep(1000);
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-      return null;
-    }
-    @Override
     protected void done() {
+      cardOne.close();
+      labelOne.setIcon(cardOne.getIcon());
-      setTrumps();
+      cardTwo.close();
+      labelTwo.setIcon(cardTwo.getIcon());
       repaint();
@@ -488,68 +532,6 @@
   }
-  //1秒後に One,Two それぞれを close 状態にし再表示する
-  class RedoWorker extends SwingWorker<Object,Object> {
-    private JLabel labelOne, labelTwo;
-    private Trump cardOne, cardTwo;
-    RedoWorker(JLabel labelOne, Trump cardOne, JLabel labelTwo, Trump cardTwo) {
-      this.labelOne = labelOne;
-      this.cardOne = cardOne;
-      this.labelTwo = labelTwo;
-      this.cardTwo = cardTwo;
-    }
-    @Override
-    public Object doInBackground() {
-      removeMouseListener();
-      try {
-        Thread.sleep(1000);
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-      return null;
-    }
-    @Override
-    protected void done() {
-      cardOne.close();
-      labelOne.setIcon(cardOne.getIcon());
-      cardTwo.close();
-      labelTwo.setIcon(cardTwo.getIcon());
-      repaint();
-      setMouseListener();
-    }
-  }
 }
 ```