bprocessor-commit — Commit

[Bprocessor-commit] gl .classpath,1.7,1.8 build.xml,1.8,1.9

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13718

Modified Files:
	.classpath build.xml 
Log Message:


Index: .classpath
===================================================================
RCS file: /cvsroot/bprocessor/gl/.classpath,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** .classpath	7 Dec 2010 14:43:40 -0000	1.7
--- .classpath	17 Dec 2010 12:16:37 -0000	1.8
***************
*** 8,11 ****
--- 8,12 ----
  	<classpathentry combineaccessrules="false" kind="src" path="/bscript"/>
  	<classpathentry kind="lib" path="/tools/jogl/gluegen-rt.jar"/>
+ 	<classpathentry combineaccessrules="false" kind="src" path="/sensobyg"/>
  	<classpathentry kind="output" path="build"/>
  </classpath>

Index: build.xml
===================================================================
RCS file: /cvsroot/bprocessor/gl/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build.xml	8 Dec 2010 11:10:28 -0000	1.8
--- build.xml	17 Dec 2010 12:16:37 -0000	1.9
***************
*** 18,22 ****
      <property name="lib.dir" value="${basedir}/lib"/>
      <property name="dist.dir" value="${basedir}/dist"/>
! 
      <property name="checkstyle-results" value="${build.dir}/checkstyle-results.txt" />
  
--- 18,23 ----
      <property name="lib.dir" value="${basedir}/lib"/>
      <property name="dist.dir" value="${basedir}/dist"/>
!   	<property name="sensobyg.dir" value="${basedir}/../sensobyg"/>
!   	
      <property name="checkstyle-results" value="${build.dir}/checkstyle-results.txt" />
  
***************
*** 76,79 ****
--- 77,85 ----
        </fileset>
      </copy>
+   	<copy todir="${lib.dir}">
+   	      <fileset dir="${sensobyg.dir}/dist">
+   	        <include name="**/sensobyg*"/>
+   	      </fileset>
+   	    </copy>
    </target>
  

[Bprocessor-commit] sensobyg build.sh, NONE, 1.1 build.xml, NONE, 1.1 .classpath, 1.1, 1.2

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13697

Modified Files:
	.classpath 
Added Files:
	build.sh build.xml 
Log Message:


Index: .classpath
===================================================================
RCS file: /cvsroot/bprocessor/sensobyg/.classpath,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .classpath	16 Dec 2010 10:17:50 -0000	1.1
--- .classpath	17 Dec 2010 12:16:34 -0000	1.2
***************
*** 3,6 ****
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
! 	<classpathentry kind="output" path="bin"/>
  </classpath>
--- 3,6 ----
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
! 	<classpathentry kind="output" path="build"/>
  </classpath>

--- NEW FILE: build.sh ---
#!/bin/sh

if [ -z $ANT_HOME ]; then
  echo "Please set the ANT_HOME variable."
  exit 1
fi

if [ -z $JAVA_HOME ]; then
  echo "Please set the JAVA_HOME variable."
  exit 1
fi

export PATH=$ANT_HOME/bin:$JAVA_HOME/bin:$PATH
ant $*

--- NEW FILE: build.xml ---
<project name="sensobyg" default="compile" basedir=".">
	<target name="init">	
	    <property name="name" value="sensobyg"/>
	    <property name="version" value="0.1"/>
	    <property name="tools.dir" value="${basedir}/../tools"/>
	  	<property name="build.dir" value="${basedir}/build"/>
		<property name="model.dir" value="${basedir}/../model"/>
	    <property name="src.dir" value="${basedir}/src"/>
	    <property name="conf.dir" value="${src.dir}/etc"/>
	    <property name="doc.dir" value="${basedir}/doc"/>
	    <property name="doc.api.dir" value="${doc.dir}/api"/>
	    <property name="lib.dir" value="${basedir}/lib"/>
	    <property name="dist.dir" value="${basedir}/dist"/>
	    <property name="build.compiler" value="modern"/>
	</target>
	
	
	<target name="compile" depends="prepare">
	    <ant dir="src" target="compile"/>
	</target>
	
	<target name="clean" depends="init">
	    <delete dir="${build.dir}"/>
	    <delete dir="${dist.dir}"/>
	    <delete dir="${doc.api.dir}"/>
	    <delete>
	      <fileset dir="${lib.dir}">
	        <include name="**/*.jar"/>
	      </fileset>
	    </delete>
	    <delete>
	      <fileset dir="${basedir}" defaultexcludes="no">
	        <include name="**/*~"/>
	      </fileset>
	    </delete>
	</target>
	
	<target name="prepare" depends="init">
		<mkdir dir="${build.dir}"/>
		<mkdir dir="${lib.dir}"/>
	</target>
	
	<target name="checkstyle" depends="prepare">
	    <taskdef name="checkstyle"
	             classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"
	             classpath="${tools.dir}/checkstyle/checkstyle-all-4.2.jar"/>
	    <checkstyle
	      config="${tools.dir}/checkstyle/checkstyle.xml" 
	      failOnViolation="true">
	      <fileset dir="${src.dir}"
	               includes="**/*.java"/>
	    </checkstyle>
	  </target>
	
	<target name="jar" depends="compile"> 
	    <mkdir dir="${dist.dir}"/>
	    <jar jarfile="${dist.dir}/${name}.jar"
	         basedir="${build.dir}"
	         compress="true"
	         includes="**/*"
	         excludes="depcache/**">
	    </jar>
	  </target>
	<target name="dist" depends="jar"> </target>
</project>

[Bprocessor-commit] sensobyg/dist sensobyg.jar,NONE,1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/dist
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13697/dist

Added Files:
	sensobyg.jar 
Log Message:


--- NEW FILE: sensobyg.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] sensobyg/src build.xml,NONE,1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13697/src

Added Files:
	build.xml 
Log Message:


--- NEW FILE: build.xml ---
<project name="src" default="compile" basedir=".">
  <path id="build.path">
    <fileset dir="${lib.dir}">
      <include name="**/*.jar"/>
    </fileset>
    <pathelement location="."/>
    <pathelement location="${build.dir}"/>
  </path>

  <target name="init">
    <mkdir dir="${build.dir}"/>
  </target>

  <target name="compile">
    <javac srcdir="${src.dir}" destdir="${build.dir}" deprecation="yes"
           debug="yes" target="1.5" source="1.5"
           includes="net/**">
      <classpath refid="build.path"/>
    </javac>
  </target>
</project>

[Bprocessor-commit] bprocessor/src/etc manifest.mf,1.4,1.5

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/bprocessor/src/etc
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13686/src/etc

Modified Files:
	manifest.mf 
Log Message:


Index: manifest.mf
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/etc/manifest.mf,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** manifest.mf	8 Dec 2010 11:10:19 -0000	1.4
--- manifest.mf	17 Dec 2010 12:16:31 -0000	1.5
***************
*** 4,8 ****
      core/gui.jar \
      core/model.jar \
!     core/gl.jar
      library/log4j.jar \
      library/jaxb.jar \
--- 4,9 ----
      core/gui.jar \
      core/model.jar \
!     core/gl.jar \
!     core/sensobyg.jar \
      library/log4j.jar \
      library/jaxb.jar \

[Bprocessor-commit] sensobyg/lib - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/lib
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13663/lib

Log Message:
Directory /cvsroot/bprocessor/sensobyg/lib added to the repository

[Bprocessor-commit] sensobyg/dist - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/dist
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13663/dist

Log Message:
Directory /cvsroot/bprocessor/sensobyg/dist added to the repository

[Bprocessor-commit] sensobyg/build - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/build
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13663/build

Log Message:
Directory /cvsroot/bprocessor/sensobyg/build added to the repository

[Bprocessor-commit] sensobyg .project, NONE, 1.1 .classpath, NONE, 1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4589

Added Files:
	.project .classpath 
Log Message:


--- NEW FILE: .project ---
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>sensobyg</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

--- NEW FILE: .classpath ---
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry kind="output" path="bin"/>
</classpath>

[Bprocessor-commit] sensobyg/src/net/sourceforge - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/src/net/sourceforge
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4541/src/net/sourceforge

Log Message:
Directory /cvsroot/bprocessor/sensobyg/src/net/sourceforge added to the repository

[Bprocessor-commit] sensobyg/src/net - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/src/net
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4541/src/net

Log Message:
Directory /cvsroot/bprocessor/sensobyg/src/net added to the repository

[Bprocessor-commit] sensobyg/src/net/sourceforge/bprocessor/sensobyg MoldEntry.java, NONE, 1.1 History.java, NONE, 1.1 Producer.java, NONE, 1.1 Measurement.java, NONE, 1.1 Consumer.java, NONE, 1.1 Target.java, NONE, 1.1 Sensor.java, NONE, 1.1 Provider.java, NONE, 1.1 MoldTable.java, NONE, 1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/src/net/sourceforge/bprocessor/sensobyg
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4589/src/net/sourceforge/bprocessor/sensobyg

Added Files:
	MoldEntry.java History.java Producer.java Measurement.java 
	Consumer.java Target.java Sensor.java Provider.java 
	MoldTable.java 
Log Message:


--- NEW FILE: Producer.java ---
package net.sourceforge.bprocessor.sensobyg;

import java.util.LinkedList;
import java.util.List;

public class Producer {
  private List<Consumer> consumers;
  
  public Producer() {
    consumers = new LinkedList<Consumer>();
  }
  
  public void add(Consumer consumer) {
    consumers.add(consumer);
  }
  public void remove(Consumer consumer) {
    consumers.remove(consumer);
  }
  
  public void consume(Object value) {
    for (Consumer current : consumers) {
      current.consume(value);
    }
  }
}

--- NEW FILE: Measurement.java ---
package net.sourceforge.bprocessor.sensobyg;

import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

public class Measurement {
  private long time;
  private String value;
 
  public Measurement() {  
  }
  
  public Measurement(long time, String value) {
    this.time = time;
    this.value = value;
  }
  
  public void setTime(long value) {
    time = value;
  }
  public long getTime() {
    return time;
  }
  
  public void setValue(String string) {
    value = string;
  }
  public String getValue() {
    return value;
  }
  
  public String toString() {
    DateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
    String str = format.format(new Date(time));
    return "(" + str + " | " + value + ")"; 
  }
}

--- NEW FILE: MoldEntry.java ---
package net.sourceforge.bprocessor.sensobyg;

public class MoldEntry {
  
  public double temperature;
  public double humidity;
  
  public MoldEntry(double t, double h) {
    temperature = t;
    humidity = h;
  }
}

--- NEW FILE: History.java ---
package net.sourceforge.bprocessor.sensobyg;

import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

public abstract class History {
  public abstract List<Measurement> fetch(Target target, Sensor sensor, Date from);
  public abstract List<Measurement> fetch(Target target, Sensor sensor, Date from, Date to);
  
  public Map<Sensor, List<Measurement>> fetch(Target target, Date from) {
    Map<Sensor, List<Measurement>> result = new HashMap<Sensor, List<Measurement>>();
    for (Sensor current : target.getSensors()) {
      result.put(current, fetch(target, current, from));
    }
    return result;
  }
  
  public Map<Sensor, List<Measurement>> fetch(Target target, Date from, Date to) {
    Map<Sensor, List<Measurement>> result = new HashMap<Sensor, List<Measurement>>();
    for (Sensor current : target.getSensors()) {
      result.put(current, fetch(target, current, from, to));
    }
    return result;
  }
}

--- NEW FILE: Sensor.java ---
package net.sourceforge.bprocessor.sensobyg;

public class Sensor {
  private String id;
  private String type;
  
  public Sensor() {
  }
  
  public Sensor(String id, String type) {
    this.id = id;
    this.type = type;
  }
  
  public void setId(String value) {
    id = value;
  }
  public String getId() {
    return id;
  }
  
  public void setType(String value) {
    type = value;
  }
  public String getType() {
    return type;
  }
}

--- NEW FILE: Target.java ---
package net.sourceforge.bprocessor.sensobyg;

import java.util.LinkedList;
import java.util.List;

public class Target {
  private String id;
  List<Sensor> sensors;
  double temperature;
  double humidity;
  
  public double average;
  public double limit;
  
  
  public boolean temperatureAlarm;
  public boolean humidityAlarm;
  public boolean skimmelAlarm;
  
  
  public List<Measurement> temperatures;
  public List<Measurement> humidities;
  
  public Target() {
    
  }
  

  public Target(String id) {
    this.id = id;
    sensors = new LinkedList<Sensor>();
    temperatures = new LinkedList<Measurement>();
    humidities = new LinkedList<Measurement>();
    temperature = 20;
    humidity = 50;
  }
  
  public void setId(String value) {
    id = value;
  }
  public String getId() {
    return id;
  }
  
  public void setSensors(List<Sensor> value) {
    sensors = value;
  }
  public List<Sensor> getSensors() {
    return sensors;
  }
  
  public void newTemperature(Measurement value) {
    temperatures.add(value);
    temperature = Double.valueOf(value.getValue());
  }
  public void newHumidity(Measurement value) {
    humidities.add(value);
    humidity = Double.valueOf(value.getValue());
  }
  
  public double getTemperature() {
    return temperature;
  }
  
  public double getHumidity() {
    return humidity;
  }
  
  public List<Measurement> getTemperatures() {
    return temperatures;
  }
  
  public List<Measurement> getHumdiities() {
    return humidities;
  }
  
  public void check() {
    System.out.println("check target");
    double temperatureThreshold = 25.0;
    double humidityThreshold = 50.0;
    
    if (temperature > temperatureThreshold) {
      System.out.println("temperature alarm");
      temperatureAlarm = true;
    }
    if (humidity > humidityThreshold) {
      humidityAlarm = true;
    }
  }

  public Sensor find(String string) {
    for (Sensor current : sensors) {
      if (current.getType().equals(string)) {
        return current;
      }
    }
    return null;
  }
}

--- NEW FILE: MoldTable.java ---
package net.sourceforge.bprocessor.sensobyg;

import java.io.BufferedReader;
import java.io.FileReader;
import java.util.LinkedList;
import java.util.List;

public class MoldTable {
  public List<MoldEntry> entries;
  
  public MoldTable(String name) {
    entries = new LinkedList<MoldEntry>();
    try {
      BufferedReader reader = new BufferedReader(new FileReader(name));
      String line = reader.readLine();
      while (line != null) {
        String[] s = line.split(";");
        double t = Double.valueOf(s[0]);
        double h = Double.valueOf(s[1]);
        entries.add(new MoldEntry(t, h));
        line = reader.readLine();
      }
    } catch(Exception error) {
      
    }
  }
  
  public double get(double t) {
    MoldEntry previous = null;
    for (MoldEntry current : entries) {
      if (previous != null) {
        if (t > previous.temperature && t <= current.temperature) {
          return previous.humidity;
        }
      }
      previous = current;
    }
    return 100.0;
  }
}

--- NEW FILE: Provider.java ---
package net.sourceforge.bprocessor.sensobyg;

public class Provider {

}

--- NEW FILE: Consumer.java ---
package net.sourceforge.bprocessor.sensobyg;

public abstract class Consumer {
  public abstract void consume(Object value);
}

[Bprocessor-commit] sensobyg/src/net/sourceforge/bprocessor - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/src/net/sourceforge/bprocessor
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4541/src/net/sourceforge/bprocessor

Log Message:
Directory /cvsroot/bprocessor/sensobyg/src/net/sourceforge/bprocessor added to the repository

[Bprocessor-commit] sensobyg/src/net/sourceforge/bprocessor/sensobyg - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/src/net/sourceforge/bprocessor/sensobyg
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4541/src/net/sourceforge/bprocessor/sensobyg

Log Message:
Directory /cvsroot/bprocessor/sensobyg/src/net/sourceforge/bprocessor/sensobyg added to the repository

[Bprocessor-commit] sensobyg/src - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4541/src

Log Message:
Directory /cvsroot/bprocessor/sensobyg/src added to the repository

[Bprocessor-commit] sensobyg - New directory

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/sensobyg
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4504/sensobyg

Log Message:
Directory /cvsroot/bprocessor/sensobyg added to the repository

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.200, 1.201

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5761/src/net/sourceforge/bprocessor/model

Modified Files:
	Project.java 
Log Message:


Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** Project.java	8 Dec 2010 11:37:29 -0000	1.200
--- Project.java	15 Dec 2010 14:38:14 -0000	1.201
***************
*** 33,36 ****
--- 33,37 ----
  import net.sourceforge.bprocessor.model.plugin.BSplinePackage;
  import net.sourceforge.bprocessor.model.plugin.FacadePackage;
+ import net.sourceforge.bprocessor.model.plugin.Shell;
  import net.sourceforge.bprocessor.model.sense.brunata.TargetManager;
  import net.sourceforge.bprocessor.model.sense.core.MoldTable;
***************
*** 76,79 ****
--- 77,82 ----
    private Tesselator tesselator;
    
+   private Shell shell;
+   
    /** The observers */
    private List<Observer> observers;
***************
*** 281,284 ****
--- 284,288 ----
    public Project() {
      super();
+     shell = new Shell();
      staticObservers = new LinkedList();
      reset();
***************
*** 374,377 ****
--- 378,389 ----
    
    /**
+    * 
+    * @return Shell
+    */
+   public Shell shell() {
+     return shell;
+   }
+   
+   /**
     * Set the world
     * @param world The world

[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/plugin PluginMonitor.java, NONE, 1.1 Plugin.java, NONE, 1.1 Shell.java, NONE, 1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/plugin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5761/src/net/sourceforge/bprocessor/model/plugin

Added Files:
	PluginMonitor.java Plugin.java Shell.java 
Log Message:


--- NEW FILE: Plugin.java ---
//---------------------------------------------------------------------------------
// $Id: Plugin.java,v 1.1 2010/12/15 14:38:14 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.model.plugin;

import net.sourceforge.bprocessor.model.Parametric;

/**
 * 
 */
public interface Plugin extends Parametric {
  /**
   * 
   * @return name
   */
  public String name();
  
  /**
   * Prepare
   */
  public void prepare();
  
  /**
   * Start
   */
  public void start();
}

--- NEW FILE: Shell.java ---
package net.sourceforge.bprocessor.model.plugin;

import java.util.LinkedList;
import java.util.List;


public class Shell {
  private List<PluginMonitor> plugins;
  
  public Shell() {
    plugins = new LinkedList<PluginMonitor>();
  }
  
  public void add(Plugin plugin) {
    plugins.add(new PluginMonitor(plugin));
  }
  
  public void prepare() {
    for (PluginMonitor current : plugins) {
      current.prepare();
    }
  }
  
  public void start() {
    for (PluginMonitor current : plugins) {
      current.start();
    }
  }
  
  public List<PluginMonitor> getPlugins() {
    return plugins;
  }
}

--- NEW FILE: PluginMonitor.java ---
package net.sourceforge.bprocessor.model.plugin;

import java.util.List;

import net.sourceforge.bprocessor.model.Attribute;
import net.sourceforge.bprocessor.model.Entity;
import net.sourceforge.bprocessor.model.Parametric;

public class PluginMonitor extends Entity implements Parametric {
  private Plugin plugin;
  
  public PluginMonitor(Plugin plugin) {
    this.plugin = plugin;
  }
  
  public void prepare() {
    plugin.prepare();
  }
  public void start() {
    plugin.start();
  }
  
  public void delete() {
  }
  public List<Attribute> getAttributes() {
    return plugin.getAttributes();
  }
  public void setAttributes(List<Attribute> attributes) {
    plugin.setAttributes(attributes);
  }
  public String title() {
    return "Plugin";
  }
  
  public String getName() {
    return plugin.name();
  }
}

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui GUI.java, 1.123, 1.124

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5681/src/net/sourceforge/bprocessor/gui

Modified Files:
	GUI.java 
Log Message:


Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** GUI.java	8 Dec 2010 11:37:32 -0000	1.123
--- GUI.java	15 Dec 2010 14:38:10 -0000	1.124
***************
*** 60,63 ****
--- 60,64 ----
  import net.sourceforge.bprocessor.gui.treeview.DBKTreeView;
  import net.sourceforge.bprocessor.gui.treeview.LibraryTreeView;
+ import net.sourceforge.bprocessor.gui.treeview.PluginTreeView;
  import net.sourceforge.bprocessor.gui.treeview.SpaceTreeView;
  import net.sourceforge.bprocessor.model.Command;
***************
*** 880,883 ****
--- 881,885 ----
      tree.addTab("Library", new JScrollPane (new LibraryTreeView()));
      tree.addTab("DBK", new JScrollPane (new DBKTreeView()));
+     tree.addTab("Plugins", new JScrollPane(new PluginTreeView()));
      tree.setMinimumSize(new Dimension(140, 240));
      tree.setPreferredSize(new Dimension(275, 240));

[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/treeview PluginTreeView.java, NONE, 1.1 CameraTreeView.java, 1.13, 1.14 GenericTreeView.java, 1.154, 1.155

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5681/src/net/sourceforge/bprocessor/gui/treeview

Modified Files:
	CameraTreeView.java GenericTreeView.java 
Added Files:
	PluginTreeView.java 
Log Message:


Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** GenericTreeView.java	1 Dec 2010 10:28:07 -0000	1.154
--- GenericTreeView.java	15 Dec 2010 14:38:10 -0000	1.155
***************
*** 59,62 ****
--- 59,63 ----
  import net.sourceforge.bprocessor.model.Vertex;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
+ import net.sourceforge.bprocessor.model.plugin.PluginMonitor;
  import net.sourceforge.bprocessor.model.sense.brunata.TargetManager;
  import net.sourceforge.bprocessor.model.sense.core.Target;
***************
*** 1240,1243 ****
--- 1241,1259 ----
    
    /**
+    * 
+    */
+   public class PluginContainer extends CompositeNode {
+     /**
+      * 
+      * @param label Object
+      * @param content PluginMonitors
+      * @param sort sort the content
+      */
+     public PluginContainer(Object label, Collection<PluginMonitor> content, boolean sort) {
+       super(label, content, sort);
+     }
+   }
+   
+   /**
     * Menu container for materials
     */

Index: CameraTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/CameraTreeView.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CameraTreeView.java	8 May 2008 10:22:03 -0000	1.13
--- CameraTreeView.java	15 Dec 2010 14:38:10 -0000	1.14
***************
*** 32,38 ****
    public CameraTreeView() {
      super();
-     //setShowsRootHandles(true);
      getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
-     //this.addTreeSelectionListener(new SelectionListener());
      update(Project.getInstance().getCameras(), root);
      model.nodeStructureChanged(root);
--- 32,36 ----

--- NEW FILE: PluginTreeView.java ---
//---------------------------------------------------------------------------------
// $Id: PluginTreeView.java,v 1.1 2010/12/15 14:38:10 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------
package net.sourceforge.bprocessor.gui.treeview;

import net.sourceforge.bprocessor.model.Project;

/**
 *
 */
public class PluginTreeView extends GenericTreeView {
  /**
   * Constructor
   */
  public PluginTreeView() {
    super();
    root = new PluginContainer("Plugins", Project.getInstance().shell().getPlugins(), true);
    model.setRoot(root);
  }
  
  /** {@inheritDoc} */
  @Override
  public void update() {
    root = new PluginContainer("Plugins", Project.getInstance().shell().getPlugins(), true);
    model.setRoot(root);
  }
}

[Bprocessor-commit] tools/piccolo README.txt, NONE, 1.1 LICENSE.txt, NONE, 1.1 Piccolo.jar, NONE, 1.1

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/tools/piccolo
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5640/piccolo

Added Files:
	README.txt LICENSE.txt Piccolo.jar 
Log Message:


--- NEW FILE: LICENSE.txt ---
                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."

      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

   Copyright [yyyy] [name of copyright owner]

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.


===========================================================================

ADDITIONAL LICENSES COVERING PARTS OF THIS DISTRIBUTION:

This distribution includes W3C XML Schema documents Copyright (c) 2001-2003
World Wide Web Consortium.  These schemas are licensed under the W3C
Software License, which is included in the same directory as the schemas.
The license can also be found at:
http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231.

--- NEW FILE: README.txt ---
-------------------------------------------------------------------------
Piccolo XML Parser for Java
Version 1.04, released July 11, 2004
http://piccolo.sourceforge.net/

Please report bugs to yu...@bl.... Thank you.

(C) Copyright 2002-2004 by Yuval Oren. All rights reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

-------------------------------------------------------------------------

Piccolo supports the following specifications:

* SAX 1
* SAX 2 extensions 1.0
* JAXP 1.1 (SAX parsing only)

Note that, per the specifications, namespace handling is turned on by default
with SAX2; when using JAXP, namespace handling is off by default. Turning off
namespace handling will provide a performance gain.

Piccolo requires Java 1.2 or higher.

For usage information, please see the usage documentation available at
http://piccolo.sourceforge.net/using.html .

-------------------------------------------------------------------------
CHANGES from version 1.03:
-------------------------------------------------------------------------
* Character sets natively supported by Java (e.g. Shift_JIS) are now supported
* Piccolo's JAXP will work in applets without giving security exceptions
* All reported bugs should now be fixed:
    - Namespace scope-related bugs
    - Line number reporting should be better now
    - Simple document type (e.g. <!DOCTYPE xyz>) is now recognized
    - Very large CDATA sections are properly handled
    - EntityResolver now works when an InputSource with only a system ID is returned
    - Exceptions are thrown for more invalid SAX2 usage and bad XML
* Performance has been improved by up to 10% over previous versions of Piccolo
* Piccolo attempts to avoid blocking I/O calls, so that it can read from always-open network streams

Many thanks to Eric Vasilik and Cezar Andrei for these enhancements:
- relicensing from LGPL to Apache License Version 2.0
- line info for start elements on the "<".
- added getVersion and getEncoding to the parser
- bug fixing for attribute localname
- added more encodings to the charsetTable


-------------------------------------------------------------------------
CHANGES from version 1.02:
-------------------------------------------------------------------------
This is a maintenance release, correcting the following bugs:

* Turning string interning off would throw the wrong exception
* The ValidatingSAXParserFactory property could not be specified in 
  jaxp.properties
* setLocale() did not throw an exception when set to non-English
* Setting the default namespace within an element already declaring
  a default namespace would cause errors.

-------------------------------------------------------------------------
CHANGES from version 1.01:
-------------------------------------------------------------------------
This is a maintenance release, correcting bugs mostly related to 
error handling:

* If an EntityResolver is registered, it is now correctly called.
* ContentHandler.skippedEntity() is no longer called within attribute values.
* ContentHandler.endDocument() is now called when a fatal error occurs.
* If an error handler is not registered, fatal errors will throw 
  a SAXParseException.
* LexicalHandler.startEntity() is called before the entity is resolved.
* A bug that caused root-level attributes to be ignored sometimes was fixed.
* Very large CDATA sections are now handled efficiently.
* Build and packaging scripts have been enhanced.


-------------------------------------------------------------------------
CHANGES from version 1.0:
-------------------------------------------------------------------------
* A bug causing parsing of "Reader" input sources to fail was fixed.

-------------------------------------------------------------------------
CHANGES from version 0.5:
-------------------------------------------------------------------------

* Detects many more conformance errors
* Namespace processing is faster
* Now supports SAX2 extensions and JAXP
* Bug fixes



--- NEW FILE: Piccolo.jar ---
(This appears to be a binary file; contents omitted.)

[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade FacadeMain.java, 1.11, 1.12

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5564/src/net/sourceforge/bprocessor/facade

Modified Files:
	FacadeMain.java 
Log Message:


Index: FacadeMain.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/FacadeMain.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FacadeMain.java	7 Dec 2010 14:43:34 -0000	1.11
--- FacadeMain.java	15 Dec 2010 14:38:02 -0000	1.12
***************
*** 7,13 ****
  package net.sourceforge.bprocessor.facade;
  
  import net.sourceforge.bprocessor.facade.modellor.NetFacadeModellor;
! import net.sourceforge.bprocessor.gl.Plugin;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
  
  /**
--- 7,17 ----
  package net.sourceforge.bprocessor.facade;
  
+ import java.util.LinkedList;
+ import java.util.List;
+ 
  import net.sourceforge.bprocessor.facade.modellor.NetFacadeModellor;
! import net.sourceforge.bprocessor.model.Attribute;
  import net.sourceforge.bprocessor.model.modellor.Modellor;
+ import net.sourceforge.bprocessor.model.plugin.Plugin;
  
  /**
***************
*** 30,32 ****
--- 34,54 ----
      Modellor.registerModellor(new NetFacadeModellor());
    }
+ 
+   /** {@inheritDoc} */
+   public List<Attribute> getAttributes() {
+     // TODO Auto-generated method stub
+     return new LinkedList();
+   }
+ 
+   /** {@inheritDoc} */
+   public void setAttributes(List<Attribute> attributes) {
+     // TODO Auto-generated method stub
+     
+   }
+ 
+   /** {@inheritDoc} */
+   public String title() {
+     // TODO Auto-generated method stub
+     return name();
+   }
  }

[Bprocessor-commit] facade .classpath,1.9,1.10

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/facade
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5564

Modified Files:
	.classpath 
Log Message:


Index: .classpath
===================================================================
RCS file: /cvsroot/bprocessor/facade/.classpath,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** .classpath	7 Dec 2010 14:43:34 -0000	1.9
--- .classpath	15 Dec 2010 14:38:02 -0000	1.10
***************
*** 6,10 ****
  	<classpathentry combineaccessrules="false" kind="src" path="/gui"/>
  	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/model"/>
- 	<classpathentry combineaccessrules="false" kind="src" path="/gl"/>
  	<classpathentry kind="output" path="build"/>
  </classpath>
--- 6,9 ----

[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl Plugin.java, 1.1, NONE

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5525/src/net/sourceforge/bprocessor/gl

Removed Files:
	Plugin.java 
Log Message:


--- Plugin.java DELETED ---

[Bprocessor-commit] bprocessor/src/net/sourceforge/bprocessor Main.java, 1.2, 1.3 Application.java, 1.11, 1.12 Loader.java, 1.2, 1.3 Shell.java, 1.2, NONE

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5503/src/net/sourceforge/bprocessor

Modified Files:
	Main.java Application.java Loader.java 
Removed Files:
	Shell.java 
Log Message:


Index: Application.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/Application.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Application.java	3 Dec 2010 11:40:54 -0000	1.11
--- Application.java	15 Dec 2010 14:37:56 -0000	1.12
***************
*** 3,6 ****
--- 3,13 ----
  import java.io.File;
  import java.net.URL;
+ 
+ 
+ import net.sourceforge.bprocessor.gl.Editor;
+ import net.sourceforge.bprocessor.gui.GUI;
+ import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.plugin.Shell;
+ 
  import org.apache.log4j.PropertyConfigurator;
  
***************
*** 11,15 ****
    public Application() {
      super();
!     shell = new Shell();
      loader = new Loader(shell);
    }
--- 18,24 ----
    public Application() {
      super();
!     new GUI();
!     new Editor();
!     shell = Project.getInstance().shell();
      loader = new Loader(shell);
    }

Index: Main.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/Main.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Main.java	7 Dec 2010 14:43:30 -0000	1.2
--- Main.java	15 Dec 2010 14:37:56 -0000	1.3
***************
*** 2,5 ****
--- 2,9 ----
  
  import net.sourceforge.bprocessor.facade.FacadeMain;
+ import net.sourceforge.bprocessor.gl.Editor;
+ import net.sourceforge.bprocessor.gui.GUI;
+ import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.plugin.Shell;
  
  import org.apache.log4j.PropertyConfigurator;
***************
*** 9,13 ****
    
    public Main() {
!     shell = new Shell();
    }
    
--- 13,19 ----
    
    public Main() {
!     new GUI();
!     new Editor();
!     shell = Project.getInstance().shell();
    }
    

Index: Loader.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/Loader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Loader.java	7 Dec 2010 14:43:30 -0000	1.2
--- Loader.java	15 Dec 2010 14:37:56 -0000	1.3
***************
*** 10,14 ****
  import java.util.jar.Manifest;
  
! import net.sourceforge.bprocessor.gl.Plugin;
  
  public class Loader {
--- 10,15 ----
  import java.util.jar.Manifest;
  
! import net.sourceforge.bprocessor.model.plugin.Plugin;
! import net.sourceforge.bprocessor.model.plugin.Shell;
  
  public class Loader {

--- Shell.java DELETED ---