Menu
▾
▴
[Jason-developers] SF.net SVN: jason:[1889] trunk
|
From: <jom...@us...> - 2016-04-09 10:45:26
|
Revision: 1889
http://sourceforge.net/p/jason/svn/1889
Author: jomifred
Date: 2016-04-09 10:45:24 +0000 (Sat, 09 Apr 2016)
Log Message:
-----------
move some classes from jeditplugin package to better packages
Modified Paths:
--------------
trunk/applications/as-unit-test/src/jason/asunit/TestAgent.java
trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
trunk/src/jason/asSyntax/parser/as2j.java
trunk/src/jason/asSyntax/parser/as2jTokenManager.java
trunk/src/jason/infra/InfrastructureFactory.java
trunk/src/jason/infra/centralised/CentralisedFactory.java
trunk/src/jason/infra/centralised/CentralisedMASLauncherAnt.java
trunk/src/jason/infra/jade/JadeFactory.java
trunk/src/jason/infra/jade/JadeMASLauncherAnt.java
trunk/src/jason/jeditplugin/JasonID.java
trunk/src/jason/mas2j/parser/MAS2JavaParser.jcc
trunk/src/jason/mas2j/parser/mas2j.java
trunk/src/jason/mas2j/parser/mas2jTokenManager.java
Added Paths:
-----------
trunk/src/jason/infra/MASLauncherInfraTier.java
trunk/src/jason/infra/RunProjectListener.java
trunk/src/jason/util/CheckVersion.java
Removed Paths:
-------------
trunk/src/jason/jeditplugin/CheckVersion.java
trunk/src/jason/jeditplugin/MASLauncherInfraTier.java
trunk/src/jason/jeditplugin/RunProjectListener.java
Modified: trunk/applications/as-unit-test/src/jason/asunit/TestAgent.java
===================================================================
--- trunk/applications/as-unit-test/src/jason/asunit/TestAgent.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/applications/as-unit-test/src/jason/asunit/TestAgent.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -1,6 +1,10 @@
package jason.asunit;
import static org.junit.Assert.fail;
+
+import java.io.StringReader;
+import java.util.logging.Level;
+
import jason.JasonException;
import jason.RevisionFailedException;
import jason.asSemantics.Agent;
@@ -16,11 +20,8 @@
import jason.asSyntax.parser.ParseException;
import jason.bb.BeliefBase;
import jason.infra.centralised.RunCentralisedMAS;
-import jason.jeditplugin.Config;
+import jason.util.Config;
-import java.io.StringReader;
-import java.util.logging.Level;
-
public class TestAgent extends Agent {
// creates the masRunner
Modified: trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc
===================================================================
--- trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/asSyntax/parser/AS2JavaParser.jcc 2016-04-09 10:45:24 UTC (rev 1889)
@@ -47,7 +47,7 @@
import jason.asSyntax.PlanBody.BodyType;
import jason.asSyntax.Trigger.TEOperator;
import jason.asSyntax.Trigger.TEType;
- import jason.jeditplugin.*;
+ import jason.util.*;
public class as2j {
private String asSource = null;
Modified: trunk/src/jason/asSyntax/parser/as2j.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2j.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/asSyntax/parser/as2j.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -16,7 +16,7 @@
import jason.asSyntax.PlanBody.BodyType;
import jason.asSyntax.Trigger.TEOperator;
import jason.asSyntax.Trigger.TEType;
- import jason.jeditplugin.*;
+ import jason.util.*;
public class as2j implements as2jConstants {
private String asSource = null;
Modified: trunk/src/jason/asSyntax/parser/as2jTokenManager.java
===================================================================
--- trunk/src/jason/asSyntax/parser/as2jTokenManager.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/asSyntax/parser/as2jTokenManager.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -14,7 +14,7 @@
import jason.asSyntax.PlanBody.BodyType;
import jason.asSyntax.Trigger.TEOperator;
import jason.asSyntax.Trigger.TEType;
-import jason.jeditplugin.*;
+import jason.util.*;
public class as2jTokenManager implements as2jConstants
{
Modified: trunk/src/jason/infra/InfrastructureFactory.java
===================================================================
--- trunk/src/jason/infra/InfrastructureFactory.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/infra/InfrastructureFactory.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -1,6 +1,5 @@
package jason.infra;
-import jason.jeditplugin.MASLauncherInfraTier;
import jason.runtime.RuntimeServicesInfraTier;
/**
Copied: trunk/src/jason/infra/MASLauncherInfraTier.java (from rev 1888, trunk/src/jason/jeditplugin/MASLauncherInfraTier.java)
===================================================================
--- trunk/src/jason/infra/MASLauncherInfraTier.java (rev 0)
+++ trunk/src/jason/infra/MASLauncherInfraTier.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -0,0 +1,42 @@
+package jason.infra;
+
+import jason.mas2j.MAS2JProject;
+
+/**
+ * Used to launch an MAS. Each infrastructure should
+ * implements it.
+ *
+ * <p>The methods of this class are called in the following order:
+ * <ul>
+ * <li>setProject</li>
+ * <li>setListener</li>
+ * <li>writeScripts</li>
+ * <li>stopMAS</li>
+ * </ul>
+ */
+public interface MASLauncherInfraTier extends Runnable {
+
+ /**
+ * Sets the description of the project to be run.
+ */
+ public void setProject(MAS2JProject project);
+
+ /**
+ * Sets the object that wants to be informed about the changes in
+ * the execution state. This object normally is the JasonIDE, that
+ * wants to change available buttons as the project is being
+ * executed.
+ */
+ public void setListener(RunProjectListener listener);
+
+ /**
+ * Writes the script(s), normally Ant scripts, used to launch the
+ * MAS.
+ */
+ public boolean writeScripts(boolean debug, boolean useBuildFileName);
+
+ /**
+ * Stops the MAS execution.
+ */
+ public void stopMAS();
+}
Copied: trunk/src/jason/infra/RunProjectListener.java (from rev 1888, trunk/src/jason/jeditplugin/RunProjectListener.java)
===================================================================
--- trunk/src/jason/infra/RunProjectListener.java (rev 0)
+++ trunk/src/jason/infra/RunProjectListener.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -0,0 +1,9 @@
+package jason.infra;
+
+/**
+ * This interface is implemented by objects that wants to be notified
+ * about changes in the MAS execution state (like JasonIDE).
+ */
+public interface RunProjectListener {
+ public void masFinished();
+}
Modified: trunk/src/jason/infra/centralised/CentralisedFactory.java
===================================================================
--- trunk/src/jason/infra/centralised/CentralisedFactory.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/infra/centralised/CentralisedFactory.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -1,7 +1,7 @@
package jason.infra.centralised;
import jason.infra.InfrastructureFactory;
-import jason.jeditplugin.MASLauncherInfraTier;
+import jason.infra.MASLauncherInfraTier;
import jason.runtime.RuntimeServicesInfraTier;
public class CentralisedFactory implements InfrastructureFactory {
Modified: trunk/src/jason/infra/centralised/CentralisedMASLauncherAnt.java
===================================================================
--- trunk/src/jason/infra/centralised/CentralisedMASLauncherAnt.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/infra/centralised/CentralisedMASLauncherAnt.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -8,8 +8,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import jason.jeditplugin.MASLauncherInfraTier;
-import jason.jeditplugin.RunProjectListener;
+import jason.infra.MASLauncherInfraTier;
+import jason.infra.RunProjectListener;
import jason.mas2j.MAS2JProject;
import jason.util.Config;
Modified: trunk/src/jason/infra/jade/JadeFactory.java
===================================================================
--- trunk/src/jason/infra/jade/JadeFactory.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/infra/jade/JadeFactory.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -1,7 +1,7 @@
package jason.infra.jade;
import jason.infra.InfrastructureFactory;
-import jason.jeditplugin.MASLauncherInfraTier;
+import jason.infra.MASLauncherInfraTier;
import jason.runtime.RuntimeServicesInfraTier;
public class JadeFactory implements InfrastructureFactory {
Modified: trunk/src/jason/infra/jade/JadeMASLauncherAnt.java
===================================================================
--- trunk/src/jason/infra/jade/JadeMASLauncherAnt.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/infra/jade/JadeMASLauncherAnt.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -14,8 +14,8 @@
import jason.asSyntax.Literal;
import jason.asSyntax.StringTerm;
import jason.asSyntax.parser.ParseException;
+import jason.infra.MASLauncherInfraTier;
import jason.infra.centralised.CentralisedMASLauncherAnt;
-import jason.jeditplugin.MASLauncherInfraTier;
import jason.mas2j.AgentParameters;
import jason.util.Config;
Deleted: trunk/src/jason/jeditplugin/CheckVersion.java
===================================================================
--- trunk/src/jason/jeditplugin/CheckVersion.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/jeditplugin/CheckVersion.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -1,126 +0,0 @@
-package jason.jeditplugin;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-
-import jason.util.Config;
-
-public class CheckVersion extends Thread {
-
- public static final String JasonSite = "http://jason.sf.net";
- String download;
-
- String version;
- String release;
-
- String getLatestVersion() {
- // read version from Jason site
- try {
- Properties p = new Properties();
- p.load(new URL(JasonSite+"/latest.properties").openStream());
- download = p.getProperty("download");
- version = p.getProperty("version");
- release = p.getProperty("release");
- return version + "." + release;
- } catch (Exception ex) {
- System.out.println(ex);
- return null;
- }
- }
-
- boolean isLatestVersion() {
- // get user version
- String cVersion = Config.get().getJasonRunningVersion();
- String lv = getLatestVersion();
- return lv == null || cVersion.compareTo(lv) >= 0;
- }
-
- String whatsNew() {
- try {
- StringBuilder out = new StringBuilder();
- InputStream in = new URL(JasonSite+"/whatsnew.txt").openStream();
- int c = in.read();
- while (c != -1) {
- out.append((char) c);
- c = in.read();
- }
- return out.toString();
- } catch (Exception e) {
- System.err.println("Error reading what's new!" + e);
- return null;
- }
- }
-
- void show() {
- final JFrame f = new JFrame("Jason update");
- f.setLayout(new BorderLayout());
-
- JTextArea ta = new JTextArea(20, 90);
- f.add(BorderLayout.CENTER,new JScrollPane(ta));
-
- JPanel sp = new JPanel(new FlowLayout(FlowLayout.CENTER));
- //JButton notShow = new JButton("Do not show this message again.");
- JButton ok = new JButton("Ok");
- ok.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
- f.setVisible(false); }
- });
- JButton notShow = new JButton("Do not show this message again");
- notShow.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
- f.setVisible(false);
- Config.get().setProperty(Config.CHECK_VERSION,"false");
- Config.get().store();
- }
- });
- sp.add(ok);
- sp.add(notShow);
- f.add(BorderLayout.SOUTH, sp);
- f.pack();
-
- ta.append("A new version of Jason (" + getLatestVersion() + ") is available at\n\n");
- ta.append(" "+download+"\n\n");
- String wn = whatsNew();
- if (wn != null) {
- ta.append("\nRelease notes:\n");
- ta.append(wn);
- }
-
- Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
- f.setLocation((int)( (screenSize.width - f.getWidth()) / 2),(int) ((screenSize.height - f.getHeight())/2));
- f.setVisible(true);
- }
-
- static boolean alreadyRun = false;
- public void run() {
- // to avoid this thread to run twice
- if (alreadyRun) return;
- alreadyRun = true;
-
- try {
- if (Config.get().getProperty(Config.CHECK_VERSION,"true").equals("true")) {
- if (!isLatestVersion()) {
- show();
- }
- }
- } catch (Exception e) { }
- }
-
- public static void main(String[] a) {
- CheckVersion cv = new CheckVersion();
- cv.start();
- }
-}
Modified: trunk/src/jason/jeditplugin/JasonID.java
===================================================================
--- trunk/src/jason/jeditplugin/JasonID.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/jeditplugin/JasonID.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -68,6 +68,8 @@
import errorlist.DefaultErrorSource;
import errorlist.ErrorSource;
+import jason.infra.MASLauncherInfraTier;
+import jason.infra.RunProjectListener;
import jason.infra.centralised.CentralisedMASLauncherAnt;
import jason.infra.centralised.RunCentralisedMAS;
import jason.mas2j.AgentParameters;
@@ -75,6 +77,7 @@
import jason.mas2j.parser.ParseException;
import jason.mas2j.parser.TokenMgrError;
import jason.runtime.OutputStreamAdapter;
+import jason.util.CheckVersion;
import jason.util.Config;
import jason.util.asl2html;
import jason.util.asl2tex;
Deleted: trunk/src/jason/jeditplugin/MASLauncherInfraTier.java
===================================================================
--- trunk/src/jason/jeditplugin/MASLauncherInfraTier.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/jeditplugin/MASLauncherInfraTier.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -1,42 +0,0 @@
-package jason.jeditplugin;
-
-import jason.mas2j.MAS2JProject;
-
-/**
- * Used by the Jason IDE to launch an MAS. Each infrastructure should
- * implements it.
- *
- * <p>The methods of this class are called in the following order:
- * <ul>
- * <li>setProject</li>
- * <li>setListener</li>
- * <li>writeScripts</li>
- * <li>stopMAS</li>
- * </ul>
- */
-public interface MASLauncherInfraTier extends Runnable {
-
- /**
- * Sets the description of the project to be run.
- */
- public void setProject(MAS2JProject project);
-
- /**
- * Sets the object that wants to be informed about the changes in
- * the execution state. This object normally is the JasonIDE, that
- * wants to change available buttons as the project is being
- * executed.
- */
- public void setListener(RunProjectListener listener);
-
- /**
- * Writes the script(s), normally Ant scripts, used to launch the
- * MAS.
- */
- public boolean writeScripts(boolean debug, boolean useBuildFileName);
-
- /**
- * Stops the MAS execution.
- */
- public void stopMAS();
-}
Deleted: trunk/src/jason/jeditplugin/RunProjectListener.java
===================================================================
--- trunk/src/jason/jeditplugin/RunProjectListener.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/jeditplugin/RunProjectListener.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -1,9 +0,0 @@
-package jason.jeditplugin;
-
-/**
- * This interface is implemented by objects that wants to be notified
- * about changes in the MAS execution state (like JasonIDE).
- */
-public interface RunProjectListener {
- public void masFinished();
-}
Modified: trunk/src/jason/mas2j/parser/MAS2JavaParser.jcc
===================================================================
--- trunk/src/jason/mas2j/parser/MAS2JavaParser.jcc 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/mas2j/parser/MAS2JavaParser.jcc 2016-04-09 10:45:24 UTC (rev 1889)
@@ -36,7 +36,8 @@
import jason.mas2j.*;
import jason.asSyntax.*;
import jason.asSemantics.*;
-import jason.jeditplugin.*;
+import jason.util.*;
+import jason.infra.*;
public class mas2j {
Modified: trunk/src/jason/mas2j/parser/mas2j.java
===================================================================
--- trunk/src/jason/mas2j/parser/mas2j.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/mas2j/parser/mas2j.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -6,7 +6,8 @@
import jason.mas2j.*;
import jason.asSyntax.*;
import jason.asSemantics.*;
-import jason.jeditplugin.*;
+import jason.util.*;
+import jason.infra.*;
public class mas2j implements mas2jConstants {
Modified: trunk/src/jason/mas2j/parser/mas2jTokenManager.java
===================================================================
--- trunk/src/jason/mas2j/parser/mas2jTokenManager.java 2016-04-08 19:25:42 UTC (rev 1888)
+++ trunk/src/jason/mas2j/parser/mas2jTokenManager.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -5,7 +5,7 @@
import jason.mas2j.*;
import jason.asSyntax.*;
import jason.asSemantics.*;
-import jason.jeditplugin.*;
+import jason.util.*;
public class mas2jTokenManager implements mas2jConstants
{
Copied: trunk/src/jason/util/CheckVersion.java (from rev 1888, trunk/src/jason/jeditplugin/CheckVersion.java)
===================================================================
--- trunk/src/jason/util/CheckVersion.java (rev 0)
+++ trunk/src/jason/util/CheckVersion.java 2016-04-09 10:45:24 UTC (rev 1889)
@@ -0,0 +1,126 @@
+package jason.util;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Properties;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import jason.util.Config;
+
+public class CheckVersion extends Thread {
+
+ public static final String JasonSite = "http://jason.sf.net";
+ String download;
+
+ String version;
+ String release;
+
+ String getLatestVersion() {
+ // read version from Jason site
+ try {
+ Properties p = new Properties();
+ p.load(new URL(JasonSite+"/latest.properties").openStream());
+ download = p.getProperty("download");
+ version = p.getProperty("version");
+ release = p.getProperty("release");
+ return version + "." + release;
+ } catch (Exception ex) {
+ System.out.println(ex);
+ return null;
+ }
+ }
+
+ boolean isLatestVersion() {
+ // get user version
+ String cVersion = Config.get().getJasonRunningVersion();
+ String lv = getLatestVersion();
+ return lv == null || cVersion.compareTo(lv) >= 0;
+ }
+
+ String whatsNew() {
+ try {
+ StringBuilder out = new StringBuilder();
+ InputStream in = new URL(JasonSite+"/whatsnew.txt").openStream();
+ int c = in.read();
+ while (c != -1) {
+ out.append((char) c);
+ c = in.read();
+ }
+ return out.toString();
+ } catch (Exception e) {
+ System.err.println("Error reading what's new!" + e);
+ return null;
+ }
+ }
+
+ void show() {
+ final JFrame f = new JFrame("Jason update");
+ f.setLayout(new BorderLayout());
+
+ JTextArea ta = new JTextArea(20, 90);
+ f.add(BorderLayout.CENTER,new JScrollPane(ta));
+
+ JPanel sp = new JPanel(new FlowLayout(FlowLayout.CENTER));
+ //JButton notShow = new JButton("Do not show this message again.");
+ JButton ok = new JButton("Ok");
+ ok.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent arg0) {
+ f.setVisible(false); }
+ });
+ JButton notShow = new JButton("Do not show this message again");
+ notShow.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent arg0) {
+ f.setVisible(false);
+ Config.get().setProperty(Config.CHECK_VERSION,"false");
+ Config.get().store();
+ }
+ });
+ sp.add(ok);
+ sp.add(notShow);
+ f.add(BorderLayout.SOUTH, sp);
+ f.pack();
+
+ ta.append("A new version of Jason (" + getLatestVersion() + ") is available at\n\n");
+ ta.append(" "+download+"\n\n");
+ String wn = whatsNew();
+ if (wn != null) {
+ ta.append("\nRelease notes:\n");
+ ta.append(wn);
+ }
+
+ Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+ f.setLocation((int)( (screenSize.width - f.getWidth()) / 2),(int) ((screenSize.height - f.getHeight())/2));
+ f.setVisible(true);
+ }
+
+ static boolean alreadyRun = false;
+ public void run() {
+ // to avoid this thread to run twice
+ if (alreadyRun) return;
+ alreadyRun = true;
+
+ try {
+ if (Config.get().getProperty(Config.CHECK_VERSION,"true").equals("true")) {
+ if (!isLatestVersion()) {
+ show();
+ }
+ }
+ } catch (Exception e) { }
+ }
+
+ public static void main(String[] a) {
+ CheckVersion cv = new CheckVersion();
+ cv.start();
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
