openproj-commitlog

[Openproj-commitlog] openproj_exchange/src/test/com/projity/exchange MicrosoftImporterTest.java, NONE, 1.1

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/test/com/projity/exchange
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31517/src/test/com/projity/exchange

Added Files:
	MicrosoftImporterTest.java 
Log Message:
initial commit of openproj_exchange - which is the source for the mpop.jar - into sourceforge

--- NEW FILE: MicrosoftImporterTest.java ---
/*
The contents of this file are subject to the Common Public Attribution License 
Version 1.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.projity.com/license . The License is based on the Mozilla Public 
License Version 1.1 but Sections 14 and 15 have been added to cover use of 
software over a computer network and provide for limited attribution for the 
Original Developer. In addition, Exhibit A has been modified to be consistent 
with Exhibit B.

Software distributed under the License is distributed on an "AS IS" basis, 
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the 
specific language governing rights and limitations under the License. The 
Original Code is OpenProj. The Original Developer is the Initial Developer and 
is Projity, Inc. All portions of the code written by Projity are Copyright (c) 
2006, 2007. All Rights Reserved. Contributors Projity, Inc.

Alternatively, the contents of this file may be used under the terms of the 
Projity End-User License Agreeement (the Projity License), in which case the 
provisions of the Projity License are applicable instead of those above. If you 
wish to allow use of your version of this file only under the terms of the 
Projity License and not to allow others to use your version of this file under 
the CPAL, indicate your decision by deleting the provisions above and replace 
them with the notice and other provisions required by the Projity  License. If 
you do not delete the provisions above, a recipient may use your version of this 
file under either the CPAL or the Projity License.

[NOTE: The text of this license may differ slightly from the text of the notices 
in Exhibits A and B of the license at http://www.projity.com/license. You should 
use the latest text at http://www.projity.com/license for your modifications.
You may not remove this license text from the source files.]

Attribution Information: Attribution Copyright Notice: Copyright © 2006, 2007 
Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj, 
an open source solution from Projity. Attribution URL: http://www.projity.com 
Graphic Image as provided in the Covered Code as file:  openproj_logo.png with 
alternatives listed on http://www.projity.com/logo

Display of Attribution Information is required in Larger Works which are defined 
in the CPAL as a work which combines Covered Code or portions thereof with code 
not governed by the terms of the CPAL. However, in addition to the other notice 
obligations, all copies of the Covered Code in Executable and Source Code form 
distributed must, as a form of attribution of the original author, include on 
each user interface screen the "OpenProj" logo visible to all users.  The 
OpenProj logo should be located horizontally aligned with the menu bar and left 
justified on the top left of the screen adjacent to the File menu.  The logo 
must be at least 100 x 25 pixels.  When users click on the "OpenProj" logo it 
must direct them back to http://www.projity.com.  
*/
package test.com.projity.exchange;

import com.projity.exchange.MicrosoftImporter;
import com.projity.job.Job;
import com.projity.pm.task.ProjectFactory;
import com.projity.session.SessionFactory;

import junit.framework.TestCase;

/**
 *
 */
public class MicrosoftImporterTest extends TestCase {
	private static String mppFileName = "testdata/New Product.mpp";
	private static String xmlFileName = "testdata/New Product.xml";	
	/**
	 * Main method for testing from command line
	 * 
	 * @param args array of command line arguments
	 */
	public static void main(String[] args) {
	}
	

	public void testMppImport() throws Exception {
		MicrosoftImporter importer = new MicrosoftImporter();
		importer.setFileName(mppFileName);
		importer.setProject(ProjectFactory.getInstance().createProject());
		Job job=importer.getImportFileJob();
		SessionFactory.getInstance().getJobQueue().schedule(job);
	}

	// JAXB is not on classpath yet
//	public void testXmlImport() throws Exception {
//		MicrosoftImporter importer = new MicrosoftImporter(xmlFileName,	Document.getTestInstance());
//		importer.importFile();
//	}
	
}

[Openproj-commitlog] openproj_exchange/src/com/projity/server/data/linker Linker.java, NONE, 1.1 TaskLinker.java, NONE, 1.1 ResourceLinker.java, NONE, 1.1

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/com/projity/server/data/linker
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31517/src/com/projity/server/data/linker

Added Files:
	Linker.java TaskLinker.java ResourceLinker.java 
Log Message:
initial commit of openproj_exchange - which is the source for the mpop.jar - into sourceforge

--- NEW FILE: Linker.java ---
/*
The contents of this file are subject to the Common Public Attribution License
Version 1.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.projity.com/license . The License is based on the Mozilla Public
License Version 1.1 but Sections 14 and 15 have been added to cover use of
software over a computer network and provide for limited attribution for the
Original Developer. In addition, Exhibit A has been modified to be consistent
with Exhibit B.

Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
specific language governing rights and limitations under the License. The
Original Code is OpenProj. The Original Developer is the Initial Developer and
is Projity, Inc. All portions of the code written by Projity are Copyright (c)
2006, 2007. All Rights Reserved. Contributors Projity, Inc.

Alternatively, the contents of this file may be used under the terms of the
Projity End-User License Agreeement (the Projity License), in which case the
provisions of the Projity License are applicable instead of those above. If you
wish to allow use of your version of this file only under the terms of the
Projity License and not to allow others to use your version of this file under
the CPAL, indicate your decision by deleting the provisions above and replace
them with the notice and other provisions required by the Projity  License. If
you do not delete the provisions above, a recipient may use your version of this
file under either the CPAL or the Projity License.

[NOTE: The text of this license may differ slightly from the text of the notices
in Exhibits A and B of the license at http://www.projity.com/license. You should
use the latest text at http://www.projity.com/license for your modifications.
You may not remove this license text from the source files.]

Attribution Information: Attribution Copyright Notice: Copyright � 2006, 2007
Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj,
an open source solution from Projity. Attribution URL: http://www.projity.com
Graphic Image as provided in the Covered Code as file:  openproj_logo.png with
alternatives listed on http://www.projity.com/logo

Display of Attribution Information is required in Larger Works which are defined
in the CPAL as a work which combines Covered Code or portions thereof with code
not governed by the terms of the CPAL. However, in addition to the other notice
obligations, all copies of the Covered Code in Executable and Source Code form
distributed must, as a form of attribution of the original author, include on
each user interface screen the "OpenProj" logo visible to all users.  The
OpenProj logo should be located horizontally aligned with the menu bar and left
justified on the top left of the screen adjacent to the File menu.  The logo
must be at least 100 x 25 pixels.  When users click on the "OpenProj" logo it
must direct them back to http://www.projity.com.
*/
package com.projity.server.data.linker;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.apache.commons.collections.Closure;

import com.projity.grouping.core.Node;
import com.projity.grouping.core.hierarchy.NodeHierarchy;
import com.projity.pm.assignment.Assignment;

/**
 *
 */
public abstract class Linker {
	//protected boolean globalIdsOnly=true;
	protected Map transformationMap=new HashMap();
	protected Collection transformed=new ArrayList();
	protected Iterator iterator=null;
	protected Object parent;
	protected Object transformedParent;
	protected Object[] args=null;
	protected boolean incremental;

	public Map getTransformationMap() {
		return transformationMap;
	}
	public Collection getTransformed() {
		return transformed;
	}
//	public boolean isGlobalIdsOnly() {
//		return globalIdsOnly;
//	}
//	public void setGlobalIdsOnly(boolean globalIdsOnly) {
//		this.globalIdsOnly = globalIdsOnly;
//	}

	public boolean isIncremental() {
		return incremental;
	}
	public void setIncremental(boolean incremental) {
		this.incremental = incremental;
	}

	public Object getParent() {
		return parent;
	}
	public void setParent(Object parent) {
		this.parent = parent;
	}
	public Object getTransformedParent() {
		return transformedParent;
	}
	public void setTransformedParent(Object transformedParent) {
		this.transformedParent = transformedParent;
	}

	public Object[] getArgs() {
		return args;
	}
	public void setArgs(Object[] args) {
		this.args = args;
	}
	public boolean hasNext(){return (iterator==null)?false:iterator.hasNext();}
	public void addTransformedObjects() throws Exception{
		while(hasNext()){
			Object obj=executeNext();
			if (obj!=null){
				Object trans=addTransformedObjects(obj);
				if (trans!=null) transformed.add(trans);
			}
		}
		executeFinally();
	}
	public void init(){
		transformationMap.clear();
		transformed.clear();
		initIterator();
	}

	//private int lastIndex;
    public void addOutline(Node root){
    	final Set endVoids=new HashSet();
    	//lastIndex=0;
        getHierarchy().visitAll(root, true,new Closure(){
        	//int tmpIndex=0;
        	public void execute(Object arg){
        		Node node=(Node)arg;
        		Object nodeImpl=node.getImpl();
        		if (!(nodeImpl instanceof Assignment)){
//        			if (!node.isVoid()) lastIndex=tmpIndex;
//        			tmpIndex++;
        			if (node.isVoid()) endVoids.add(node);
        			else endVoids.clear();
        		}
        	}
        });

        getHierarchy().visitAllLevelOrder(root, true,new Closure(){
        	Node thisParent=null;
        	long position=0;
        	//int index=0;
        	public void execute(Object arg){
        		//if (index++>lastIndex) return;
        		Node node=(Node)arg;
        		if (endVoids.contains(node)) return;
        		Object nodeImpl=node.getImpl();
        		if (!(nodeImpl instanceof Assignment)){
        			Node currentParent=getHierarchy().getParent(node);
        			if (currentParent!=null&&currentParent.isRoot()) currentParent=null; //for compatibility
        			if (thisParent!=currentParent){
        				thisParent=currentParent;
        				position=0;
        			}
        			if (node.isVoid()||addOutlineElement(nodeImpl,(thisParent==null)?null:thisParent.getImpl(),position))
        				position++; //skip voids but increment position
        		}
        	}
        });
    }
//    public void addOutline(Node root){
//        getHierarchy().visitAllLevelOrder(root, true,new Closure(){
//        	Node thisParent=null;
//        	long position=0;
//        	public void execute(Object arg){
//        		Node node=(Node)arg;
//        		Object nodeImpl=node.getImpl();
//        		if (!(nodeImpl instanceof Assignment)&&!node.isVoid()){
//        			Node currentParent=getHierarchy().getParent(node);
//        			if (currentParent!=null&&currentParent.isRoot()) currentParent=null; //for compatibility
//        			if (thisParent!=currentParent){
//        				thisParent=currentParent;
//        				position=0;
//        			}
//        			if (addOutlineElement(nodeImpl,(thisParent==null)?null:thisParent.getImpl(),position))
//        				position++;
//        		}
//        	}
//        });
//    }






	protected void initIterator(){}
	public Object executeNext(){return null;}
	public void executeFinally(){}
    public abstract Object addTransformedObjects(Object child) throws Exception;
    public NodeHierarchy getHierarchy(){return null;}
    public boolean addOutlineElement(Object outlineChild,Object outlineParent,long position){return true;}
}

--- NEW FILE: TaskLinker.java ---
/*
The contents of this file are subject to the Common Public Attribution License
Version 1.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.projity.com/license . The License is based on the Mozilla Public
License Version 1.1 but Sections 14 and 15 have been added to cover use of
software over a computer network and provide for limited attribution for the
Original Developer. In addition, Exhibit A has been modified to be consistent
with Exhibit B.

Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
specific language governing rights and limitations under the License. The
Original Code is OpenProj. The Original Developer is the Initial Developer and
is Projity, Inc. All portions of the code written by Projity are Copyright (c)
2006, 2007. All Rights Reserved. Contributors Projity, Inc.

Alternatively, the contents of this file may be used under the terms of the
Projity End-User License Agreeement (the Projity License), in which case the
provisions of the Projity License are applicable instead of those above. If you
wish to allow use of your version of this file only under the terms of the
Projity License and not to allow others to use your version of this file under
the CPAL, indicate your decision by deleting the provisions above and replace
them with the notice and other provisions required by the Projity  License. If
you do not delete the provisions above, a recipient may use your version of this
file under either the CPAL or the Projity License.

[NOTE: The text of this license may differ slightly from the text of the notices
in Exhibits A and B of the license at http://www.projity.com/license. You should
use the latest text at http://www.projity.com/license for your modifications.
You may not remove this license text from the source files.]

Attribution Information: Attribution Copyright Notice: Copyright � 2006, 2007
Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj,
an open source solution from Projity. Attribution URL: http://www.projity.com
Graphic Image as provided in the Covered Code as file:  openproj_logo.png with
alternatives listed on http://www.projity.com/logo

Display of Attribution Information is required in Larger Works which are defined
in the CPAL as a work which combines Covered Code or portions thereof with code
not governed by the terms of the CPAL. However, in addition to the other notice
obligations, all copies of the Covered Code in Executable and Source Code form
distributed must, as a form of attribution of the original author, include on
each user interface screen the "OpenProj" logo visible to all users.  The
OpenProj logo should be located horizontally aligned with the menu bar and left
justified on the top left of the screen adjacent to the File menu.  The logo
must be at least 100 x 25 pixels.  When users click on the "OpenProj" logo it
must direct them back to http://www.projity.com.
*/
package com.projity.server.data.linker;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;

import org.apache.commons.collections.Predicate;

import com.projity.field.Field;
import com.projity.grouping.core.hierarchy.NodeHierarchy;
import com.projity.grouping.core.model.NodeModel;
import com.projity.pm.task.Project;
import com.projity.pm.task.Task;
import com.projity.server.data.AssignmentData;
import com.projity.server.data.SerializeOptions;
import com.projity.server.data.SerializedDataObject;
import com.projity.server.data.TaskData;
import com.projity.server.data.TypeSystemConverter;
import com.projity.server.data.TypeSystemConverterFactory;
import com.projity.util.Environment;

/**
 *
 */
public abstract class TaskLinker extends Linker {
	public void initIterator(){
		iterator=((Project)getParent()).getTaskOutlineIterator();
	}
	public Object executeNext(){
        Task task=(Task)iterator.next();
        //if (globalIdsOnly) CommonDataObject.makeGlobal(task);
     	return task;
	}

	public NodeHierarchy getHierarchy(){return ((Project)getParent()).getTaskOutline().getHierarchy();}

	protected Collection flatAssignments;

	public Collection getFlatAssignments() {
		return flatAssignments;
	}
	public void setFlatAssignments(Collection flatAssignments) {
		this.flatAssignments = flatAssignments;
	}
//	protected ArrayList<Long> unchanged;
//
//	public ArrayList<Long> getUnchanged() {
//		return unchanged;
//	}
//	public void setUnchanged(ArrayList<Long> unchanged) {
//		this.unchanged = unchanged;
//	}





	//extra field union needed for rollup fields
	protected class PreparedAttributes{
		protected SerializedDataObject data;
		protected Object obj;
		protected Collection extrafields; //extra fields
		protected List fieldArray;
		protected NodeModel model;
		public PreparedAttributes(SerializedDataObject data, Object obj, Collection extrafields, List fieldArray, NodeModel model) {
			super();
			this.data = data;
			this.obj = obj;
			this.extrafields = extrafields;
			this.fieldArray = fieldArray;
			this.model = model;
		}
		public SerializedDataObject getData() {
			return data;
		}
		public void setData(SerializedDataObject data) {
			this.data = data;
		}
		public Collection getExtrafields() {
			return extrafields;
		}
		public void setExtrafields(Collection extrafields) {
			this.extrafields = extrafields;
		}
		public List getFieldArray() {
			return fieldArray;
		}
		public void setFieldArray(List fieldArray) {
			this.fieldArray = fieldArray;
		}
		public NodeModel getModel() {
			return model;
		}
		public void setModel(NodeModel model) {
			this.model = model;
		}
		public Object getObj() {
			return obj;
		}
		public void setObj(Object obj) {
			this.obj = obj;
		}
	}
	protected List<PreparedAttributes> preparedAttributes;

	public void addPreparedAttributes(SerializedDataObject data, Object obj, NodeModel model,SerializeOptions options) {
		if (preparedAttributes==null) preparedAttributes=new ArrayList<PreparedAttributes>();
		TypeSystemConverter converter=TypeSystemConverterFactory.getInstance().getConverter();
		Predicate fieldFilter=options==null?null:options.getFieldFilter();
   		if (data instanceof TaskData) preparedAttributes.add(new PreparedAttributes(data,obj,converter.getDirtyExtraFields(obj,fieldFilter),converter.getExposedTaskFields(fieldFilter),model));
		else if (data instanceof AssignmentData) preparedAttributes.add(new PreparedAttributes(data,obj,converter.getDirtyExtraFields(obj,fieldFilter),converter.getExposedAssignmentFields(fieldFilter),model));

	}
	public void computeAttributes(){
        if (Environment.isNoPodServer()){
           	TypeSystemConverter converter=TypeSystemConverterFactory.getInstance().getConverter();
           	ArrayList<Field> unionExtraTaskFields=new ArrayList<Field>();
           	ArrayList<Field> unionExtraAssignmentFields=new ArrayList<Field>();
           	/*DEF164438: 	Projity: Error exporting task plan to .xml
           	  this stops the bombout which occurs.  may require revisiting if we find
           	  that this code path is needed for msp export --TAF090707*/
           	if (preparedAttributes ==  null) return;
        	for (PreparedAttributes attrs:preparedAttributes){
        		if (attrs.getExtrafields()==null) continue;
        		if (attrs.getData() instanceof TaskData){
        			unionExtraTaskFields.addAll(attrs.getExtrafields());
        		}
        		else if (attrs.getData() instanceof AssignmentData){
        			unionExtraAssignmentFields.addAll(attrs.getExtrafields());
        		}
        	}
        	for (PreparedAttributes attrs:preparedAttributes){
        		SerializedDataObject data=attrs.getData();
        		if (data instanceof TaskData){
            		Map<String,Object> exposedAttributes=converter.convertFieldsAndCustomAttributes(attrs.getObj(), unionExtraTaskFields, attrs.getFieldArray(), attrs.getModel(),false);
        			((TaskData)data).setAttributes(exposedAttributes);
        		}
        		else if (data instanceof AssignmentData){
            		Map<String,Object> exposedAttributes=converter.convertFieldsAndCustomAttributes(attrs.getObj(), unionExtraAssignmentFields, attrs.getFieldArray(), attrs.getModel(),false);
        			((AssignmentData)data).setAttributes(exposedAttributes);
        		}
        	}
        }

	}

	public void addTransformedObjects() throws Exception{
		super.addTransformedObjects();
		computeAttributes();
	}
	public List<PreparedAttributes> getPreparedAttributes() {
		return preparedAttributes;
	}
	public void setPreparedAttributes(List<PreparedAttributes> preparedAttributes) {
		this.preparedAttributes = preparedAttributes;
	}

	protected SerializeOptions options;
	public SerializeOptions getOptions() {
		return options;
	}
	public void setOptions(SerializeOptions options) {
		this.options = options;
	}


}

--- NEW FILE: ResourceLinker.java ---
/*
The contents of this file are subject to the Common Public Attribution License 
Version 1.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.projity.com/license . The License is based on the Mozilla Public 
License Version 1.1 but Sections 14 and 15 have been added to cover use of 
software over a computer network and provide for limited attribution for the 
Original Developer. In addition, Exhibit A has been modified to be consistent 
with Exhibit B.

Software distributed under the License is distributed on an "AS IS" basis, 
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the 
specific language governing rights and limitations under the License. The 
Original Code is OpenProj. The Original Developer is the Initial Developer and 
is Projity, Inc. All portions of the code written by Projity are Copyright (c) 
2006, 2007. All Rights Reserved. Contributors Projity, Inc.

Alternatively, the contents of this file may be used under the terms of the 
Projity End-User License Agreeement (the Projity License), in which case the 
provisions of the Projity License are applicable instead of those above. If you 
wish to allow use of your version of this file only under the terms of the 
Projity License and not to allow others to use your version of this file under 
the CPAL, indicate your decision by deleting the provisions above and replace 
them with the notice and other provisions required by the Projity  License. If 
you do not delete the provisions above, a recipient may use your version of this 
file under either the CPAL or the Projity License.

[NOTE: The text of this license may differ slightly from the text of the notices 
in Exhibits A and B of the license at http://www.projity.com/license. You should 
use the latest text at http://www.projity.com/license for your modifications.
You may not remove this license text from the source files.]

Attribution Information: Attribution Copyright Notice: Copyright � 2006, 2007 
Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj, 
an open source solution from Projity. Attribution URL: http://www.projity.com 
Graphic Image as provided in the Covered Code as file:  openproj_logo.png with 
alternatives listed on http://www.projity.com/logo

Display of Attribution Information is required in Larger Works which are defined 
in the CPAL as a work which combines Covered Code or portions thereof with code 
not governed by the terms of the CPAL. However, in addition to the other notice 
obligations, all copies of the Covered Code in Executable and Source Code form 
distributed must, as a form of attribution of the original author, include on 
each user interface screen the "OpenProj" logo visible to all users.  The 
OpenProj logo should be located horizontally aligned with the menu bar and left 
justified on the top left of the screen adjacent to the File menu.  The logo 
must be at least 100 x 25 pixels.  When users click on the "OpenProj" logo it 
must direct them back to http://www.projity.com.  
*/
package com.projity.server.data.linker;

import com.projity.grouping.core.Node;
import com.projity.grouping.core.hierarchy.NodeHierarchy;
import com.projity.pm.resource.ResourceImpl;
import com.projity.pm.task.Project;
/**
 *
 */
public abstract class ResourceLinker extends Linker {
	public void initIterator(){
		iterator=((Project)getParent()).getResourcePool().getResourceOutline().iterator();
	}
	public Object executeNext(){
        Node  node=(Node)iterator.next();
        if (!(node.getImpl() instanceof ResourceImpl)) {
			return null;
        }
		
    	ResourceImpl resource=(ResourceImpl)node.getImpl(); //ResourceImpl to have the EnterpriseResource link
    	//if (globalIdsOnly) CommonDataObject.makeGlobal(resource); //modify enterprise resource in fact
    	return resource;
	}
    public NodeHierarchy getHierarchy(){return ((Project)getParent()).getResourcePool().getResourceOutline().getHierarchy();}

}

[Openproj-commitlog] openproj_exchange .project, NONE, 1.1 build.properties, NONE, 1.1 build.xml, NONE, 1.1 .classpath, NONE, 1.1

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31517

Added Files:
	.project build.properties build.xml .classpath 
Log Message:
initial commit of openproj_exchange - which is the source for the mpop.jar - into sourceforge

--- NEW FILE: .project ---
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>openproj_exchange</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: build.xml ---
<project default="dist" basedir=".">
	<property file="build.properties"/>

	<path id="compile.class.path">
		<fileset dir="../openproj_contrib">
			<include name="openproj-contrib.jar" />
			<include name="openproj-script.jar" />
		</fileset>
		<fileset dir="../openproj_contrib/lib/exchange">
			<include name="*.jar" />
			<exclude name="mpop.jar" />
		</fileset>
		<fileset dir="../openproj_core">
			<include name="dist/openproj-core.jar" />
		</fileset>
	</path>

	<target name="prepare">
		<mkdir dir="${build}"/>
	 	<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="../openproj_contrib/ant-lib/ant-contrib.jar"/>
	</target>
	
	<target name="core">
		<ant antfile="../openproj_core/build.xml" target="dist" inheritAll="false"/>
	</target>

	<target name="contrib1">
		<if>
		 <equals arg1="${build_contrib}" arg2="true" />
		 <then>
			<ant antfile="../openproj_contrib/build.xml" target="contrib" inheritAll="false"/>
			<ant antfile="../openproj_contrib/build.xml" target="script" inheritAll="false"/>
			<!--ant antfile="../openproj_contrib/build.xml" target="reports" inheritAll="false"/-->
		</then>
	  </if>
	</target>
	<target name="contrib2">
		<if>
		 <equals arg1="${build_contrib}" arg2="true" />
		 <then>
			<!--ant antfile="../openproj_contrib/build.xml" target="exchange" inheritAll="false"/-->
		</then>
	  </if>
	</target>

	
	<target name="build" depends="prepare,core">
		<javac destdir="${build}"
			classpathref="compile.class.path"
			debug="off"
			nowarn="on"
			source="1.5"
			target="1.5">
				<src path="${src}" />
				<include name="**/*" />
				<exclude name="**/version.properties" />
				<exclude name="test/**" />
		</javac>
	</target>
	
	
	<target name="lib" depends="build">
		<jar jarfile="../openproj_contrib/lib/exchange/mpop.jar">
			<zipfileset dir="${build}" >
				<include name="**/*" />
			</zipfileset>
			<metainf dir="../openproj_build/license">
				<include name="**" />
			</metainf>
		</jar>   
	</target>
	
	<target name="dist" depends="prepare,contrib1,lib,contrib2">
	</target>
	

	<target name="clean">
		<delete dir="${build}"/>
		<delete file="../openproj_contrib/lib/exchange/mpop.jar" />
		<ant antfile="../openproj_core/build.xml" target="clean" inheritAll="false"/>
	</target>

</project>

--- NEW FILE: build.properties ---
src=src
build=build
build_contrib=true
--- 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="var" path="JUNIT_HOME/junit.jar"/>
	<classpathentry combineaccessrules="false" kind="src" path="/openproj_core"/>
	<classpathentry kind="lib" path="/openproj_contrib/openproj-exchange.jar"/>
	<classpathentry kind="output" path="bin"/>
</classpath>

[Openproj-commitlog] openproj_exchange/testdata New Product.xml, NONE, 1.1 New Product.mpp, NONE, 1.1

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/testdata
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31517/testdata

Added Files:
	New Product.xml New Product.mpp 
Log Message:
initial commit of openproj_exchange - which is the source for the mpop.jar - into sourceforge

--- NEW FILE: New Product.xml ---
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Project xmlns="http://schemas.microsoft.com/project">
    <Title>Project1</Title>
    <Manager> </Manager>
    <ScheduleFromStart>1</ScheduleFromStart>
    <StartDate>2001-01-01T08:00:00</StartDate>
    <FinishDate>2001-05-23T17:00:00</FinishDate>
    <FYStartDate>1</FYStartDate>
    <CriticalSlackLimit>0</CriticalSlackLimit>
    <CurrencyDigits>2</CurrencyDigits>
    <CurrencySymbol>$</CurrencySymbol>
    <CurrencySymbolPosition>0</CurrencySymbolPosition>
    <CalendarUID>1</CalendarUID>
    <DefaultStartTime>08:00:00</DefaultStartTime>
    <DefaultFinishTime>17:00:00</DefaultFinishTime>
    <MinutesPerDay>480</MinutesPerDay>
    <MinutesPerWeek>2400</MinutesPerWeek>
    <DaysPerMonth>20</DaysPerMonth>
    <DefaultTaskType>0</DefaultTaskType>
[...12720 lines suppressed...]
            <Delay>0</Delay>
            <OvertimeWork>PT0H0M0S</OvertimeWork>
            <RemainingWork>PT0H0M0S</RemainingWork>
            <Stop>1970-01-01T01:00:00</Stop>
            <Resume>2001-05-23T17:00:00</Resume>
            <Units>1</Units>
            <Work>PT0H0M0S</Work>
            <WorkContour>0</WorkContour>
            <TimephasedData>
                <Type>1</Type>
                <UID>44</UID>
                <Start>2001-05-23T17:00:00</Start>
                <Finish>2001-05-24T17:00:00</Finish>
                <Unit>3</Unit>
                <Value>PT0H0M0S</Value>
            </TimephasedData>
        </Assignment>
    </Assignments>
</Project>


--- NEW FILE: New Product.mpp ---
(This appears to be a binary file; contents omitted.)

[Openproj-commitlog] openproj_exchange/src/com/projity/server - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/com/projity/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/com/projity/server

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/com/projity/server added to the repository

[Openproj-commitlog] openproj_exchange/src/com/projity/exchange - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/com/projity/exchange
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/com/projity/exchange

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/com/projity/exchange added to the repository

[Openproj-commitlog] openproj_exchange/src/test/com/projity - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/test/com/projity
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/test/com/projity

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/test/com/projity added to the repository

[Openproj-commitlog] openproj_exchange/src/test/com/projity/exchange - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/test/com/projity/exchange
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/test/com/projity/exchange

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/test/com/projity/exchange added to the repository

[Openproj-commitlog] openproj_exchange/src/com - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/com
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/com

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/com added to the repository

[Openproj-commitlog] openproj_exchange/src/com/projity/server/data/mspdi - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/com/projity/server/data/mspdi
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/com/projity/server/data/mspdi

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/com/projity/server/data/mspdi added to the repository

[Openproj-commitlog] openproj_exchange/src/com/projity/server/data - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/com/projity/server/data
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/com/projity/server/data

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/com/projity/server/data added to the repository

[Openproj-commitlog] openproj_exchange/src/test/com - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/test/com
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/test/com

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/test/com added to the repository

[Openproj-commitlog] openproj_exchange/src - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src added to the repository

[Openproj-commitlog] openproj_exchange/src/com/projity - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/com/projity
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/com/projity

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/com/projity added to the repository

[Openproj-commitlog] openproj_exchange/src/com/projity/server/data/linker - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/com/projity/server/data/linker
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/com/projity/server/data/linker

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/com/projity/server/data/linker added to the repository

[Openproj-commitlog] openproj_exchange/testdata - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/testdata
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/testdata

Log Message:
Directory /cvsroot/openproj/openproj_exchange/testdata added to the repository

[Openproj-commitlog] openproj_exchange/bin - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/bin
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/bin

Log Message:
Directory /cvsroot/openproj/openproj_exchange/bin added to the repository

[Openproj-commitlog] openproj_exchange/src/test - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange/src/test
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31428/src/test

Log Message:
Directory /cvsroot/openproj/openproj_exchange/src/test added to the repository

[Openproj-commitlog] openproj_exchange - New directory

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_exchange
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31078/openproj_exchange

Log Message:
Directory /cvsroot/openproj/openproj_exchange added to the repository

[Openproj-commitlog] openproj_ui/src/com/projity/dialog/assignment AssignmentEntryPane.java, 1.5, 1.6

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_ui/src/com/projity/dialog/assignment
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14464/src/com/projity/dialog/assignment

Modified Files:
	AssignmentEntryPane.java 
Log Message:
DEF169243: Reverting this change for now per Shane

Index: AssignmentEntryPane.java
===================================================================
RCS file: /cvsroot/openproj/openproj_ui/src/com/projity/dialog/assignment/AssignmentEntryPane.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- AssignmentEntryPane.java	16 Sep 2009 17:27:14 -0000	1.5
+++ AssignmentEntryPane.java	19 Sep 2009 00:05:36 -0000	1.6
@@ -229,11 +229,12 @@
 							}
 						}
 					}
-				} else {
+				} /*DEF169243: Reverting white text for now
+					else {
 					if(this.isRowSelected(row)){
 						component.setForeground(Colors.WHITE);
 					}
-				}
+				}*/
 
 			}
 			return component;

[Openproj-commitlog] openproj_core/src/com/projity/session FileHelper.java, 1.5, 1.6

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_core/src/com/projity/session
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5748/src/com/projity/session

Modified Files:
	FileHelper.java 
Log Message:
DEF164189 - disallowing xml file types (removed the "All Files" filter)

Index: FileHelper.java
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/session/FileHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FileHelper.java	7 Aug 2009 22:06:27 -0000	1.5
+++ FileHelper.java	16 Sep 2009 20:32:54 -0000	1.6
@@ -104,6 +104,9 @@
     			return null;
     		}
     	};
+    	if(Environment.isNoPodServer()){
+    		fileChooser.removeChoosableFileFilter(fileChooser.getAcceptAllFileFilter());
+    	}
     	fileChooser.setFileView(fileView);
 
 
@@ -181,9 +184,10 @@
 			/*if (Environment.getStandAlone())*/ fileChooser.addChoosableFileFilter(projityFilter);
 			fileChooser.addChoosableFileFilter(microsoftFilter);
 //			DEF164189  -- remove xml (and planner) from list of supported file types
+			//uncomment the following filter to allow xml files to be selected
 			//fileChooser.addChoosableFileFilter(microsoftXMLFilter);
 			//fileChooser.addChoosableFileFilter(plannerFilter);
-			fileChooser.addChoosableFileFilter(projectFilter);
+			//fileChooser.addChoosableFileFilter(projectFilter);
 		}
 
 		if (fileChooser.showDialog(fileChooserParent, null)!=JFileChooser.APPROVE_OPTION)

[Openproj-commitlog] openproj_ui/src/com/projity/dialog/assignment AssignmentEntryPane.java, 1.4, 1.5

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_ui/src/com/projity/dialog/assignment
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15499/src/com/projity/dialog/assignment

Modified Files:
	AssignmentEntryPane.java 
Log Message:
DEF169243  Hard to see what was selected when assigning resource to task - selected task has text in white if it is not assigned (just like in the main spreadsheet 	

Index: AssignmentEntryPane.java
===================================================================
RCS file: /cvsroot/openproj/openproj_ui/src/com/projity/dialog/assignment/AssignmentEntryPane.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- AssignmentEntryPane.java	27 Jul 2009 17:07:43 -0000	1.4
+++ AssignmentEntryPane.java	16 Sep 2009 17:27:14 -0000	1.5
@@ -1,51 +1,51 @@
 /*
-The contents of this file are subject to the Common Public Attribution License 
-Version 1.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.projity.com/license . The License is based on the Mozilla Public 
-License Version 1.1 but Sections 14 and 15 have been added to cover use of 
-software over a computer network and provide for limited attribution for the 
-Original Developer. In addition, Exhibit A has been modified to be consistent 
+The contents of this file are subject to the Common Public Attribution License
+Version 1.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.projity.com/license . The License is based on the Mozilla Public
+License Version 1.1 but Sections 14 and 15 have been added to cover use of
+software over a computer network and provide for limited attribution for the
+Original Developer. In addition, Exhibit A has been modified to be consistent
 with Exhibit B.
 
-Software distributed under the License is distributed on an "AS IS" basis, 
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the 
-specific language governing rights and limitations under the License. The 
-Original Code is OpenProj. The Original Developer is the Initial Developer and 
-is Projity, Inc. All portions of the code written by Projity are Copyright (c) 
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
+specific language governing rights and limitations under the License. The
+Original Code is OpenProj. The Original Developer is the Initial Developer and
+is Projity, Inc. All portions of the code written by Projity are Copyright (c)
 2006, 2007. All Rights Reserved. Contributors Projity, Inc.
 
-Alternatively, the contents of this file may be used under the terms of the 
-Projity End-User License Agreeement (the Projity License), in which case the 
-provisions of the Projity License are applicable instead of those above. If you 
-wish to allow use of your version of this file only under the terms of the 
-Projity License and not to allow others to use your version of this file under 
-the CPAL, indicate your decision by deleting the provisions above and replace 
-them with the notice and other provisions required by the Projity  License. If 
-you do not delete the provisions above, a recipient may use your version of this 
+Alternatively, the contents of this file may be used under the terms of the
+Projity End-User License Agreeement (the Projity License), in which case the
+provisions of the Projity License are applicable instead of those above. If you
+wish to allow use of your version of this file only under the terms of the
+Projity License and not to allow others to use your version of this file under
+the CPAL, indicate your decision by deleting the provisions above and replace
+them with the notice and other provisions required by the Projity  License. If
+you do not delete the provisions above, a recipient may use your version of this
 file under either the CPAL or the Projity License.
 
-[NOTE: The text of this license may differ slightly from the text of the notices 
-in Exhibits A and B of the license at http://www.projity.com/license. You should 
+[NOTE: The text of this license may differ slightly from the text of the notices
+in Exhibits A and B of the license at http://www.projity.com/license. You should
 use the latest text at http://www.projity.com/license for your modifications.
 You may not remove this license text from the source files.]
 
-Attribution Information: Attribution Copyright Notice: Copyright © 2006, 2007 
-Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj, 
-an open source solution from Projity. Attribution URL: http://www.projity.com 
-Graphic Image as provided in the Covered Code as file:  openproj_logo.png with 
+Attribution Information: Attribution Copyright Notice: Copyright © 2006, 2007
+Projity, Inc. Attribution Phrase (not exceeding 10 words): Powered by OpenProj,
+an open source solution from Projity. Attribution URL: http://www.projity.com
+Graphic Image as provided in the Covered Code as file:  openproj_logo.png with
 alternatives listed on http://www.projity.com/logo
 
-Display of Attribution Information is required in Larger Works which are defined 
-in the CPAL as a work which combines Covered Code or portions thereof with code 
-not governed by the terms of the CPAL. However, in addition to the other notice 
-obligations, all copies of the Covered Code in Executable and Source Code form 
-distributed must, as a form of attribution of the original author, include on 
-each user interface screen the "OpenProj" logo visible to all users.  The 
-OpenProj logo should be located horizontally aligned with the menu bar and left 
-justified on the top left of the screen adjacent to the File menu.  The logo 
-must be at least 100 x 25 pixels.  When users click on the "OpenProj" logo it 
-must direct them back to http://www.projity.com.  
+Display of Attribution Information is required in Larger Works which are defined
+in the CPAL as a work which combines Covered Code or portions thereof with code
+not governed by the terms of the CPAL. However, in addition to the other notice
+obligations, all copies of the Covered Code in Executable and Source Code form
+distributed must, as a form of attribution of the original author, include on
+each user interface screen the "OpenProj" logo visible to all users.  The
+OpenProj logo should be located horizontally aligned with the menu bar and left
+justified on the top left of the screen adjacent to the File menu.  The logo
+must be at least 100 x 25 pixels.  When users click on the "OpenProj" logo it
+must direct them back to http://www.projity.com.
 */
 package com.projity.dialog.assignment;
 
@@ -105,10 +105,10 @@
 	public static final String spreadsheetCategory="assignmentEntrySpreadsheet";
 	protected NodeModelCache cache;
 	private boolean replace;
-	
+
 	private static final int REQUEST_DEMAND_TYPE_COLUMN = 0; // hidden now
 	private static final int UNITS_COLUMN = REQUEST_DEMAND_TYPE_COLUMN+1;
-	
+
 	class AssignmentSpreadSheet extends SpreadSheet {
 		private static final long serialVersionUID = 1L;
 		ResourceAssigner resourceAssigner;
@@ -125,17 +125,17 @@
 
 		private AssignmentEntry getEntryInRow(int row) {
 			Node node = ((SpreadSheetModel)getModel()).getNode(row).getNode();
-			if (node != null && !node.isVirtual()) 
+			if (node != null && !node.isVirtual())
 				return (AssignmentEntry)node.getImpl();
 			else
 				return null;
 		}
-			
+
 		public void setValueAt(Object aValue, int row, int column) {
 			AssignmentEntry entry = getEntryInRow(row);
 			if (entry == null)
 				return;
-			
+
 			if (!entry.isAssigned()) { // assign it first, then set value
 				if (resourceAssigner != null) {
 					Field field = ((SpreadSheetModel)getModel()).getFieldInColumn(column+1);
@@ -148,7 +148,7 @@
 			}
 			super.setValueAt(aValue,row,column);
 		}
-        
+
 /**
  * Gets selected resources on spreadsheet.
  * @param assignedOnly - if true, only selected resources are returned
@@ -168,7 +168,7 @@
  		public TableCellEditor getCellEditor(int row, int column) {
  			TableCellEditor editor = null;
 			AssignmentEntry entry = getEntryInRow(row);
-			
+
 			if (entry != null) {
 				Field field = ((SpreadSheetModel)getModel()).getFieldInColumn(column+1);
 				if (field == AssignmentEntry.getRateField()) {
@@ -182,11 +182,11 @@
 				editor =  super.getCellEditor(row, column);
 			return editor;
 		}
- 		
+
 		public TableCellRenderer getCellRenderer(int row, int column) {
 			TableCellRenderer renderer = null;
 			AssignmentEntry entry = getEntryInRow(row);
-			
+
 			if (entry != null) {
 				Field field = ((SpreadSheetModel)getModel()).getFieldInColumn(column+1);
 				if (field == AssignmentEntry.getRateField()) {
@@ -200,11 +200,11 @@
 			return renderer;
 		}
 
- 	
+
 	 	int getSelectedCount() {
 	 		return NodeList.nodeListToImplList(getSelectedNodes()).size(); // doesn't count void nodes
 	 	}
-		
+
 			/* (non-Javadoc)
 		 * @see javax.swing.JTable#prepareRenderer(javax.swing.table.TableCellRenderer, int, int)
 		 */
@@ -213,12 +213,12 @@
 			Component component =  super.prepareRenderer(renderer, row, column);
 			AssignmentEntry entry = getEntryInRow(row);
 			component.setForeground(Colors.BLACK);
-			
+
 			if (entry != null) {
 				if (entry.isAssigned()) {
 					if (taskList.size() == entry.getAssignmentCount()) { // if all selected tasks are assigned to this resource, show it green
 						//if (column == 0)
-							component.setBackground(Colors.PALE_GREEN);						
+							component.setBackground(Colors.PALE_GREEN);
 					} else {
 						//if (column == 0)
 							component.setBackground(Colors.PALE_YELLOW);
@@ -228,13 +228,18 @@
 								((JLabel)component).setText(Field.MULTIPLE_VALUES);
 							}
 						}
-					}	
+					}
+				} else {
+					if(this.isRowSelected(row)){
+						component.setForeground(Colors.WHITE);
+					}
 				}
+
 			}
 			return component;
 		}
-		
-		
+
+
         public Component prepareEditor(TableCellEditor editor, int row,
                 int column) {
             dialog.setEditorButtonsVisible(true);
@@ -248,7 +253,7 @@
             dialog.setEditorButtonsVisible(false);
             super.editingStopped(e);
         }
-        
+
         public void doDoubleClick(int row, int col) {
         	if (dialog instanceof AssignmentDialog) {
         		((AssignmentDialog)dialog).assign();
@@ -268,9 +273,9 @@
     }
 
 	protected Closure transformerClosure;
-	
+
 	/**
-	 * 
+	 *
 	 */
 	public AssignmentEntryPane(CommonAssignmentDialog dialog, Project project, ResourceAssigner resourceAssigner, boolean replace,Closure transformerClosure) {
 		super();
@@ -281,7 +286,7 @@
 		//setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
 		this.transformerClosure=transformerClosure;
 	}
-	
+
 	private SpreadSheetFieldArray getFields() {
 		return (SpreadSheetFieldArray) Dictionary.get(spreadsheetCategory,Messages.getString(
 				replace ? "Spreadsheet.AssignmentEntry.replaceResources"
@@ -291,11 +296,11 @@
 		if (project == null)
 			return;
 		ResourcePool pool = project.getResourcePool();
-		
+
 //		if (assignmentModel==null){
 			pool.getResourceOutline().getHierarchy().removeHierarchyListener(this);
 			pool.getResourceOutline().getHierarchy().addHierarchyListener(this);
-	
+
 			assignmentModel = NodeModelFactory.getInstance().replicate(pool.getResourceOutline(),new NodeFactoryTransformer());
 			assignmentModel.getHierarchy().setNbEndVoidNodes(0); // don't allow blank lines
 //		}
@@ -305,12 +310,12 @@
 			spreadSheet.setActions(new String[]{});
 
 		}
-		
-		
+
+
 		cache=NodeModelCacheFactory.getInstance().createDefaultCache(assignmentModel,pool,NodeModelCache.ASSIGNMENT_TYPE,"AssignmentEntry",transformerClosure);
 		SpreadSheetFieldArray fields=getFields();
 		spreadSheet.setCache(cache,fields,fields.getCellStyle(),fields.getActionList());
-		
+
 		// set widths of these columns explicitly
 		if (!replace) { //TODO width should come from definition in xml, not hard coded here
 //			spreadSheet.getColumnModel().getColumn(REQUEST_DEMAND_TYPE_COLUMN).setPreferredWidth(50);
@@ -320,26 +325,26 @@
 		JViewport viewport = createViewport();
 		viewport.setView(spreadSheet);
 		setViewport(viewport);
-		
+
 		setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		
+
 		Dimension d=spreadSheet.getPreferredSize();
 		Dimension enclosing=new Dimension();
-		
+
 		//big awful hack to remove
 		GraphicConfiguration config=GraphicConfiguration.getInstance();
 		int rowHeaderWidth=config.getRowHeaderWidth() + spreadSheet.getRowMargin()*2; //should be rowHeader's one
-		
+
 //		TableColumnModel tm=spreadSheet.getColumnModel();
 //		int w=tm.getTotalColumnWidth();
-		
+
 		enclosing.setSize(d.getWidth()/*+rowHeaderWidth*/,d.getHeight());
 		viewport.setPreferredSize(enclosing);
-		
+
 		//setBorder(new EmptyBorder(0,0,0,0));
 		updateTable();
 	}
-	
+
 	/**
 	 * @param project The project to set.
 	 */
@@ -347,7 +352,7 @@
 		this.project = project;
 		init();
 	}
-	
+
 /**
  * Functor to call setAssignmentsFromTaskList
  */	private class AssignmentEntrySetter implements Closure {
@@ -355,7 +360,7 @@
 		AssignmentEntrySetter(List taskList) {
 			this.taskList = taskList;
 		}
-		
+
 
 		/* (non-Javadoc)
 		 * @see org.apache.commons.collections.Closure#execute(java.lang.Object)
@@ -364,7 +369,7 @@
 			AssignmentEntry entry = (AssignmentEntry)(((Node)arg0).getImpl());
 			entry.setAssignmentsFromTaskList(taskList);
 		}
-		
+
 	}
 
 /**
@@ -373,7 +378,7 @@
  */	void setSelectedTasks(List taskList) {
  		this.taskList = taskList;
 		updateTable();
-		// disable ss if no tasks selected. 
+		// disable ss if no tasks selected.
 		boolean enabled = !taskList.isEmpty();
 		spreadSheet.setEnabled(enabled);
 		spreadSheet.getRowHeader().setEnabled(enabled);
@@ -384,7 +389,7 @@
  		return spreadSheet.getSelectedResources(assignedOnly);
  	}
 
- 	
+
  	int getSelectedCount(){
  		return spreadSheet.getSelectedCount();
  	}
@@ -394,19 +399,19 @@
  		((SpreadSheetModel)spreadSheet.getModel()).getCache().update();
  		((SpreadSheetModel)spreadSheet.getModel()).fireTableDataChanged(); // redraw it
  	}
- 	
- 	
- 	
- 	
+
+
+
+
     public AssignmentSpreadSheet getSpreadSheet() {
         return spreadSheet;
     }
 
-    
+
 
 	public void nodesChanged(HierarchyEvent e) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	public void nodesInserted(HierarchyEvent e) {
@@ -419,6 +424,6 @@
 
 	public void structureChanged(HierarchyEvent e) {
 		// TODO Auto-generated method stub
-		
+
 	}
 }

[Openproj-commitlog] openproj_ui/src/com/projity/dialog ResourceMappingDialog.java, 1.5, 1.6

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_ui/src/com/projity/dialog
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19439/src/com/projity/dialog

Modified Files:
	ResourceMappingDialog.java 
Log Message:
DEF158614: 	Projity: Remove/redirect Help button from popup windows
 Help for Resource Mapping Dialog

Index: ResourceMappingDialog.java
===================================================================
RCS file: /cvsroot/openproj/openproj_ui/src/com/projity/dialog/ResourceMappingDialog.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ResourceMappingDialog.java	4 Jun 2009 21:58:17 -0000	1.5
+++ ResourceMappingDialog.java	14 Sep 2009 21:18:16 -0000	1.6
@@ -100,7 +100,7 @@
 	private ResourceMappingDialog(ResourceMappingForm form) {
 		super(form.getOwner(), Messages.getString("ResourceMappingDialog.ResourceMerging"), true); //$NON-NLS-1$
 		this.form = form;
-		addDocHelp("Merge_Dialog");
+		addDocHelp("Resource_Mapping_Dialog");
 	}
 
 
@@ -122,7 +122,7 @@
 //		field1=new JComboBox(form.getMergeFields());
 //		field1.setSelectedItem(form.getMergeField());
 		field1=new JComboBox();
-		
+
 		field1.addActionListener(new ActionListener(){
 			public void actionPerformed(ActionEvent e) {
 				form.setMergeField((ResourceMappingForm.MergeField)field1.getSelectedItem());

[Openproj-commitlog] openproj_ui/src/com/projity/pm/graphic/spreadsheet/renderer NumberRenderer.java, 1.1, 1.2

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_ui/src/com/projity/pm/graphic/spreadsheet/renderer
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16888/src/com/projity/pm/graphic/spreadsheet/renderer

Modified Files:
	NumberRenderer.java 
Log Message:
DEF167978: 	Projity: Task Plan Print/Print Prev drops Predecessors & Resource Names data - tv:  could not set value to null if table was null because this caused cell values to show blank in print preview/print

Index: NumberRenderer.java
===================================================================
RCS file: /cvsroot/openproj/openproj_ui/src/com/projity/pm/graphic/spreadsheet/renderer/NumberRenderer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NumberRenderer.java	30 Jun 2009 03:44:05 -0000	1.1
+++ NumberRenderer.java	14 Sep 2009 20:44:04 -0000	1.2
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package com.projity.pm.graphic.spreadsheet.renderer;
 
@@ -13,48 +13,53 @@
 
 import com.projity.field.FieldConverter;
 import com.projity.pm.graphic.spreadsheet.common.CommonSpreadSheetModel;
+import com.projity.util.Environment;
 
 /**
  * @author avigil
  *
  */
 public class NumberRenderer extends SimpleRenderer {
-	
+
 		private NumberFormat integerFormatter = NumberFormat.getIntegerInstance();
 		private DecimalFormat decimalFormatter = new DecimalFormat();
 
 		public NumberRenderer() {
-			super(); 
-			
+			super();
+
 			integerFormatter.setGroupingUsed(true);
 			decimalFormatter.setGroupingUsed(true);
 		}
 		public NumberRenderer(boolean compact) {
 			super(compact);
-			
+
 			integerFormatter.setGroupingUsed(true);
 			decimalFormatter.setGroupingUsed(true);
 		}
-		
+
 		/**
 		 * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int)
 		 */
 		public Component getTableCellRendererComponent(JTable table, Object value,
 				boolean isSelected, boolean hasFocus, int row, int column) {
-			
+
 //			 TODO Auto-generated method stub
 			JLabel component;
-			if (table==null){
-				setValue(null);
-				component=this;
+			if(table==null){
+				if(Environment.isNoPodServer()){
+					return super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+				} else {
+					setValue(null);
+					component=this;
+				}
 			}
 			else{
 				component=(JLabel)super.getTableCellRendererComponent(table, value, isSelected,hasFocus, row, column);
 				CommonSpreadSheetModel model=(CommonSpreadSheetModel)table.getModel();
 			    FontManager.setComponentFont(model.getCellProperties(model.getNode(row)),component);
 			}
-					
-			
+
+
 			if (value!=null){
 				if(value instanceof Double) {
 					component.setText(decimalFormatter.format((Double)value));
@@ -62,9 +67,8 @@
 					component.setText(integerFormatter.format((Integer)value));
 				}
 			}
- 
+
 			component.setHorizontalAlignment(SwingConstants.RIGHT);
 			return component;
 		}
-
 }

[Openproj-commitlog] openproj_core/src/com/projity/configuration view.xml, 1.21, 1.22

[Anthony V. <av...@us...>]

Update of /cvsroot/openproj/openproj_core/src/com/projity/configuration
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31607/src/com/projity/configuration

Modified Files:
	view.xml 
Log Message:
tv:  removed "My Tasks" filter since it was not filtering anything

Index: view.xml
===================================================================
RCS file: /cvsroot/openproj/openproj_core/src/com/projity/configuration/view.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- view.xml	29 Jun 2009 19:06:50 -0000	1.21
+++ view.xml	14 Sep 2009 18:12:20 -0000	1.22
@@ -71,7 +71,7 @@
 		<format id="Bar.late"  row="1" layer="1" intervalGenerator="com.projity.pm.graphic.gantt.GanttBarIntervalGenerator"  from="Field.start" to="Field.finish">
 			<middle shapeName="FULL_HEIGHT" colorName="PURPLE" paintName="DEFAULT" strokeName="FRAMED"/>
 		</format>
--->		
+-->
 		<format id="Bar.assignment" row="1" layer="1" intervalGenerator="com.projity.pm.graphic.gantt.GanttBarIntervalGenerator"  from="Field.start" to="Field.finish">
 			<middle shapeName="HALF_HEIGHT_CENTER" colorName="ORANGE" paintName="DEFAULT" strokeName="FRAMED"/>
 		</format>
@@ -289,7 +289,7 @@
 			<style id="Styles.Bar.Row.critical" formatId="Bar.critical" formulaClass="com.projity.scripting.formulas.CriticalTaskFormula"/>
 <!--
 			<style id="Styles.Bar.Row.late" name="late" formatId="Bar.late" type="task" formulaText="task.getBaselineDuration(0) != 0 &amp;&amp; task.durationMillis > 1.1 *task.getBaselineDuration(0)" />
--->		
+-->
 			<style id="Styles.Bar.Row.summary" formatId="Bar.summary" formulaClass="com.projity.scripting.formulas.SummaryTaskFormula"/>
 			<style id="Styles.Bar.Row.milestone" formatId="Bar.milestone" formulaClass="com.projity.scripting.formulas.MilestoneTaskFormula"/>
 			<style id="Styles.Bar.Row.deadline" formatId="Bar.deadline" formulaClass="com.projity.scripting.formulas.DeadlineTaskFormula"/>
@@ -969,7 +969,7 @@
 	<views>
 		<view id="View.Gantt">
 			<transform
-				filters="Filter.None,Filter.MyTasks,Filter.DateRange,Filter.CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasks,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks,Filter.StartingWithinWeek,Filter.StartingWithinTwoWeeks,Field.externallyVisible"
+				filters="Filter.None,Filter.DateRange,Filter.CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasks,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks,Filter.StartingWithinWeek,Filter.StartingWithinTwoWeeks,Field.externallyVisible"
 				sorters="Sorter.None,Sorter.Name,Sorter.DurationThenCost,Sorter.StartDate,Sorter.FinishDate,Sorter.Duration,Sorter.Cost,Sorter.CostOverbudget,Sorter.CompleteIncomplete,Sorter.Critical,Field.priority"
 				groupers="Grouper.None,Grouper.CriticalThenDuration,Grouper.CompleteIncomplete,Grouper.Critical,Grouper.Duration,Grouper.ResourceNames"
 				>
@@ -978,7 +978,7 @@
 		</view>
 		<view id="View.OfflineGantt">
 			<transform
-				filters="Filter.None,Filter.MyTasks,Filter.DateRange,Filter.CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasks,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks,Filter.StartingWithinWeek,Filter.StartingWithinTwoWeeks,Field.externallyVisible"
+				filters="Filter.None,Filter.DateRange,Filter.CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasks,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks,Filter.StartingWithinWeek,Filter.StartingWithinTwoWeeks,Field.externallyVisible"
 				sorters="Sorter.None,Sorter.Name,Sorter.DurationThenCost,Sorter.StartDate,Sorter.FinishDate,Sorter.Duration,Sorter.Cost,Sorter.CostOverbudget,Sorter.CompleteIncomplete,Sorter.Critical,Field.priority"
 				groupers="Grouper.None,Grouper.CriticalThenDuration,Grouper.CompleteIncomplete,Grouper.Critical,Grouper.Duration,Grouper.ResourceNames"
 				>
@@ -1031,7 +1031,7 @@
 		</view>
 		<view id="View.Network">
 			<transform
-				filters="Filter.None,Filter.MyTasks,Filter.CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasksOrMilestones,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks,Filter.StartingWithinWeek,Filter.StartingWithinTwoWeeks"
+				filters="Filter.None,Filter.CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasksOrMilestones,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks,Filter.StartingWithinWeek,Filter.StartingWithinTwoWeeks"
 				sorters="Sorter.None,Sorter.Name,Sorter.DurationThenCost,Sorter.StartDate,Sorter.FinishDate,Sorter.Duration,Sorter.Cost,Sorter.CostOverbudget,Sorter.CompleteIncomplete,Sorter.Critical,Field.priority"
 				groupers="Grouper.None"
 				>
@@ -1058,7 +1058,7 @@
 		</view>
 		<view id="View.TaskUsageDetail">
 			<transform
-				filters="Filter.None,Filter.,Filter.MyTasks,CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasks,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks,Filter.StartingWithinWeek,Filter.StartingWithinTwoWeeks"
+				filters="Filter.None,Filter.,CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasks,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks,Filter.StartingWithinWeek,Filter.StartingWithinTwoWeeks"
 				sorters="Sorter.None,Sorter.Name,Sorter.DurationThenCost,Sorter.StartDate,Sorter.FinishDate,Sorter.Duration,Sorter.Cost,Sorter.CostOverbudget,Sorter.CompleteIncomplete,Sorter.Critical,Field.priority"
 				groupers="Grouper.None,Grouper.CriticalThenDuration,Grouper.CompleteIncomplete,Grouper.Critical,Grouper.Duration"
 				>
@@ -1123,7 +1123,7 @@
 		</view>
 		<view id="View.TaskReport">
 			<transform
-				filters="Filter.None,Filter.MyTasks,Filter.DateRange,Filter.CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasks,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks"
+				filters="Filter.None,Filter.DateRange,Filter.CompletedTasks,Filter.CostOverbudgetTasks,Filter.CriticalTasks,Filter.InProgressTasks,Filter.IncompleteTasks,Filter.LateOrOverbudgetTasks,Filter.NormalTasks,Filter.Milestones,Filter.SlippedTasks,Filter.SummaryTasks,Filter.Flag1,Filter.Flag2,Filter.Flag3,Filter.TasksWithEstimatedDurations,Filter.UnstartedTasks"
 				sorters="Sorter.None,Sorter.Name,Sorter.DurationThenCost,Sorter.StartDate,Sorter.FinishDate,Sorter.Duration,Sorter.Cost,Sorter.CostOverbudget,Sorter.CompleteIncomplete,Sorter.Critical"
 				groupers="Grouper.None,Grouper.CriticalThenDuration,Grouper.CompleteIncomplete,Grouper.Critical,Grouper.Duration"
 				>