diff --git a/projectlibre_build/build.properties b/projectlibre_build/build.properties index 8f39313..e089db6 100644 --- a/projectlibre_build/build.properties +++ b/projectlibre_build/build.properties @@ -27,19 +27,19 @@ macapp=ProjectLibre.app wixbuild=projectlibre_wix -version_name=1.9.0 -version=1.9.0 +version_name=1.9.1 +version=1.9.1 #windows -numericVersion3=1.9.0 +numericVersion3=1.9.1 #mac -numericVersion4=1.9.0.0 +numericVersion4=1.9.1.0 #Linux -rpm_version=1.9.0 +rpm_version=1.9.1 rpm_revision=1 -deb_version=1.9.0 +deb_version=1.9.1 deb_revision=1 #rpm_builds=redhat,suse,mageia diff --git a/projectlibre_build/build.xml b/projectlibre_build/build.xml index 7c74def..5aedd24 100644 --- a/projectlibre_build/build.xml +++ b/projectlibre_build/build.xml @@ -492,6 +492,7 @@ + diff --git a/projectlibre_build/resources/projectlibre b/projectlibre_build/resources/projectlibre index c4ddbb2..9f38901 100755 --- a/projectlibre_build/resources/projectlibre +++ b/projectlibre_build/resources/projectlibre @@ -65,7 +65,7 @@ JAVA_INSTALL_DIR2="/usr/lib/jvm" JAVA_INSTALL_DIR_EXE2="bin/java" JAVA_INSTALL_DIR3="/opt/ibm" JAVA_INSTALL_DIR_EXE3="jre/bin/java" -MIN_JAVA_VERSION="1.6" +MIN_JAVA_VERSION="6" #Default conf values JAVA_EXE="java" @@ -131,7 +131,23 @@ check_java() { "$JAVA_EXE" -version > "$VERSION_FILE" 2>&1 || rm -f "$VERSION_FILE" if [ -r "$VERSION_FILE" ]; then - JAVA_VERSION=`cat "$VERSION_FILE" | awk '/^(java|openjdk) version/ { print substr($3, 2, length($3)-2); }'` + local JAVA_VERSION + local IFS=$'\n' + local lines=`cat "$VERSION_FILE" | tr '\r' '\n'` + + for line in $lines; do + if [[ -z $JAVA_VERSION && $line = *"version \""* ]] + then + local version=$(echo $line | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q') + if [[ $version = "1."* ]] + then + JAVA_VERSION=$(echo $version | sed -e 's/1\.\([0-9]*\)\(.*\)/\1/; 1q') + else + JAVA_VERSION=$(echo $version | sed -e 's/\([0-9]*\)\(.*\)/\1/; 1q') + fi + fi + done + if [ "x$OS_NAME" = "xSunOS" ]; then echo " Java version: $JAVA_VERSION \c" else @@ -140,9 +156,6 @@ check_java() { #Comparable format - MIN_JAVA_VERSION=`echo "$MIN_JAVA_VERSION" | sed -e 's;\.;0;g'` - JAVA_VERSION=`echo "$JAVA_VERSION" | awk '{ print substr($1, 1, 3); }' | sed -e 's;\.;0;g'` - if [ "$JAVA_VERSION" ]; then if [ "$JAVA_VERSION" -ge "$MIN_JAVA_VERSION" ]; then echo "OK" @@ -163,7 +176,7 @@ check_java() { create_run_conf JAVA_OK="1" else - echo "NOK, version < 1.6" + echo "NOK, version < $MIN_JAVA_VERSION" fi else echo "NOK" @@ -334,4 +347,3 @@ if [ "$JAVA_OK" -eq "0" ]; then fi - diff --git a/projectlibre_build/resources/projectlibre.sh b/projectlibre_build/resources/projectlibre.sh index 9edee89..babfd31 100755 --- a/projectlibre_build/resources/projectlibre.sh +++ b/projectlibre_build/resources/projectlibre.sh @@ -1,4 +1,5 @@ #!/bin/bash + #******************************************************************************* # 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 @@ -64,7 +65,7 @@ JAVA_INSTALL_DIR2="/usr/lib/jvm" JAVA_INSTALL_DIR_EXE2="bin/java" JAVA_INSTALL_DIR3="/opt/ibm" JAVA_INSTALL_DIR_EXE3="jre/bin/java" -MIN_JAVA_VERSION="1.6" +MIN_JAVA_VERSION="6" #Default conf values JAVA_EXE="java" @@ -119,7 +120,23 @@ check_java() { "$JAVA_EXE" -version > "$VERSION_FILE" 2>&1 || rm -f "$VERSION_FILE" if [ -r "$VERSION_FILE" ]; then - JAVA_VERSION=`cat "$VERSION_FILE" | awk '/^(java|openjdk) version/ { print substr($3, 2, length($3)-2); }'` + local JAVA_VERSION + local IFS=$'\n' + local lines=`cat "$VERSION_FILE" | tr '\r' '\n'` + + for line in $lines; do + if [[ -z $JAVA_VERSION && $line = *"version \""* ]] + then + local version=$(echo $line | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q') + if [[ $version = "1."* ]] + then + JAVA_VERSION=$(echo $version | sed -e 's/1\.\([0-9]*\)\(.*\)/\1/; 1q') + else + JAVA_VERSION=$(echo $version | sed -e 's/\([0-9]*\)\(.*\)/\1/; 1q') + fi + fi + done + if [ "x$OS_NAME" = "xSunOS" ]; then echo " Java version: $JAVA_VERSION \c" else @@ -128,9 +145,6 @@ check_java() { #Comparable format - MIN_JAVA_VERSION=`echo "$MIN_JAVA_VERSION" | sed -e 's;\.;0;g'` - JAVA_VERSION=`echo "$JAVA_VERSION" | awk '{ print substr($1, 1, 3); }' | sed -e 's;\.;0;g'` - if [ "$JAVA_VERSION" ]; then if [ "$JAVA_VERSION" -ge "$MIN_JAVA_VERSION" ]; then echo "OK" @@ -151,7 +165,7 @@ check_java() { create_run_conf JAVA_OK="1" else - echo "NOK, version < 1.6" + echo "NOK, version < $MIN_JAVA_VERSION" fi else echo "NOK" diff --git a/projectlibre_contrib/build.xml b/projectlibre_contrib/build.xml index 95fd43f..14535b9 100644 --- a/projectlibre_contrib/build.xml +++ b/projectlibre_contrib/build.xml @@ -154,6 +154,10 @@ + + + + diff --git a/projectlibre_contrib/projectlibre_exchange.conf b/projectlibre_contrib/projectlibre_exchange.conf index f763a2c..e620cc3 100644 --- a/projectlibre_contrib/projectlibre_exchange.conf +++ b/projectlibre_contrib/projectlibre_exchange.conf @@ -2,6 +2,13 @@ -injars lib/exchange/jakarta-poi.jar -injars lib/exchange/commons-collections4.jar -injars lib/exchange/rtfparserkit.jar + +#JAXB libraries missing in JDK11 +-injars lib/exchange/javax.activation-api.jar +-injars lib/exchange/jaxb-api.jar +-injars lib/exchange/jaxb-core.jar +-injars lib/exchange/jaxb-impl.jar + #-injars lib/exchange/mpxj.jar(!META-INF/**) -outjars tmp/projectlibre-exchange.jar @@ -45,3 +52,8 @@ } +-keep public class javax.xml.**{ + public *; +} + + diff --git a/projectlibre_exchange/.classpath b/projectlibre_exchange/.classpath index 4d2442e..6130770 100644 --- a/projectlibre_exchange/.classpath +++ b/projectlibre_exchange/.classpath @@ -10,5 +10,10 @@ + + + + + diff --git a/projectlibre_reports/src/com/projectlibre1/reports/adapter/ReportUtil.java b/projectlibre_reports/src/com/projectlibre1/reports/adapter/ReportUtil.java index 8d08f52..5a31cd2 100644 --- a/projectlibre_reports/src/com/projectlibre1/reports/adapter/ReportUtil.java +++ b/projectlibre_reports/src/com/projectlibre1/reports/adapter/ReportUtil.java @@ -75,7 +75,7 @@ import com.projectlibre1.util.ClassLoaderUtils; * */ public class ReportUtil { - private static final String REPORT_ROOT = "com.projectlibre1/reports/definition/"; + private static final String REPORT_ROOT = "com/projectlibre1/reports/definition/"; /* * diff --git a/projectlibre_ui/src/com/projectlibre1/dialog/PODOnlyFeature.java b/projectlibre_ui/src/com/projectlibre1/dialog/PODOnlyFeature.java deleted file mode 100644 index 6a503fe..0000000 --- a/projectlibre_ui/src/com/projectlibre1/dialog/PODOnlyFeature.java +++ /dev/null @@ -1,116 +0,0 @@ -/******************************************************************************* - * 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.projectlibre.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 ProjectLibre. The Original Developer is the Initial Developer - * and is ProjectLibre Inc. All portions of the code written by ProjectLibre are - * Copyright (c) 2012-2019. All Rights Reserved. All portions of the code written by - * ProjectLibre are Copyright (c) 2012-2019. All Rights Reserved. Contributor - * ProjectLibre, Inc. - * - * Alternatively, the contents of this file may be used under the terms of the - * ProjectLibre End-User License Agreement (the ProjectLibre License) in which case - * the provisions of the ProjectLibre 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 - * ProjectLibre 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 ProjectLibre - * License. If you do not delete the provisions above, a recipient may use your - * version of this file under either the CPAL or the ProjectLibre Licenses. - * - * - * [NOTE: The text of this Exhibit A may differ slightly from the text of the notices - * in the Source Code files of the Original Code. You should use the text of this - * Exhibit A rather than the text found in the Original Code Source Code for Your - * Modifications.] - * - * EXHIBIT B. Attribution Information for ProjectLibre required - * - * Attribution Copyright Notice: Copyright (c) 2012-2019, ProjectLibre, Inc. - * Attribution Phrase (not exceeding 10 words): - * ProjectLibre, open source project management software. - * Attribution URL: http://www.projectlibre.com - * Graphic Image as provided in the Covered Code as file: projectlibre-logo.png with - * alternatives listed on http://www.projectlibre.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 "ProjectLibre" logo visible to all users. - * The ProjectLibre 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 144 x 31 pixels. When users click on the "ProjectLibre" - * logo it must direct them back to http://www.projectlibre.com. - *******************************************************************************/ -package com.projectlibre1.dialog; - -import java.awt.Frame; - -import javax.swing.JComponent; -import javax.swing.JEditorPane; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; -import javax.swing.text.StyleConstants.ColorConstants; - -import com.jgoodies.forms.builder.DefaultFormBuilder; -import com.jgoodies.forms.layout.FormLayout; -import com.projectlibre1.pm.graphic.frames.GraphicManager; -import com.projectlibre1.graphic.configuration.shape.Colors; -import com.projectlibre1.strings.Messages; -import com.projectlibre1.util.BrowserControl; - -public final class PODOnlyFeature extends AbstractDialog { - private static final long serialVersionUID = 1L; - public static void doDialog(Frame parent) { - new PODOnlyFeature(parent).doModal(); - } - - private PODOnlyFeature(Frame parent) { - super(parent, Messages.getString("Open_Title.ProjectLibreWarning"), true); //$NON-NLS-1$ //$NON-NLS-2$ - } - - - - public JComponent createContentPanel() { - FormLayout layout = new FormLayout("250px" , "100px");// rows,cols //$NON-NLS-1$ - DefaultFormBuilder builder = new DefaultFormBuilder(layout); - builder.setDefaultDialogBorder(); - String tip = Messages.getString("Text.notAvailableInProjectLibre"); - JEditorPane link = new JEditorPane("text/html",tip); - link.setEditable(false); - link.setForeground(Colors.GRAY); - link.setFont(this.getFont()); - - link.setBackground(getBackground()); - - link.addHyperlinkListener(new HyperlinkListener(){ - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType()== HyperlinkEvent.EventType.ACTIVATED) - BrowserControl.displayURL(e.getURL().toExternalForm()); - }}); - - builder.append(link); - return builder.getPanel(); - } - - protected boolean hasCloseButton() { - return true; - } - - protected boolean hasOkAndCancelButtons() { - return false; - } - - -} diff --git a/projectlibre_ui/src/com/projectlibre1/dialog/TryPODDialog.java b/projectlibre_ui/src/com/projectlibre1/dialog/TryPODDialog.java deleted file mode 100644 index cb66e13..0000000 --- a/projectlibre_ui/src/com/projectlibre1/dialog/TryPODDialog.java +++ /dev/null @@ -1,126 +0,0 @@ -/******************************************************************************* - * 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.projectlibre.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 ProjectLibre. The Original Developer is the Initial Developer - * and is ProjectLibre Inc. All portions of the code written by ProjectLibre are - * Copyright (c) 2012-2019. All Rights Reserved. All portions of the code written by - * ProjectLibre are Copyright (c) 2012-2019. All Rights Reserved. Contributor - * ProjectLibre, Inc. - * - * Alternatively, the contents of this file may be used under the terms of the - * ProjectLibre End-User License Agreement (the ProjectLibre License) in which case - * the provisions of the ProjectLibre 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 - * ProjectLibre 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 ProjectLibre - * License. If you do not delete the provisions above, a recipient may use your - * version of this file under either the CPAL or the ProjectLibre Licenses. - * - * - * [NOTE: The text of this Exhibit A may differ slightly from the text of the notices - * in the Source Code files of the Original Code. You should use the text of this - * Exhibit A rather than the text found in the Original Code Source Code for Your - * Modifications.] - * - * EXHIBIT B. Attribution Information for ProjectLibre required - * - * Attribution Copyright Notice: Copyright (c) 2012-2019, ProjectLibre, Inc. - * Attribution Phrase (not exceeding 10 words): - * ProjectLibre, open source project management software. - * Attribution URL: http://www.projectlibre.com - * Graphic Image as provided in the Covered Code as file: projectlibre-logo.png with - * alternatives listed on http://www.projectlibre.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 "ProjectLibre" logo visible to all users. - * The ProjectLibre 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 144 x 31 pixels. When users click on the "ProjectLibre" - * logo it must direct them back to http://www.projectlibre.com. - *******************************************************************************/ -package com.projectlibre1.dialog; - -import java.awt.Frame; - -import javax.swing.JComponent; -import javax.swing.JEditorPane; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; - -import com.jgoodies.forms.builder.DefaultFormBuilder; -import com.jgoodies.forms.layout.FormLayout; -import com.projectlibre1.main.Main; -import com.projectlibre1.strings.Messages; -import com.projectlibre1.util.BrowserControl; - -public final class TryPODDialog extends AbstractDialog { - private static final long serialVersionUID = 1L; - private static final String PROJECTLIBRE_LINK = "http://www.projectlibre.com"; - - public static void maybeShow(Frame owner,boolean force) { -// int runNumber = Main.getRunNumber(); -// boolean show=false; -// String[] runs = Messages.getString("TryPODDialog.show").split(","); -// for (String s:runs) { -// if (Integer.parseInt(s) == runNumber) { -// show = true; -// break; -// } -// } -// int showEvery = Integer.parseInt(Messages.getString("TryPODDialog.showEvery")); -// int showEveryStagger = Integer.parseInt(Messages.getString("TryPODDialog.showEveryStagger")); -// if ((runNumber -showEveryStagger) % showEvery == 0) { -// show = true; -// } -// if (show || force) -// new TryPODDialog(owner).doModal(); - } - - - private TryPODDialog(Frame owner) { - super(owner, Messages.getString("Text.tryPODTitle"), true); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public JComponent createContentPanel() { - FormLayout layout = new FormLayout("300px" , "110px");// rows,cols //$NON-NLS-1$ - DefaultFormBuilder builder = new DefaultFormBuilder(layout); - builder.setDefaultDialogBorder(); - String tip = Messages.getString("tip.3.description"); - tip = tip.replace(PROJECTLIBRE_LINK,"" + PROJECTLIBRE_LINK + ""); - JEditorPane link = new JEditorPane("text/html","" - + tip+""); - link.setEditable(false); - link.setBackground(getBackground()); - link.addHyperlinkListener(new HyperlinkListener(){ - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType()== HyperlinkEvent.EventType.ACTIVATED) - BrowserControl.displayURL(e.getURL().toExternalForm()); - }}); - - builder.append(link); - return builder.getPanel(); - } - protected boolean hasCloseButton() { - return true; - } - - protected boolean hasOkAndCancelButtons() { - return false; - } - -} diff --git a/projectlibre_ui/src/com/projectlibre1/pm/graphic/frames/GraphicManager.java b/projectlibre_ui/src/com/projectlibre1/pm/graphic/frames/GraphicManager.java index 3778551..d18ec2e 100644 --- a/projectlibre_ui/src/com/projectlibre1/pm/graphic/frames/GraphicManager.java +++ b/projectlibre_ui/src/com/projectlibre1/pm/graphic/frames/GraphicManager.java @@ -61,7 +61,6 @@ import java.awt.Component; import java.awt.Container; import java.awt.Cursor; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.Frame; import java.awt.GridLayout; import java.awt.HeadlessException; @@ -70,10 +69,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import java.awt.event.WindowEvent; import java.awt.event.WindowStateListener; import java.beans.XMLDecoder; @@ -128,20 +124,15 @@ import org.apache.batik.util.gui.resource.ActionMap; import org.apache.batik.util.gui.resource.MissingListenerException; import org.apache.commons.collections.Closure; import org.pushingpixels.flamingo.api.common.AbstractCommandButton; -import org.pushingpixels.flamingo.api.common.JCommandButton; -import org.pushingpixels.flamingo.api.common.icon.ResizableIcon; import org.pushingpixels.flamingo.api.ribbon.JRibbon; -import org.pushingpixels.flamingo.api.ribbon.JRibbonBand; -import org.pushingpixels.flamingo.api.ribbon.JRibbonComponent; import org.pushingpixels.flamingo.api.ribbon.JRibbonFrame; import org.pushingpixels.flamingo.api.ribbon.RibbonApplicationMenu; -import org.pushingpixels.flamingo.api.ribbon.RibbonApplicationMenuEntryPrimary; import org.pushingpixels.flamingo.api.ribbon.RibbonTask; -import apple.dts.samplecode.osxadapter.OSXAdapter; - import com.projectlibre.ui.ribbon.CustomRibbonBandGenerator; import com.projectlibre.ui.ribbon.ProjectLibreRibbonUI; +import com.projectlibre1.configuration.Configuration; +import com.projectlibre1.configuration.FieldDictionary; import com.projectlibre1.contrib.ClassLoaderUtils; import com.projectlibre1.dialog.AboutDialog; import com.projectlibre1.dialog.AbstractDialog; @@ -149,7 +140,6 @@ import com.projectlibre1.dialog.BaselineDialog; import com.projectlibre1.dialog.FindDialog; import com.projectlibre1.dialog.HelpDialog; import com.projectlibre1.dialog.OpenProjectDialog; -import com.projectlibre1.dialog.PODOnlyFeature; import com.projectlibre1.dialog.ProjectDialog; import com.projectlibre1.dialog.ProjectInformationDialog; import com.projectlibre1.dialog.RenameProjectDialog; @@ -160,9 +150,26 @@ import com.projectlibre1.dialog.TipOfTheDay; import com.projectlibre1.dialog.WelcomeDialog; import com.projectlibre1.dialog.assignment.AssignmentDialog; import com.projectlibre1.dialog.options.CalendarDialogBox; +import com.projectlibre1.document.Document; +import com.projectlibre1.document.ObjectEvent; +import com.projectlibre1.exchange.ResourceMappingForm; +import com.projectlibre1.field.Field; +import com.projectlibre1.graphic.configuration.SpreadSheetFieldArray; +import com.projectlibre1.grouping.core.Node; +import com.projectlibre1.grouping.core.VoidNodeImpl; +import com.projectlibre1.grouping.core.model.NodeModel; +import com.projectlibre1.grouping.core.transform.ViewTransformer; +import com.projectlibre1.grouping.core.transform.filtering.NodeFilter; +import com.projectlibre1.grouping.core.transform.filtering.ResourceInTeamFilter; +import com.projectlibre1.job.Job; +import com.projectlibre1.job.JobQueue; +import com.projectlibre1.job.JobRunnable; +import com.projectlibre1.job.Mutex; import com.projectlibre1.menu.MenuActionConstants; import com.projectlibre1.menu.MenuActionsMap; import com.projectlibre1.menu.MenuManager; +import com.projectlibre1.options.CalendarOption; +import com.projectlibre1.pm.assignment.Assignment; import com.projectlibre1.pm.graphic.IconManager; import com.projectlibre1.pm.graphic.TabbedNavigation; import com.projectlibre1.pm.graphic.frames.workspace.DefaultFrameManager; @@ -179,29 +186,6 @@ import com.projectlibre1.pm.graphic.spreadsheet.selection.event.SelectionNodeLis import com.projectlibre1.pm.graphic.views.BaseView; import com.projectlibre1.pm.graphic.views.ProjectsDialog; import com.projectlibre1.pm.graphic.views.Searchable; -import com.projectlibre1.print.GraphPageable; -import com.projectlibre1.print.PrintDocumentFactory; -import com.projectlibre1.toolbar.FilterToolBarManager; -import com.projectlibre1.toolbar.TransformComboBox; -import com.projectlibre1.configuration.Configuration; -import com.projectlibre1.configuration.FieldDictionary; -import com.projectlibre1.document.Document; -import com.projectlibre1.document.ObjectEvent; -import com.projectlibre1.exchange.ResourceMappingForm; -import com.projectlibre1.field.Field; -import com.projectlibre1.graphic.configuration.SpreadSheetFieldArray; -import com.projectlibre1.grouping.core.Node; -import com.projectlibre1.grouping.core.VoidNodeImpl; -import com.projectlibre1.grouping.core.model.NodeModel; -import com.projectlibre1.grouping.core.transform.ViewTransformer; -import com.projectlibre1.grouping.core.transform.filtering.NodeFilter; -import com.projectlibre1.grouping.core.transform.filtering.ResourceInTeamFilter; -import com.projectlibre1.job.Job; -import com.projectlibre1.job.JobQueue; -import com.projectlibre1.job.JobRunnable; -import com.projectlibre1.job.Mutex; -import com.projectlibre1.options.CalendarOption; -import com.projectlibre1.pm.assignment.Assignment; import com.projectlibre1.pm.resource.Resource; import com.projectlibre1.pm.resource.ResourcePool; import com.projectlibre1.pm.task.Project; @@ -211,6 +195,8 @@ import com.projectlibre1.pm.task.Task; import com.projectlibre1.pm.time.HasStartAndEnd; import com.projectlibre1.preference.ConfigurationFile; import com.projectlibre1.preference.GlobalPreferences; +import com.projectlibre1.print.GraphPageable; +import com.projectlibre1.print.PrintDocumentFactory; import com.projectlibre1.server.data.DocumentData; import com.projectlibre1.session.CreateOptions; import com.projectlibre1.session.LoadOptions; @@ -219,6 +205,8 @@ import com.projectlibre1.session.SaveOptions; import com.projectlibre1.session.Session; import com.projectlibre1.session.SessionFactory; import com.projectlibre1.strings.Messages; +import com.projectlibre1.toolbar.FilterToolBarManager; +import com.projectlibre1.toolbar.TransformComboBox; import com.projectlibre1.undo.CommandInfo; import com.projectlibre1.undo.UndoController; import com.projectlibre1.util.Alert; @@ -228,6 +216,8 @@ import com.projectlibre1.util.Environment; import com.projectlibre1.workspace.SavableToWorkspace; import com.projectlibre1.workspace.WorkspaceSetting; +import apple.dts.samplecode.osxadapter.OSXAdapter; + /** * diff --git a/projectlibre_ui/src/com/projectlibre1/pm/graphic/frames/StartupFactory.java b/projectlibre_ui/src/com/projectlibre1/pm/graphic/frames/StartupFactory.java index 45cdbcc..156ecce 100644 --- a/projectlibre_ui/src/com/projectlibre1/pm/graphic/frames/StartupFactory.java +++ b/projectlibre_ui/src/com/projectlibre1/pm/graphic/frames/StartupFactory.java @@ -61,34 +61,26 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; import java.util.Map; -import java.util.prefs.Preferences; import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JRootPane; import javax.swing.RootPaneContainer; import javax.swing.SwingUtilities; -import javax.swing.UIDefaults; -import javax.swing.UIManager; import org.apache.commons.collections.Closure; import org.projectlibre1.util.UpdateChecker; -import com.projectlibre1.contrib.ClassLoaderUtils; -import com.projectlibre1.dialog.DonateDialog; -import com.projectlibre1.dialog.LicenseDialog; -import com.projectlibre1.dialog.LoginDialog; -import com.projectlibre1.dialog.LoginForm; -import com.projectlibre1.dialog.TipOfTheDay; -import com.projectlibre1.dialog.TryPODDialog; -import com.projectlibre1.dialog.UserInfoDialog; -import com.projectlibre1.main.Main; -import com.projectlibre1.pm.graphic.laf.LafManagerImpl; import com.projectlibre1.company.DefaultUser; import com.projectlibre1.configuration.Configuration; import com.projectlibre1.configuration.ConfigurationReader; import com.projectlibre1.configuration.Dictionary; import com.projectlibre1.configuration.Settings; +import com.projectlibre1.contrib.ClassLoaderUtils; +import com.projectlibre1.dialog.LicenseDialog; +import com.projectlibre1.dialog.LoginDialog; +import com.projectlibre1.dialog.LoginForm; +import com.projectlibre1.dialog.TipOfTheDay; +import com.projectlibre1.dialog.UserInfoDialog; +import com.projectlibre1.pm.graphic.laf.LafManagerImpl; import com.projectlibre1.pm.task.Project; import com.projectlibre1.pm.task.ProjectFactory; import com.projectlibre1.server.access.PartnerInfo; @@ -455,7 +447,6 @@ public abstract class StartupFactory { LicenseDialog.showDialog(gm.getFrame(),false); UserInfoDialog.showDialog(gm.getFrame(),false); // DonateDialog.maybeShow(gm.getFrame(),false); -// TryPODDialog.maybeShow(gm.getFrame(),false); //claur UpdateChecker.checkForUpdateInBackground(); } if (welcome&&!Environment.isPlugin()) { @@ -468,19 +459,6 @@ public abstract class StartupFactory { if (!LafManagerImpl.isLafOk()) // for startup glitch - we don't want people to work until restarting. return; - -// -// String lastVersion = Preferences.userNodeForPackage(StartupFactory.class).get("lastVersion","0"); -// String thisVersion = VersionUtils.getVersion(); -// System.out.println("last version " + lastVersion + " this version " + thisVersion); -// if (!lastVersion.equals(thisVersion)) { -// Preferences.userNodeForPackage(StartupFactory.class).put("lastVersion",thisVersion); -// String javaVersion = System.getProperty("java.version"); -// if (javaVersion.equals("1.6.0_04") || javaVersion.equals("1.6.0_05")) -// Alert.warn("Project-ON-Demand has been updated. Please close your browser completely and restart it to complete the upgrade process."); -// return; -// } - } gm.doWelcomeDialog(); } diff --git a/projectlibre_ui/src/com/projectlibre1/print/PrintPreviewFrame.java b/projectlibre_ui/src/com/projectlibre1/print/PrintPreviewFrame.java index 66ffa6e..22e4489 100644 --- a/projectlibre_ui/src/com/projectlibre1/print/PrintPreviewFrame.java +++ b/projectlibre_ui/src/com/projectlibre1/print/PrintPreviewFrame.java @@ -92,7 +92,6 @@ import org.apache.batik.util.gui.resource.ActionMap; import org.apache.batik.util.gui.resource.MissingListenerException; import com.projectlibre1.contrib.ClassLoaderUtils; -import com.projectlibre1.dialog.PODOnlyFeature; import com.projectlibre1.help.HelpUtil; import com.projectlibre1.menu.MenuActionConstants; import com.projectlibre1.menu.MenuActionsMap; @@ -100,7 +99,6 @@ import com.projectlibre1.menu.MenuManager; import com.projectlibre1.pm.graphic.IconManager; import com.projectlibre1.strings.Messages; import com.projectlibre1.util.Alert; -import com.projectlibre1.util.Environment; public class PrintPreviewFrame extends JFrame implements ActionMap, MenuActionConstants{