|
From: <se...@us...> - 2008-05-24 14:29:17
|
Revision: 164
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=164&view=rev
Author: sem62
Date: 2008-05-24 07:29:24 -0700 (Sat, 24 May 2008)
Log Message:
-----------
* Created class for managing main menu
* moved parsing parameter to Setting class
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java
WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
Added Paths:
-----------
WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenu.java
WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenuListenet.java
Added: WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenu.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenu.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenu.java 2008-05-24 14:29:24 UTC (rev 164)
@@ -0,0 +1,90 @@
+package edu.lnu.FireFly.WebEditor;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+
+import edu.lnu.FireFly.WebEditor.Data.AnswersStatusManager;
+import edu.lnu.FireFly.WebEditor.WSClients.WebEditorServiceClient;
+
+public class MainMenu extends JMenuBar implements ActionListener {
+
+ private MainMenuListenet listener = null;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 8349926727749029112L;
+
+ public MainMenu() {
+ init();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ try {
+ if (arg0.getSource() == openMenuItem) {
+ if (listener != null) {
+ listener.openManifest();
+ }
+ }
+
+ if (arg0.getSource() == resetMenuItem) {
+ AnswersStatusManager.getInstance().resetAllAnswers();
+ }
+
+ if (arg0.getSource() == publishMenuItem) {
+ WebEditorServiceClient.getInstance().publish();
+ }
+
+ if (arg0.getSource() == saveMenuItem) {
+ if (listener != null) {
+ listener.saveManifest();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void setListener(MainMenuListenet listener){
+ this.listener = listener;
+ }
+
+ private void init() {
+ JMenu fileMenu = new JMenu("File");
+ add(fileMenu);
+
+ JMenu editMenu = new JMenu("Edit");
+ add(editMenu);
+
+ resetMenuItem = new JMenuItem("Reset user activity");
+ resetMenuItem.addActionListener(this);
+ fileMenu.add(resetMenuItem);
+
+ openMenuItem = new JMenuItem("Open");
+ openMenuItem.addActionListener(this);
+ fileMenu.add(openMenuItem);
+
+ // Create a menu item
+ saveMenuItem = new JMenuItem("Save");
+ saveMenuItem.addActionListener(this);
+ fileMenu.add(saveMenuItem);
+
+ // Create a menu item
+ publishMenuItem = new JMenuItem("Publish");
+ publishMenuItem.addActionListener(this);
+ fileMenu.add(publishMenuItem);
+ }
+
+ protected JMenuItem openMenuItem = null;
+
+ protected JMenuItem resetMenuItem = null;
+
+ protected JMenuItem saveMenuItem = null;
+
+ private JMenuItem publishMenuItem;
+
+}
Added: WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenuListenet.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenuListenet.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenuListenet.java 2008-05-24 14:29:24 UTC (rev 164)
@@ -0,0 +1,8 @@
+package edu.lnu.FireFly.WebEditor;
+
+import edu.lnu.FireFly.FFManifest.parser.TestDocException;
+
+public interface MainMenuListenet {
+ public void saveManifest() throws TestDocException;
+ public void openManifest() throws TestDocException;
+}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java 2008-05-24 13:10:11 UTC (rev 163)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java 2008-05-24 14:29:24 UTC (rev 164)
@@ -1,5 +1,7 @@
package edu.lnu.FireFly.WebEditor;
+import javax.swing.JApplet;
+
public class Settings {
private String courseLocation = "http://127.0.0.1/sem/course/";
private String templateLocation = "http://127.0.0.1/sem/WebEditor/template/";
@@ -19,7 +21,27 @@
return obj;
}
+
+ public void parseAppletParameters(JApplet applet){
+ String paramCourseLocation = applet.getParameter("courseLocation");
+ String paramServiceLocation = applet.getParameter("serviceLocation");
+ String paramTemplateLocation = applet.getParameter("templateLocation");
+ String paramResourceLocation = applet.getParameter("resourceLocation");
+ if (paramCourseLocation != null) {
+ Settings.getInstance().setCourseLocation(paramCourseLocation);
+ }
+ if (paramServiceLocation != null) {
+ Settings.getInstance().setServiceLocation(paramServiceLocation);
+ }
+ if (paramTemplateLocation != null) {
+ Settings.getInstance().setTemplateLocation(paramTemplateLocation);
+ }
+ if (paramResourceLocation != null) {
+ Settings.getInstance().setResourceLocation(paramResourceLocation);
+ }
+ }
+
public String getCourseLocation() {
return courseLocation;
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-24 13:10:11 UTC (rev 163)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-24 14:29:24 UTC (rev 164)
@@ -1,11 +1,5 @@
package edu.lnu.FireFly.WebEditor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
import javax.swing.JScrollPane;
import edu.lnu.FireFly.FFManifest.Manifest;
@@ -22,8 +16,7 @@
import edu.lnu.FireFly.WebEditor.ItemModels.OrganizationModel;
import edu.lnu.FireFly.WebEditor.WSClients.WebEditorServiceClient;
-public class WebEditor extends AppletWithWYSIWYGEditor implements
- ActionListener {
+public class WebEditor extends AppletWithWYSIWYGEditor implements MainMenuListenet{
/**
*
@@ -36,41 +29,11 @@
protected Manifest manifest = null;
- protected JMenuItem openMenuItem = null;
-
- protected JMenuItem resetMenuItem = null;
-
- protected JMenuItem saveMenuItem = null;
-
private Thread threadForAautoSave;
private AutoSaveThread autoSaveThread;
- private JMenuItem publishMenuItem;
-
@Override
- public void actionPerformed(ActionEvent arg0) {
- try {
- if (arg0.getSource() == openMenuItem) {
- openManifest();
- }
-
- if (arg0.getSource() == resetMenuItem) {
- AnswersStatusManager.getInstance().resetAllAnswers();
- }
-
- if (arg0.getSource() == publishMenuItem) {
- WebEditorServiceClient.getInstance().publish();
- }
-
- if (arg0.getSource() == saveMenuItem) {
- saveManifest();
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
public void saveManifest() throws TestDocException {
Parser parser = new Parser();
@@ -80,6 +43,7 @@
parser.toXML(manifest));
}
+ @Override
public void openManifest() throws TestDocException {
Parser parser = new Parser();
@@ -101,8 +65,8 @@
@Override
public void init() {
- parseParameter();
-
+ Settings.getInstance().parseAppletParameters(this);
+
instance = this;
autoSaveThread = new AutoSaveThread();
@@ -125,26 +89,6 @@
courseTree.addMouseListener(new CourseTreePopupMenu());
}
- private void parseParameter() {
- String paramCourseLocation = getParameter("courseLocation");
- String paramServiceLocation = getParameter("serviceLocation");
- String paramTemplateLocation = getParameter("templateLocation");
- String paramResourceLocation = getParameter("resourceLocation");
-
- if (paramCourseLocation != null) {
- Settings.getInstance().setCourseLocation(paramCourseLocation);
- }
- if (paramServiceLocation != null) {
- Settings.getInstance().setServiceLocation(paramServiceLocation);
- }
- if (paramTemplateLocation != null) {
- Settings.getInstance().setTemplateLocation(paramTemplateLocation);
- }
- if (paramResourceLocation != null) {
- Settings.getInstance().setResourceLocation(paramResourceLocation);
- }
- }
-
private void CreateNewCourse() {
try {
manifest = ManifestFactory.createManifest();
@@ -166,35 +110,8 @@
}
public void initMenu() {
- // Create the menu bar
- JMenuBar menuBar = new JMenuBar();
-
- // Create a menu
- JMenu fileMenu = new JMenu("File");
- menuBar.add(fileMenu);
-
- JMenu editMenu = new JMenu("Edit");
- menuBar.add(editMenu);
-
- resetMenuItem = new JMenuItem("Reset user activity");
- resetMenuItem.addActionListener(this);
- fileMenu.add(resetMenuItem);
-
- openMenuItem = new JMenuItem("Open");
- openMenuItem.addActionListener(this);
- fileMenu.add(openMenuItem);
-
- // Create a menu item
- saveMenuItem = new JMenuItem("Save");
- saveMenuItem.addActionListener(this);
- fileMenu.add(saveMenuItem);
-
- // Create a menu item
- publishMenuItem = new JMenuItem("Publish");
- publishMenuItem.addActionListener(this);
- fileMenu.add(publishMenuItem);
-
- // Install the menu bar in the frame
+ MainMenu menuBar = new MainMenu();
+ menuBar.setListener(this);
this.setJMenuBar(menuBar);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|