Commit a96cc29b authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Merge branch 'package-fix' into 'master' 

Package fix

See merge request ec504/hw3/p2!1
parents 163ea4ca f7235fec

.idea/modules.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<project version="4">

  <component name="ProjectModuleManager">

    <modules>

      <module fileurl="file://$PROJECT_DIR$/hw3p1.iml" filepath="$PROJECT_DIR$/hw3p1.iml" />

      <module fileurl="file://$PROJECT_DIR$/hw3p2.iml" filepath="$PROJECT_DIR$/hw3p2.iml" />

    </modules>

  </component>

</project>
 
 No newline at end of file

hw3p1.iml→hw3p2.iml

+0 −0

File moved.

View file

src/edu/bu/ec504/hw3/p1/Canvas.java→src/edu/bu/ec504/hw3/p2/Canvas.java

+2 −2
Original line number Diff line number Diff line 
package edu.bu.ec504.hw3.p1;

package edu.bu.ec504.hw3.p2;



import edu.bu.ec504.hw3.p1.Canvas.CanvasPoint;

import edu.bu.ec504.hw3.p2.Canvas.CanvasPoint;

import java.util.ArrayList;

import java.util.Iterator;

src/edu/bu/ec504/hw3/p1/GraphicalMain.java→src/edu/bu/ec504/hw3/p2/GraphicalMain.java

+2 −2
Original line number Diff line number Diff line 
package edu.bu.ec504.hw3.p1;

package edu.bu.ec504.hw3.p2;



import static javax.swing.SwingUtilities.invokeLater;



import edu.bu.ec504.hw3.p1.Canvas.CanvasPoint;

import edu.bu.ec504.hw3.p2.Canvas.CanvasPoint;

import java.awt.Color;

import java.awt.Dimension;

import java.awt.Graphics;

src/edu/bu/ec504/hw3/p1/Main.java→src/edu/bu/ec504/hw3/p2/Main.java

+2 −2
Original line number Diff line number Diff line 
package edu.bu.ec504.hw3.p1;

package edu.bu.ec504.hw3.p2;



import edu.bu.ec504.hw3.p1.Canvas.CanvasPoint;

import edu.bu.ec504.hw3.p2.Canvas.CanvasPoint;

import java.util.ArrayList;



public class Main {