OpenFOAM module for jCAE

jcae/core/nbproject/project.xml

@@ -143,14 +143,6 @@
                         <specification-version>7.12.1.1</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.openide.options</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.13.1</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.openide.text</code-name-base>
                     <build-prerequisite/>

jcae/core/src/org/jcae/netbeans/layer.xml

@@ -447,16 +447,6 @@
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.jcae.netbeans.Bundle"/>
             </file>
         </folder>        
-        <file name="org-jcae-netbeans-Settings.settings" url="Settings.settings"/>
     </folder>
 
-    <folder name="UI">
-        <folder name="Services">
-            <folder name="jCAE">
-                <file name="org-jcae-netbeans-Settings.shadow">
-                    <attr name="originalFile" stringvalue="Services/org-jcae-netbeans-Settings.settings"/>
-                </file>
-            </folder>
-        </folder>
-    </folder>
 </filesystem>

jcae/core/src/org/jcae/netbeans/mesh/BuidOEMMAction.java

@@ -20,14 +20,15 @@
 
 package org.jcae.netbeans.mesh;
 
-import java.beans.*;
 import org.jcae.netbeans.ProcessExecutor;
 import org.jcae.netbeans.Utilities;
+import org.jcae.netbeans.options.JCAEPanel;
 import org.openide.filesystems.FileUtil;
 import org.openide.modules.InstalledFileLocator;
 import org.openide.nodes.Node;
 import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
+import org.openide.util.NbPreferences;
 import org.openide.util.actions.CookieAction;
 
 public final class BuidOEMMAction extends CookieAction
@@ -50,7 +51,7 @@ protected void performAction(Node[] activatedNodes)
 				getAbsolutePath();
 
 			String className="org.jcae.mesh.MeshOEMMIndex";
-			String[] cmdLinePre=Settings.getDefault().getCommandLineAlgo();
+			String[] cmdLinePre=NbPreferences.forModule(JCAEPanel.class).get("commandLineAlgo", "").split(" ");
 			String[] cmdLine=new String[cmdLinePre.length+7];
 
 			System.arraycopy(cmdLinePre, 0, cmdLine, 0, cmdLinePre.length);

jcae/mesh-algos/nbproject/project.xml

@@ -128,14 +128,6 @@
                         <specification-version>7.12.1.1</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.openide.options</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.13.1</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.openide.text</code-name-base>
                     <build-prerequisite/>
@@ -180,6 +172,7 @@
             <public-packages>
                 <package>org.jcae.netbeans</package>
                 <package>org.jcae.netbeans.mesh</package>
+                <package>org.jcae.netbeans.options</package>
                 <package>org.jcae.netbeans.viewer3d</package>
                 <package>org.jcae.netbeans.viewer3d.actions</package>
             </public-packages>

jcae/mesh-algos/src/org/jcae/netbeans/mesh/AbstractGroupAction.java

@@ -30,6 +30,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 import org.jcae.mesh.xmldata.Group;
 import org.jcae.netbeans.viewer3d.ViewManager;
+import org.jcae.vtk.AmibeToMesh;
 import org.jcae.vtk.View;
 import org.openide.explorer.ExplorerManager;
 import org.openide.nodes.Node;
@@ -42,6 +43,8 @@
 public abstract class AbstractGroupAction extends CookieAction
 {
 
+        Node[] temp;
+
 	protected int mode()
 	{
 		return CookieAction.MODE_ALL;
@@ -65,6 +68,8 @@ public int compare(Group t, Group t1) {
 
 	protected void performAction(Node[] arg0)
 	{
+
+                temp = arg0;
 		ExplorerManager em = ((ExplorerManager.Provider)
 			TopComponent.getRegistry().getActivated()).getExplorerManager();
 		try
@@ -77,7 +82,9 @@ protected void performAction(Node[] arg0)
 			{
 				AmibeDataObject ado = n.getLookup().lookup(AmibeDataObject.class);
 				if(ado != null && ado.getGroups() != null)
-					groups2Group.put(n, createTreeSet(ado.getGroups().getGroups()));
+                                {
+                                        groups2Group.put(n, createTreeSet(ado.getGroups().getGroups()));                                        
+                                }
 			}
 
 			//GroupNode
@@ -116,7 +123,68 @@ protected void performAction(Node[] arg0)
 		}			
 	}
 
-	private String[] groupsToID(Collection<Group> groupsToDisplay)
+	protected void refreshView(Node[] arg0)
+	{
+		//ExplorerManager em = ((ExplorerManager.Provider) TopComponent.getRegistry().getActivated()).getExplorerManager();
+		try
+		{
+			HashMap<Node, Collection<Group>> groups2Group = new HashMap<Node, Collection<Group>>();
+
+			for(Node n:arg0)
+			{
+				AmibeDataObject ado = n.getLookup().lookup(AmibeDataObject.class);
+				if(ado != null && ado.getGroups() != null)
+                                {
+                                    //ado.addListenerFileChange();
+					groups2Group.put(n, createTreeSet(ado.getGroups().getGroups()));                                        
+                                }
+			}
+
+			//GroupNode
+			for(Node n:arg0)
+			{
+				GroupNode gn = n.getLookup().lookup(GroupNode.class);
+				if(gn != null)
+				{
+					Node amibeNode=n.getParentNode().getParentNode();
+					Collection<Group> c=groups2Group.get(amibeNode);
+					if(c==null)
+					{
+						c=createTreeSet(gn.getGroup());
+						groups2Group.put(amibeNode, c);
+					}
+					else
+						c.add(gn.getGroup());
+				}
+			}
+
+
+			View v = ViewManager.getDefault().getCurrentView();
+			for(Entry<Node, Collection<Group>> e:groups2Group.entrySet())
+                        {
+                            String[] groupsToDisplay = groupsToID(e.getValue());
+                            AmibeNViewable interactor = AmibeNViewable.get(e.getKey(), v);
+                            AmibeDataObject ado = e.getKey().getLookup().lookup(AmibeDataObject.class);
+                            if(interactor != null)
+                            {
+                                    AmibeToMesh reader = new AmibeToMesh(ado.getGroups().getMeshFile(), groupsToDisplay);
+                                    interactor.addTriangles(reader.getTriangles());
+                                    interactor.addBeams(reader.getBeams());
+                                    v.Render();
+                            }
+                        }
+		}
+		catch(IOException ex)
+		{
+			Exceptions.printStackTrace(ex);
+		}
+		catch(SAXException ex)
+		{
+			Exceptions.printStackTrace(ex);
+		}			
+	}
+
+        private String[] groupsToID(Collection<Group> groupsToDisplay)
 	{
 		String[] idGroupsDisplayed = new String[groupsToDisplay.size()];
 		int i = 0;

jcae/mesh-algos/src/org/jcae/netbeans/mesh/AlgoAction.java

@@ -25,7 +25,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.TreeSet;
@@ -36,16 +35,13 @@
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import org.jcae.mesh.JCAEFormatter;
-import org.jcae.mesh.xmldata.Group;
+import org.jcae.netbeans.options.JCAEPanel;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.filesystems.FileUtil;
 import org.openide.modules.InstalledFileLocator;
 import org.openide.nodes.Node;
-import org.openide.util.Cancellable;
-import org.openide.util.Exceptions;
-import org.openide.util.HelpCtx;
-import org.openide.util.Utilities;
+import org.openide.util.*;
 import org.openide.util.actions.CookieAction;
 import org.openide.windows.IOProvider;
 import org.openide.windows.InputOutput;
@@ -210,7 +206,7 @@ protected void performAction(Node[] activatedNodes) {
 						"amibe-python/" + command + ".py",
 						"org.jcae.netbeans", false);
 				InputOutput io = IOProvider.getDefault().getIO(getName(), true);
-				if (Settings.getDefault().isRunInSameJVM())
+				if (NbPreferences.forModule(JCAEPanel.class).getBoolean("runInSameJVM", true))
 					runInSameVM(args, pyFile, io);
 				else
 					runInOtherVM(activatedNodes[0], args, pyFile, io);
@@ -277,7 +273,8 @@ private void runInOtherVM(Node node, List<String> args, File pyFile, InputOutput
 			File f = InstalledFileLocator.getDefault().locate(
 					"modules/jython/bin/jython" + ext, "org.jcae.netbeans.mesh", false);
 			pb.command().add(f.getPath());
-			for (String s : Settings.getDefault().parameters()) {
+                        JCAEPanel j = new JCAEPanel(null);
+			for (String s : j.parameters()) {
 				if (s.startsWith("-") && !s.startsWith("-D")) {
 					s = "-J" + s;
 				}