소스 검색

adding awt to model, accessing colours properly in main, i hope

tarfeef101 6 년 전
부모
커밋
ac27a65649
2개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      assignments/a2/src/main/java/Main.java
  2. 1 0
      assignments/a2/src/main/java/Model.java

+ 3 - 3
assignments/a2/src/main/java/Main.java

@@ -20,9 +20,9 @@ public class Main
 		mainpanel.add(menubar, BorderLayout.PAGE_START);
 		mainpanel.add(menubar, BorderLayout.PAGE_START);
 		mainpanel.add(sidepane, BorderLayout.LINE_START);
 		mainpanel.add(sidepane, BorderLayout.LINE_START);
 		mainpanel.add(controls, BorderLayout.PAGE_END);
 		mainpanel.add(controls, BorderLayout.PAGE_END);
-		model.setMenuColour(green);
-		model.setSideColour(cyan);
-		model.setControlColour(red);
+		model.setMenuColour(Color.green);
+		model.setSideColour(Color.cyan);
+		model.setControlColour(Color.red);
 		
 		
 		// Setup the frame to do frame things
 		// Setup the frame to do frame things
 		window.setPreferredSize(new Dimension(300,300));
 		window.setPreferredSize(new Dimension(300,300));

+ 1 - 0
assignments/a2/src/main/java/Model.java

@@ -1,5 +1,6 @@
 import java.util.Observable;
 import java.util.Observable;
 import java.util.*;
 import java.util.*;
+import java.awt.*;
 
 
 public class Model extends Observable
 public class Model extends Observable
 {
 {