Menu
▾
▴
eulergui-commits
|
From: <jm...@us...> - 2010-03-13 10:23:56
|
Revision: 1297
http://eulergui.svn.sourceforge.net/eulergui/?rev=1297&view=rev
Author: jmvanel
Date: 2010-03-13 10:23:50 +0000 (Sat, 13 Mar 2010)
Log Message:
-----------
Several tests were broken since revision 1289, were the Project URL string (field url) was set as a file:// URL for file projects;
this led to errors in SimplifiedURI were field baseDirectory can (alas!) be an URL or a file path.
Revision Links:
--------------
http://eulergui.svn.sourceforge.net/eulergui/?rev=1289&view=rev
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/n3_project/helpers/SimplifiedURI.java
Modified: trunk/eulergui/src/main/java/eulergui/project/Project.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/project/Project.java 2010-03-12 17:21:44 UTC (rev 1296)
+++ trunk/eulergui/src/main/java/eulergui/project/Project.java 2010-03-13 10:23:50 UTC (rev 1297)
@@ -938,11 +938,11 @@
if( prepared ) {
return;
}
- System.out.println("Project.prepare()");
+ System.out.println("Project.prepare() " + getUrl() );
// copy sources to avoid ConcurrentModificationException
Collection<N3Source> sources_ = new ArrayList<N3Source>(sources.values());
for ( final N3Source n3 : sources_ ) {
- n3.setProject(this);
+ n3.setProject(this); // TODO remove <<<<<<<<<<<
System.out.println("Project.prepare(): loop: " + n3.showShortName() );
try {
Modified: trunk/eulergui/src/main/java/n3_project/helpers/SimplifiedURI.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/helpers/SimplifiedURI.java 2010-03-12 17:21:44 UTC (rev 1296)
+++ trunk/eulergui/src/main/java/n3_project/helpers/SimplifiedURI.java 2010-03-13 10:23:50 UTC (rev 1297)
@@ -21,6 +21,7 @@
private String fileName;
private String simplifiedURI;
// File referenceFile; // ( projectFile )
+ /** TODO in fact base URL */
private String baseDirectory;
private static boolean osIsWindows;
@@ -30,13 +31,14 @@
}
public SimplifiedURI(String baseDirectory) {
- this.baseDirectory = baseDirectory;
+ this.baseDirectory = baseDirectory; // TODO convert to URL ?
}
/** get the absolute URI */
public String uri() {
if (uri == null) {
uri = expandRelativeURItoFileURI(simplifiedURI); }
+ // TODO test expandRelativeURL a,d remove method expandRelativeURItoFileURI
return uri;
}
@@ -225,11 +227,12 @@
}
}
- /** TODO use public method elsewhere <<<<<<<< */
+ /** PENDING use public method elsewhere <<<<<<<< */
private boolean baseIsURL() {
return baseDirectory.startsWith("http:/")
|| baseDirectory.startsWith("https:/")
|| baseDirectory.startsWith("ftp:/")
+ || baseDirectory.startsWith("file:/") // TODO test <<<<<<<<<<<
;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-03-13 11:40:23
|
Revision: 1298
http://eulergui.svn.sourceforge.net/eulergui/?rev=1298&view=rev
Author: jmvanel
Date: 2010-03-13 11:40:16 +0000 (Sat, 13 Mar 2010)
Log Message:
-----------
Deactivated in ProjectGUI :
addWindowListener(exitOnLastWindowClosed);
Being a listener on the main Frame, it cannot react to other frames' events.
Moreover, it seems best to rely on the dispose-window default window close operation :
"When the last displayable window within the Java virtual machine (VM) is disposed of, the VM may terminate. See AWT Threading Issues for more information."
See WindowConstants.DISPOSE_ON_CLOSE
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
trunk/eulergui/src/main/java/n3_project/ProjectGUI.java
Modified: trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-13 10:23:50 UTC (rev 1297)
+++ trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-13 11:40:16 UTC (rev 1298)
@@ -93,7 +93,7 @@
jf.setVisible(true);
ProjectGUI.setEulerGUIIcon(jf);
- jf.setDefaultCloseOperation( WindowConstants.DO_NOTHING_ON_CLOSE );
+ jf.setDefaultCloseOperation( WindowConstants.DISPOSE_ON_CLOSE );
listener = new DocumentListener();
jf.addWindowListener(listener);
} catch (HeadlessException e) {
Modified: trunk/eulergui/src/main/java/n3_project/ProjectGUI.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/ProjectGUI.java 2010-03-13 10:23:50 UTC (rev 1297)
+++ trunk/eulergui/src/main/java/n3_project/ProjectGUI.java 2010-03-13 11:40:16 UTC (rev 1298)
@@ -30,7 +30,6 @@
import javax.swing.filechooser.FileFilter;
import javax.swing.text.BadLocationException;
-import eulergui.gui.controller.ApplicationKB;
import eulergui.gui.view.TextEditor;
import eulergui.project.N3Source;
import eulergui.project.Project;
@@ -96,7 +95,7 @@
System.out.println("ProjectGUI.ProjectGUI(): lastFile:\n" +
"getProject().getSources().keySet().iterator().next(): "
+ lastFile );
- } else {
+ } else {
lastFile = new File(System.getProperty("user.dir"));
System.out.println("ProjectGUI.ProjectGUI(): lastFile: user.dir "
+ lastFile );
@@ -199,12 +198,20 @@
getProject().save(); }
}
};
- WindowListener exitOnLastWindowClosed = new WindowAdapter(){
+ @SuppressWarnings("unused")
+ WindowListener exitOnLastWindowClosed = new WindowAdapter(){
public void windowClosed(WindowEvent e){
boolean noMoreWindows = (getWindows().length==0);
- boolean lastWindowClosed = ((getWindows().length==1) && (getWindows()[0]==e.getWindow()));
- if(noMoreWindows || lastWindowClosed)
+ boolean lastWindowClosed = ((getWindows().length==1)
+ && (getWindows()[0]==e.getWindow()));
+ if(noMoreWindows || lastWindowClosed) {
+ System.out
+ .println("ProjectGUI.layoutFrame()" +
+ ".new WindowAdapter() {...}.windowClosed(): " +
+ "noMoreWindows || lastWindowClosed - " +
+ project.getUrl() );
System.exit(0);
+ }
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-03-14 16:02:49
|
Revision: 1301
http://eulergui.svn.sourceforge.net/eulergui/?rev=1301&view=rev
Author: jmvanel
Date: 2010-03-14 16:02:43 +0000 (Sun, 14 Mar 2010)
Log Message:
-----------
GUI enhancement: glue together the components between the button bar and the bottom text panel, so that the bottom text panel can grow in size.
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/ButtonsForN3Source.java
trunk/eulergui/src/main/java/n3_project/ProjectGUI.java
trunk/eulergui/src/main/java/n3_project/RunOptionsManagement.java
trunk/eulergui/src/main/java/n3_project/SourceFilesView.java
trunk/eulergui/src/main/java/n3_project/SubProjectsManagement.java
Modified: trunk/eulergui/src/main/java/eulergui/gui/view/ButtonsForN3Source.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/gui/view/ButtonsForN3Source.java 2010-03-14 12:29:29 UTC (rev 1300)
+++ trunk/eulergui/src/main/java/eulergui/gui/view/ButtonsForN3Source.java 2010-03-14 16:02:43 UTC (rev 1301)
@@ -45,6 +45,8 @@
boolean isActivated = n3.isActivated();
subPanel = this;
+// sourceFilesView.getButtonsPanel().add( Box.createVerticalGlue() );
+// sourceFilesView.getButtonsPanel().add( Box.createRigidArea(new Dimension(0,5)) );
sourceFilesView.getButtonsPanel().add(subPanel);
if (!isActivated) {
subPanel.setBackground(Color.WHITE);
@@ -207,6 +209,9 @@
subPanel.add(parserButton);
// ----------------
+// subPanel.setPreferredSize(new Dimension( editButton.getHeight(), 800 ));
+// subPanel.setMaximumSize( new Dimension( editButton.getHeight(), 800 ));
+
projectGUI.getCenterPanel().validate();
projectGUI.getCenterPanel().invalidate();
}
Modified: trunk/eulergui/src/main/java/n3_project/ProjectGUI.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/ProjectGUI.java 2010-03-14 12:29:29 UTC (rev 1300)
+++ trunk/eulergui/src/main/java/n3_project/ProjectGUI.java 2010-03-14 16:02:43 UTC (rev 1301)
@@ -230,8 +230,7 @@
getCenterPanel().add(runOptionsManagement.getJComponent());
sourceFilesView.makeButtonsPanel();
-// JScrollPane scrollPane = new JScrollPane(getTextPane());
-// getCenterPanel().add(scrollPane);
+// getContentPane().add( getTextPane().getComponent(), BorderLayout.SOUTH);
getCenterPanel().add( getTextPane().getComponent() );
pack();
Modified: trunk/eulergui/src/main/java/n3_project/RunOptionsManagement.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/RunOptionsManagement.java 2010-03-14 12:29:29 UTC (rev 1300)
+++ trunk/eulergui/src/main/java/n3_project/RunOptionsManagement.java 2010-03-14 16:02:43 UTC (rev 1301)
@@ -1,5 +1,7 @@
package n3_project;
+import java.awt.Dimension;
+
import javax.swing.BoxLayout;
import javax.swing.JComponent;
import javax.swing.JPanel;
@@ -18,7 +20,16 @@
}
JComponent getJComponent() {
- component = new JPanel();
+ component = new JPanel(){
+ private static final long serialVersionUID = 1L;
+ public Dimension getMaximumSize() {
+ Dimension d0 = getPreferredSize();
+ Dimension d = new Dimension(d0);
+ // apparently this value means "no constraint" :
+ d.width = Short.MAX_VALUE;
+ return d;
+ }
+ };
component.setLayout(new BoxLayout(component, BoxLayout.Y_AXIS));
eulerField = new TextFieldWithLabel("Euler args", "");
component.add(eulerField);
Modified: trunk/eulergui/src/main/java/n3_project/SourceFilesView.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/SourceFilesView.java 2010-03-14 12:29:29 UTC (rev 1300)
+++ trunk/eulergui/src/main/java/n3_project/SourceFilesView.java 2010-03-14 16:02:43 UTC (rev 1301)
@@ -64,6 +64,12 @@
fireEventsToUpdateN3SourceComponents();
+ // glue together the buttons for N3 sources
+ getButtonsPanel().setMaximumSize( getButtonsPanel().getPreferredSize() );
+// System.out.println("SourceFilesView.makeButtonsPanel(): " +
+// "getButtonsPanel().getPreferredSize(): "
+// + getButtonsPanel().getPreferredSize() );
+
getCenterPanel().validate();
getCenterPanel().invalidate();
getProjectGUI().updateWindowTitle();
Modified: trunk/eulergui/src/main/java/n3_project/SubProjectsManagement.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/SubProjectsManagement.java 2010-03-14 12:29:29 UTC (rev 1300)
+++ trunk/eulergui/src/main/java/n3_project/SubProjectsManagement.java 2010-03-14 16:02:43 UTC (rev 1301)
@@ -16,6 +16,8 @@
}
JComponent getJComponent() {
+ // glue together the button for the sub-Project with the others components in their parent
+ panel.setMaximumSize( panel.getPreferredSize() );
return panel;
}
@@ -25,7 +27,7 @@
subProject, "imported: " );
if( button != null ) {
panel.add(button);
- panel.validate();
+ panel.validate();
// actually update the GUI with the new button
projectGUI.pack();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <iam...@us...> - 2010-03-15 11:24:40
|
Revision: 1307
http://eulergui.svn.sourceforge.net/eulergui/?rev=1307&view=rev
Author: iamlolive
Date: 2010-03-15 11:24:32 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------
rethrowing of the parsingException to the upper level.
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/QueryView.java
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/eulergui/project/ProjectSequence.java
trunk/eulergui/src/main/java/eulergui/project/ProjectWithSubProjects.java
trunk/eulergui/src/main/java/n3_project/ProjectFileManagement.java
trunk/eulergui/src/main/java/n3_project/helpers/N3SourcetoDrools.java
trunk/eulergui/src/main/java/n3_project/helpers/N3toDroolsUpdater.java
Modified: trunk/eulergui/src/main/java/eulergui/gui/view/QueryView.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/gui/view/QueryView.java 2010-03-15 11:11:49 UTC (rev 1306)
+++ trunk/eulergui/src/main/java/eulergui/gui/view/QueryView.java 2010-03-15 11:24:32 UTC (rev 1307)
@@ -64,10 +64,11 @@
@Override
public void actionPerformed(ActionEvent e) {
// <<<<<<<< TODO should be in actions package
- projectGUI.getProject().prepareDrools();
+
+ try {
+ projectGUI.getProject().prepareDrools();
projectGUI.getProject().getTranslator().copyN3factsToDrools();
String searchName = n3.getURI();
- try {
projectGUI.getProject().getTranslator().translateQuery( n3);
List<ITriple> result = projectGUI.getProject().search(
searchName, null);
Modified: trunk/eulergui/src/main/java/eulergui/project/Project.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/project/Project.java 2010-03-15 11:11:49 UTC (rev 1306)
+++ trunk/eulergui/src/main/java/eulergui/project/Project.java 2010-03-15 11:24:32 UTC (rev 1307)
@@ -37,6 +37,7 @@
import n3_project.helpers.ITriple;
import n3_project.helpers.N3toDroolsUpdater;
+import net.sf.parser4j.parser.service.ParserException;
import org.drools.RuleBase;
import org.drools.WorkingMemory;
@@ -710,14 +711,20 @@
* only used in TestProject.testReasonDrools() */
public N3Source runDrools() {
setErrors(null);
+ try {
doRunDrools();
+ } catch(ParserException e){
+ e.printStackTrace();
+ //TODO very bad exception handling below :
+ throw new RuntimeException("Drools was unable to parse an input file. Exiting.", e);
+ }
return getN3StringResult();
// return new N3Source(translator.getN3StringResult());
}
/** run Drools and return Triples,
* avoiding parsing the result */
- public List<ITriple> runDroolsTriples() {
+ public List<ITriple> runDroolsTriples() throws ParserException {
setErrors(null);
doRunDrools();
return getTranslator().getN3Result();
@@ -733,7 +740,7 @@
/**
* bare Drools Run
*/
- private void doRunDrools() {
+ private void doRunDrools() throws ParserException {
prepareDrools();
if( debug ) {
@@ -748,7 +755,7 @@
/** initialize Drools, and translate N3 rules to Drools;
* N3 facts are *not* inserted into the Working Memory */
- public void prepareDrools() {
+ public void prepareDrools() throws ParserException {
initializeDrools();
getTranslator().prepare();
translateN32Drools();
@@ -759,7 +766,7 @@
* see {@link N3toDroolsUpdater#getFactsTriples()};
* the Rules are fed to the Rule Base; see {@link #getRuleBase()}
*/
- public void translateN32Drools() {
+ public void translateN32Drools() throws ParserException {
// copy sources to avoid ConcurrentModificationException
Collection<N3Source> sources_ = new ArrayList<N3Source>(sources.values());
Modified: trunk/eulergui/src/main/java/eulergui/project/ProjectSequence.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/project/ProjectSequence.java 2010-03-15 11:11:49 UTC (rev 1306)
+++ trunk/eulergui/src/main/java/eulergui/project/ProjectSequence.java 2010-03-15 11:24:32 UTC (rev 1307)
@@ -15,6 +15,7 @@
import n3_project.helpers.SimplifiedURI;
import n3_project.helpers.TripleResult;
+import net.sf.parser4j.parser.service.ParserException;
import org.drools.RuleBase;
import org.drools.WorkingMemory;
@@ -139,11 +140,11 @@
}
@Override
- public List<ITriple> runDroolsTriples() {
+ public List<ITriple> runDroolsTriples() throws ParserException {
return runDroolsTriples( null );
}
- public List<ITriple> runDroolsTriples(List<ITriple> intermediary) {
+ public List<ITriple> runDroolsTriples(List<ITriple> intermediary) throws ParserException {
List<ITriple> result = super.runDroolsTriples();
if( intermediary != null ) {
intermediary.addAll(result); }
Modified: trunk/eulergui/src/main/java/eulergui/project/ProjectWithSubProjects.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/project/ProjectWithSubProjects.java 2010-03-15 11:11:49 UTC (rev 1306)
+++ trunk/eulergui/src/main/java/eulergui/project/ProjectWithSubProjects.java 2010-03-15 11:24:32 UTC (rev 1307)
@@ -14,6 +14,7 @@
import n3_project.helpers.ITriple;
import n3_project.helpers.SimplifiedURI;
+import net.sf.parser4j.parser.service.ParserException;
import org.drools.RuleBase;
import org.drools.WorkingMemory;
@@ -120,7 +121,7 @@
* @see eulergui.project.Project#runDroolsTriples()
*/
@Override
- public List<ITriple> runDroolsTriples() {
+ public List<ITriple> runDroolsTriples() throws ParserException {
gathering = gather();
return gathering.runDroolsTriples();
}
Modified: trunk/eulergui/src/main/java/n3_project/ProjectFileManagement.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/ProjectFileManagement.java 2010-03-15 11:11:49 UTC (rev 1306)
+++ trunk/eulergui/src/main/java/n3_project/ProjectFileManagement.java 2010-03-15 11:24:32 UTC (rev 1307)
@@ -20,6 +20,7 @@
import eulergui.project.Project;
import eulergui.project.ProjectSequence;
import eulergui.project.ProjectWithSubProjects;
+import net.sf.parser4j.parser.service.ParserException;
/**
* Project File Management: open, open from URL, save, save as, new,
@@ -223,7 +224,12 @@
N3SourcetoDrools.setSaveRulesOnDisk(true);
p.runDroolsTriples();
N3SourcetoDrools.setSaveRulesOnDisk(false);
- } catch (Exception e1) {
+
+ } catch(ParserException ex){
+ //TODO shall we do something else (i.e something specific) when parsing of input file fails?
+ ex.printStackTrace();
+ } catch (Exception e1) {
+
e1.printStackTrace();
}
}
Modified: trunk/eulergui/src/main/java/n3_project/helpers/N3SourcetoDrools.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/helpers/N3SourcetoDrools.java 2010-03-15 11:11:49 UTC (rev 1306)
+++ trunk/eulergui/src/main/java/n3_project/helpers/N3SourcetoDrools.java 2010-03-15 11:24:32 UTC (rev 1307)
@@ -14,6 +14,8 @@
import java.util.Set;
import java.util.TreeMap;
+import n3_project.exceptions.parser.ParsingException;
+import net.sf.parser4j.parser.service.ParserException;
import org.drools.FactException;
import org.drools.ObjectFilter;
import org.drools.RuleBase;
@@ -182,7 +184,7 @@
}
}
- public List<ITriple> translate(N3Source rdfModel) {
+ public List<ITriple> translate(N3Source rdfModel) throws ParserException {
lastN3Source = rdfModel;
current_document = rdfModel.uri();
List<ITriple> facts = Collections.emptyList();
@@ -200,7 +202,12 @@
facts = translate(parserLink);
} catch ( Exception e ) {
e.printStackTrace();
- }
+ if (e instanceof ParsingException) {
+ ((ParsingException)e).setSource(rdfModel);
+ }
+ if(e instanceof ParserException)
+ throw (ParserException)e;
+ }
}
return facts;
}
Modified: trunk/eulergui/src/main/java/n3_project/helpers/N3toDroolsUpdater.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/helpers/N3toDroolsUpdater.java 2010-03-15 11:11:49 UTC (rev 1306)
+++ trunk/eulergui/src/main/java/n3_project/helpers/N3toDroolsUpdater.java 2010-03-15 11:24:32 UTC (rev 1307)
@@ -10,6 +10,7 @@
import java.util.Set;
import java.util.TreeMap;
+import net.sf.parser4j.parser.service.ParserException;
import org.drools.QueryResult;
import org.drools.QueryResults;
import org.drools.RuleBase;
@@ -51,7 +52,7 @@
translator.setQuery(isQuery);
}
- public List<ITriple> translate(N3Source rdfModel) {
+ public List<ITriple> translate(N3Source rdfModel) throws ParserException {
if (uptodate(rdfModel)) {
System.out.println("Compilation of " + rdfModel.getURI()
+ " is uptodate.");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <iam...@us...> - 2010-03-17 11:17:49
|
Revision: 1325
http://eulergui.svn.sourceforge.net/eulergui/?rev=1325&view=rev
Author: iamlolive
Date: 2010-03-17 11:17:43 +0000 (Wed, 17 Mar 2010)
Log Message:
-----------
correct management of title appendance
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
trunk/eulergui/src/main/java/n3_project/EditorManagement.java
Modified: trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-17 11:03:33 UTC (rev 1324)
+++ trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-17 11:17:43 UTC (rev 1325)
@@ -186,7 +186,7 @@
setCaretPosition(lineNumber, columnNumber);
}
- private void removeTooltipOnNextEdit() {
+ public void removeTooltipOnNextEdit() {
final DocumentListener tooltipRemover = new DocumentListener() {
@Override
public void removeUpdate(DocumentEvent e) {
@@ -217,6 +217,37 @@
jedit.getDocument().addDocumentListener(tooltipRemover);
}
+ public void removeAppendanceOnNextEdit() {
+ final DocumentListener attendanceRemover = new DocumentListener() {
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ //TODO how to remove our custom Highlight instead of this quick hack ?
+ setTitleAppendance("");
+ jedit.getDocument().removeDocumentListener(this);
+ }
+
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ //TODO how to remove our custom Highlight instead of this quick hack ?
+ setTitleAppendance("");
+ jedit.getDocument().removeDocumentListener(this);
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ //TODO how to remove our custom Highlight instead of this quick hack ?
+ setTitleAppendance("");
+ jedit.getDocument().removeDocumentListener(this);
+ }
+
+ @Override
+ public void windowClosing(WindowEvent e) {
+ //super.windowClosing(e); //To change body of overridden methods use File | Settings | File Templates.
+ }
+ };
+ jedit.getDocument().addDocumentListener(attendanceRemover);
+ }
+
/**
* display Editor in a new Window, with save As in File menu
*/
@@ -296,6 +327,19 @@
jedit.setTokenMarker(syntax);
}
+
+
+ public String getTitleAttendance() {
+ return titleAttendance;
+ }
+
+ public void setTitleAppendance(String titleAttendance) {
+ jf.setTitle(jf.getTitle().substring(0,jf.getTitle().lastIndexOf(getTitleAttendance()))+titleAttendance);
+ this.titleAttendance = titleAttendance;
+ }
+
+ public String titleAttendance = "";
+
/**
* records the first modification, to prevent unsaved edits
* TODO upon Save actions, reset {@link #edited} to false
Modified: trunk/eulergui/src/main/java/n3_project/EditorManagement.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/EditorManagement.java 2010-03-17 11:03:33 UTC (rev 1324)
+++ trunk/eulergui/src/main/java/n3_project/EditorManagement.java 2010-03-17 11:17:43 UTC (rev 1325)
@@ -120,11 +120,15 @@
public Map<N3Source,TextEditor> n3SourceToEditor = new HashMap<N3Source, TextEditor>();
- public TextEditor openJavaEditor( final N3Source n3 ) {
- return openJavaEditor(n3,"");
+ public TextEditor openJavaEditor( final N3Source n3, String titleAppendance , boolean removeAppendanceOnFirstEdit ) {
+ TextEditor editor = openJavaEditor(n3);
+ editor.setTitleAppendance(titleAppendance);
+ if(removeAppendanceOnFirstEdit)
+ editor.removeAppendanceOnNextEdit();
+ return editor;
}
- public TextEditor openJavaEditor( final N3Source n3, String titleAppendance ) {
+ public TextEditor openJavaEditor( final N3Source n3 ) {
final TextEditor editor;
if(!n3SourceToEditor.containsKey(n3)){
editor = new TextEditor();
@@ -174,7 +178,7 @@
editor = n3SourceToEditor.get(n3);
editor.setOnTop();
}
- editor.jf.setTitle(n3.showShortName()+ " " + titleAppendance);
+
return editor;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <iam...@us...> - 2010-03-17 11:48:35
|
Revision: 1328
http://eulergui.svn.sourceforge.net/eulergui/?rev=1328&view=rev
Author: iamlolive
Date: 2010-03-17 11:48:24 +0000 (Wed, 17 Mar 2010)
Log Message:
-----------
cursor offset has moved from TextEditor to ResultManagement
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
trunk/eulergui/src/main/java/n3_project/ResultManagement.java
Modified: trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-17 11:21:41 UTC (rev 1327)
+++ trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-17 11:48:24 UTC (rev 1328)
@@ -136,11 +136,7 @@
}
public void setCaretPosition(int line, int col) {
- if (line >= 1)
- line--;
- if (col >= 1)
- col--;
-
+
int position = jedit.getLineStartOffset(line) + col;
//TODO the parser erroneously places the end of line errors. They are placed at the beginning of the next line. We correct that behaviour (on purpose?)
if (col == 0)
Modified: trunk/eulergui/src/main/java/n3_project/ResultManagement.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/ResultManagement.java 2010-03-17 11:21:41 UTC (rev 1327)
+++ trunk/eulergui/src/main/java/n3_project/ResultManagement.java 2010-03-17 11:48:24 UTC (rev 1328)
@@ -212,7 +212,12 @@
String errorMessage = result.getErrorMessage();
int lineNumber = result.getParseResult().getLineNumber();
int columnNumber = result.getParseResult().getColumnNumber();
+ if (lineNumber >= 1)
+ lineNumber--;
+ if (columnNumber >= 1)
+ columnNumber--;
+
TextEditor editor = projectGUI.getEditorManagement().openJavaEditor(source, "(Error at line "+lineNumber+")", true);
editor.showError(errorMessage, lineNumber, columnNumber);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <iam...@us...> - 2010-03-17 13:26:26
|
Revision: 1329
http://eulergui.svn.sourceforge.net/eulergui/?rev=1329&view=rev
Author: iamlolive
Date: 2010-03-17 13:26:19 +0000 (Wed, 17 Mar 2010)
Log Message:
-----------
editors now always show on top.
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
trunk/eulergui/src/main/java/n3_project/EditorManagement.java
Modified: trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
===================================================================
--- trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-17 11:48:24 UTC (rev 1328)
+++ trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java 2010-03-17 13:26:19 UTC (rev 1329)
@@ -180,6 +180,7 @@
public void showError(String errorMessage, int lineNumber, int columnNumber) {
setToolTipText(errorMessage);
setCaretPosition(lineNumber, columnNumber);
+ setOnTop();
}
public void removeTooltipOnNextEdit() {
Modified: trunk/eulergui/src/main/java/n3_project/EditorManagement.java
===================================================================
--- trunk/eulergui/src/main/java/n3_project/EditorManagement.java 2010-03-17 11:48:24 UTC (rev 1328)
+++ trunk/eulergui/src/main/java/n3_project/EditorManagement.java 2010-03-17 13:26:19 UTC (rev 1329)
@@ -176,8 +176,9 @@
}
else {
editor = n3SourceToEditor.get(n3);
- editor.setOnTop();
+
}
+ editor.setOnTop();
return editor;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-03-28 10:22:56
|
Revision: 1364
http://eulergui.svn.sourceforge.net/eulergui/?rev=1364&view=rev
Author: jmvanel
Date: 2010-03-28 10:22:49 +0000 (Sun, 28 Mar 2010)
Log Message:
-----------
Reactivate ApplicationKB; correct error when populating the KB with project data
( tests pass )
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/controller/ApplicationKB.java
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/n3_project/helpers/Triple.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-03-30 12:48:30
|
Revision: 1374
http://eulergui.svn.sourceforge.net/eulergui/?rev=1374&view=rev
Author: jmvanel
Date: 2010-03-30 12:48:23 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
- restore the post-Processing Project from file did not work (maybe a regression)
TODO manage simplified URI's for post-Processing Projects.
- implement ProjectSequence.reasonExternalProlog() ; TODO test, after a correction to Euler (Euler does not
understand file: URL's)
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/eulergui/project/ProjectSequence.java
trunk/eulergui/src/main/java/n3_project/ProjectFileManagement.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <iam...@us...> - 2010-03-30 15:55:52
|
Revision: 1375
http://eulergui.svn.sourceforge.net/eulergui/?rev=1375&view=rev
Author: iamlolive
Date: 2010-03-30 15:55:46 +0000 (Tue, 30 Mar 2010)
Log Message:
-----------
jedit-textarea is replaced with a real jedit.
this feature can be reversed by setting TextEditor.useRealJEdit to false.
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
Added Paths:
-----------
trunk/eulergui/src/main/java/org/
trunk/eulergui/src/main/java/org/gjt/
trunk/eulergui/src/main/java/org/gjt/sp/
trunk/eulergui/src/main/java/org/gjt/sp/jedit/
trunk/eulergui/src/main/java/org/gjt/sp/jedit/jEdit.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-03-31 10:31:28
|
Revision: 1384
http://eulergui.svn.sourceforge.net/eulergui/?rev=1384&view=rev
Author: jmvanel
Date: 2010-03-31 10:31:22 +0000 (Wed, 31 Mar 2010)
Log Message:
-----------
manage simplified URI's for post-Processing Projects; TODO test for URL's
add comment in N3TranslationPlugin
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/project/ProjectSequence.java
trunk/eulergui/src/main/java/n3_project/helpers/N3TranslationPlugin.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-01 17:35:36
|
Revision: 1397
http://eulergui.svn.sourceforge.net/eulergui/?rev=1397&view=rev
Author: jmvanel
Date: 2010-04-01 17:35:29 +0000 (Thu, 01 Apr 2010)
Log Message:
-----------
- use global constant ProjectGUI.LOGGER instead of Logger.getLogger("theDefault")
because the latter has a non-externalized string
- adding $NON-NLS-2$ in some places
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/controller/ApplicationKB.java
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/n3_project/ProjectGUI.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-01 20:43:03
|
Revision: 1399
http://eulergui.svn.sourceforge.net/eulergui/?rev=1399&view=rev
Author: jmvanel
Date: 2010-04-01 20:42:56 +0000 (Thu, 01 Apr 2010)
Log Message:
-----------
new class SWRLTranslator
Project listener to Translate SWRL rules in OWL sources into N3 rules,
and add them to the project
see TODO in source, DIASCTIVATED for now
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/controller/ApplicationKB.java
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/n3_project/N3SourceFromRDF.java
Added Paths:
-----------
trunk/eulergui/src/main/java/eulergui/gui/interfaces/AbstractProjectListener.java
trunk/eulergui/src/main/java/eulergui/tools/SWRLTranslator.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-02 10:34:07
|
Revision: 1400
http://eulergui.svn.sourceforge.net/eulergui/?rev=1400&view=rev
Author: jmvanel
Date: 2010-04-02 10:34:01 +0000 (Fri, 02 Apr 2010)
Log Message:
-----------
[Feature] New SWRL Translator, Project listener to Translate SWRL rules in OWL sources XXX.owl
into N3 rules, and add XXX.owl.rules.n3 to the project and to the GUI
- added a listener ProjectGUIUpdater, to
update the GUI when the sources or the queries change, according to the observer design pattern .
The initial motivation is to update the GUI after adding the translation from SWRL.
It will entail a series of refactoring since SourceFilesManagement will eventually be simplified to make only the update of the "model" Project.
- added accessor getSourceFilesView() in ProjectGUI
* TODO : test for URL based projects
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/eulergui/tools/SWRLTranslator.java
trunk/eulergui/src/main/java/n3_project/DropURLTranferHandler.java
trunk/eulergui/src/main/java/n3_project/ProjectFileManagement.java
trunk/eulergui/src/main/java/n3_project/ProjectGUI.java
trunk/eulergui/src/main/java/n3_project/SPARQLServiceInputAction.java
trunk/eulergui/src/main/java/n3_project/SourceFilesManagement.java
trunk/eulergui/src/main/java/n3_project/XMLInputAction.java
trunk/eulergui/src/main/java/n3_project/XmiInputAction.java
Added Paths:
-----------
trunk/eulergui/src/main/java/eulergui/gui/controller/ProjectGUIApdater.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-02 12:18:47
|
Revision: 1401
http://eulergui.svn.sourceforge.net/eulergui/?rev=1401&view=rev
Author: jmvanel
Date: 2010-04-02 12:18:41 +0000 (Fri, 02 Apr 2010)
Log Message:
-----------
New SWRL Translator: test D'n'D with http://owldl.com/ontologies/dl-safe.owl
* TODO : test for URL based projects
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/inputs/N3SourceFromOtherFormat.java
trunk/eulergui/src/main/java/eulergui/tools/SWRLTranslator.java
trunk/eulergui/src/main/java/n3_project/DropURLTranferHandler.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <iam...@us...> - 2010-04-02 14:55:26
|
Revision: 1406
http://eulergui.svn.sourceforge.net/eulergui/?rev=1406&view=rev
Author: iamlolive
Date: 2010-04-02 14:55:20 +0000 (Fri, 02 Apr 2010)
Log Message:
-----------
-Dautorun=drools now autoruns the generated app.
(might fail at the moment, because of untested insertLogical() on my local version)
eulerGUI app is invisible, and will appear only if the launch of the generated app fails.
Modified Paths:
--------------
trunk/eulergui/src/main/java/deductions/launcher/LaunchGeneratedAction.java
trunk/eulergui/src/main/java/n3_project/ProjectGUI.java
trunk/eulergui/src/main/java/n3_project/RunDroolsAction.java
trunk/eulergui/src/main/java/n3_project/ToolsManagement.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-02 15:44:55
|
Revision: 1408
http://eulergui.svn.sourceforge.net/eulergui/?rev=1408&view=rev
Author: jmvanel
Date: 2010-04-02 15:44:49 +0000 (Fri, 02 Apr 2010)
Log Message:
-----------
refactoring: call URLHelper . comesFromWeb( String fileNameOrURI ) and isURL()
everywhere it is needed
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
trunk/eulergui/src/main/java/eulergui/inputs/N3SourceFromOtherFormat.java
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/eulergui/tools/SWRLTranslator.java
trunk/eulergui/src/main/java/n3_project/N3SourceFromRDF.java
trunk/eulergui/src/main/java/n3_project/helpers/SimplifiedURI.java
Added Paths:
-----------
trunk/eulergui/src/main/java/n3_project/helpers/URLHelper.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-02 16:17:29
|
Revision: 1409
http://eulergui.svn.sourceforge.net/eulergui/?rev=1409&view=rev
Author: jmvanel
Date: 2010-04-02 16:17:21 +0000 (Fri, 02 Apr 2010)
Log Message:
-----------
New SWRL Translator: test D'n'D with http://owldl.com/ontologies/dl-safe.owl
wait the end of the thread of OWL HTTP download before starting the SWRL translator
* TODO : test for URL based projects
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/project/N3Source.java
trunk/eulergui/src/main/java/eulergui/tools/SWRLTranslator.java
trunk/eulergui/src/main/java/n3_project/N3SourceFromRDF.java
trunk/eulergui/src/main/java/n3_project/helpers/URLHelper.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-02 21:44:09
|
Revision: 1410
http://eulergui.svn.sourceforge.net/eulergui/?rev=1410&view=rev
Author: jmvanel
Date: 2010-04-02 21:44:03 +0000 (Fri, 02 Apr 2010)
Log Message:
-----------
New SWRL Translator: test D'n'D with http://owldl.com/ontologies/dl-safe.owl
tested with URL based projects
tested with projects with sub projects
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/controller/ApplicationKB.java
trunk/eulergui/src/main/java/eulergui/project/N3Source.java
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/eulergui/project/ProjectChangeSupport.java
trunk/eulergui/src/main/java/eulergui/project/ProjectCloning.java
trunk/eulergui/src/main/java/eulergui/tools/SWRLTranslator.java
trunk/eulergui/src/main/java/n3_project/N3SourceFromRDF.java
trunk/eulergui/src/main/java/n3_project/ProjectGUI.java
trunk/eulergui/src/main/java/n3_project/SourceFactory.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-09 11:22:57
|
Revision: 1431
http://eulergui.svn.sourceforge.net/eulergui/?rev=1431&view=rev
Author: jmvanel
Date: 2010-04-09 11:22:51 +0000 (Fri, 09 Apr 2010)
Log Message:
-----------
reduce the volume of messages in internal (infrastructure) projects
semi-hack, see TODO
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/controller/ApplicationKB.java
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/n3_project/ProjectGUI.java
trunk/eulergui/src/main/java/n3_project/helpers/N3toDroolsUpdater.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <iam...@us...> - 2010-04-15 17:14:23
|
Revision: 1461
http://eulergui.svn.sourceforge.net/eulergui/?rev=1461&view=rev
Author: iamlolive
Date: 2010-04-15 17:14:15 +0000 (Thu, 15 Apr 2010)
Log Message:
-----------
the real jedit now has a tooltip that lists the parser data corresponding to the current cursor position.
probably very broken in some case (==it is still alpha code)
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/n3_project/EditorManagement.java
trunk/eulergui/src/main/java/n3_project/SourceFilesView.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-16 12:15:25
|
Revision: 1463
http://eulergui.svn.sourceforge.net/eulergui/?rev=1463&view=rev
Author: jmvanel
Date: 2010-04-16 12:15:19 +0000 (Fri, 16 Apr 2010)
Log Message:
-----------
add this method to facilitate N3 editor tooltips:
Project . searchFromString( String n3Source, Object[] arguments)
NOT TESTED
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/project/Project.java
trunk/eulergui/src/main/java/n3_project/helpers/N3toDroolsUpdater.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-18 14:35:01
|
Revision: 1467
http://eulergui.svn.sourceforge.net/eulergui/?rev=1467&view=rev
Author: jmvanel
Date: 2010-04-18 14:34:55 +0000 (Sun, 18 Apr 2010)
Log Message:
-----------
pave the way for List N3 Builtins in N3 to Drools Translation
Modified Paths:
--------------
trunk/eulergui/src/main/java/deductions/Namespaces.java
trunk/eulergui/src/main/java/eulergui/n3model/LinesAndCols.java
trunk/eulergui/src/main/java/n3_project/helpers/CRUD_builtins.java
trunk/eulergui/src/main/java/n3_project/helpers/DroolsTripleHandler.java
trunk/eulergui/src/main/java/n3_project/helpers/N3TranslationPlugin.java
Added Paths:
-----------
trunk/eulergui/src/main/java/n3_project/helpers/ListBuiltins.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-20 21:59:00
|
Revision: 1485
http://eulergui.svn.sourceforge.net/eulergui/?rev=1485&view=rev
Author: jmvanel
Date: 2010-04-20 21:58:54 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
list:in N3 Builtin in N3 to Drools Translation
re-TESTED: test/findall3.n3p
examples/list3.n3p : WIP
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/tools/SWRLTranslator.java
trunk/eulergui/src/main/java/n3_project/helpers/CRUD_builtins.java
trunk/eulergui/src/main/java/n3_project/helpers/DroolsTripleHandler.java
trunk/eulergui/src/main/java/n3_project/helpers/ListBuiltins.java
trunk/eulergui/src/main/java/n3_project/helpers/N3TranslationPlugin.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jm...@us...> - 2010-04-23 11:14:39
|
Revision: 1512
http://eulergui.svn.sourceforge.net/eulergui/?rev=1512&view=rev
Author: jmvanel
Date: 2010-04-23 11:14:33 +0000 (Fri, 23 Apr 2010)
Log Message:
-----------
- LineTrackingTriple : add no-arg constructor for JavaBeans tools (XMLEncoder )
- add log when launch jEdit
Modified Paths:
--------------
trunk/eulergui/src/main/java/eulergui/gui/view/TextEditor.java
trunk/eulergui/src/main/java/n3_project/helpers/LineTrackingTriple.java
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X