Skip to content

Commit ea6006a

Browse files
authored
Merge pull request #57 from UCSDOalads/develop
Release v0.3
2 parents 2b612f7 + ff8bff1 commit ea6006a

File tree

117 files changed

+6702
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+6702
-166
lines changed

.classpath

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<classpath>
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
56
<classpathentry kind="output" path="bin"/>
67
</classpath>

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
*.class
22
/bin/
3+
.DS_Store
4+
.settings
5+
.settings/*

.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 11 deletions
This file was deleted.

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
language: java
2+
jdk:
3+
- oraclejdk8
4+
5+
before_script:
6+
- "export DISPLAY=:99.0"
7+
- "sh -e /etc/init.d/xvfb start"
8+
- sleep 3 # give xvfb some time to start
9+
10+
notifications:
11+
email: false

TODOList.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
1. File Save/Close Operations
2+
2. Edit Undo/Redo Operations
3+
//3. More usable SelectTools
4+
//4. Remove Functinoality
5+
//5. Zooming and Scrolling and Moving Function
6+
6. Data Point Connection Types
7+
7. Available Class Search
8+
8. Auto-Update Display Box Affected by Recent Changes
9+
9. Debug Undo Function
10+
10. Type Cast try (String) catch
11+
12+
13+
14+
1. File Save
15+
2. ClassSearch
16+
11. Display history
17+
12.
18+
13.

bin/.gitignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

build.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<project name="JavaSketchPad" default="run" basedir=".">
2+
<property name="build.dir" location="ant_build" />
3+
<property name="src.dir" location="src" />
4+
5+
<target name="init" description="Creating directory">
6+
<mkdir dir="${build.dir}" />
7+
</target>
8+
9+
<target name="compile" depends="init" description="Compiling Sources">
10+
<javac srcdir="${src.dir}" destdir="${build.dir}" includeantruntime="false">
11+
<classpath refid="classpath.test" />
12+
</javac>
13+
</target>
14+
15+
<target name="run" depends="compile" description="Running the program">
16+
</target>
17+
18+
<target name="clean">
19+
<delete dir="${build.dir}" />
20+
</target>
21+
22+
23+
<path id="classpath.test">
24+
<pathelement location="lib/junit-4.12.jar" />
25+
<pathelement location="lib/hamcrest-core-1.3.jar" />
26+
<pathelement location="${build.dir}" />
27+
</path>
28+
29+
30+
<target name="test" depends="compile">
31+
<junit printsummary="on" haltonfailure="yes" fork="true">
32+
<classpath>
33+
<path refid="classpath.test" />
34+
<pathelement location="${test.build.dir}" />
35+
</classpath>
36+
<formatter type="brief" usefile="false" />
37+
<batchtest>
38+
<fileset dir="${src.dir}" includes="**/*Test.java" />
39+
</batchtest>
40+
</junit>
41+
</target>
42+
</project>

lib/hamcrest-core-1.3.jar

44 KB
Binary file not shown.

lib/junit-4.12.jar

308 KB
Binary file not shown.
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package actions;
2+
3+
import java.util.ArrayList;
4+
5+
import javax.swing.JOptionPane;
6+
7+
import actions.menu.ActionsMenuBarTitles;
8+
import actions.singleinstanceoperations.SingleInstanceOperation;
9+
import paintcomponents.PaintComponent;
10+
import paintcomponents.annotations.TextAnnotation;
11+
import paintcomponents.data.DataTextPaintComponent;
12+
import ui.PaintPanel;
13+
14+
/**
15+
* add the annotation to a component
16+
*
17+
* @author muchi
18+
*
19+
*/
20+
public class AddAnnotationAction extends SingleInstanceOperation<PaintComponent>{
21+
22+
/**
23+
* ctor
24+
* @param panel the panel
25+
*/
26+
public AddAnnotationAction(PaintPanel panel) {
27+
super(panel);
28+
}
29+
30+
/**
31+
* @return the location of the button
32+
*/
33+
@Override
34+
public String locationString() {
35+
return ActionsMenuBarTitles.Data().Annotations().Add().toString();
36+
}
37+
38+
@Override
39+
protected void performActionOnInstance(PaintComponent instance) {
40+
// TODO Auto-generated method stub
41+
String annotations = JOptionPane
42+
.showInputDialog("Please specify the annotation of the component");
43+
new TextAnnotation(instance, annotations);
44+
45+
}
46+
47+
@Override
48+
protected Class<PaintComponent> getGenericClassType() {
49+
return PaintComponent.class;
50+
}
51+
52+
53+
}

0 commit comments

Comments
 (0)