Revision: 3159
Author: mo.jeff
Date: Tue Nov 10 15:02:09 2009
Log: Removed the JavaHelp from Architect.
http://code.google.com/p/power-architect/source/detail?r=3159
Deleted:
/trunk/lib/jhall.jar
/trunk/src/ca/sqlpower/architect/swingui/action/HelpAction.java
Modified:
/trunk/build.xml
/trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java
=======================================
--- /trunk/lib/jhall.jar Mon Jul 10 15:16:21 2006
+++ /dev/null
Binary file, no diff available.
=======================================
--- /trunk/src/ca/sqlpower/architect/swingui/action/HelpAction.java Wed Jun
25 15:30:43 2008
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2008, SQL Power Group Inc.
- *
- * This file is part of Power*Architect.
- *
- * Power*Architect is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Power*Architect is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package ca.sqlpower.architect.swingui.action;
-
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.net.URL;
-
-import javax.help.CSH;
-import javax.help.HelpBroker;
-import javax.help.HelpSet;
-
-import ca.sqlpower.architect.swingui.ASUtils;
-import ca.sqlpower.architect.swingui.ArchitectSwingSession;
-
-public class HelpAction extends AbstractArchitectAction {
-
- ArchitectSwingSession session;
-
- public HelpAction(ArchitectSwingSession session) {
- super(session, Messages.getString("HelpAction.name"),
Messages.getString("HelpAction.description"), "help"); //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
- this.session = session;
- }
-
- public void actionPerformed(ActionEvent e) {
- try {
- String helpHS = "jhelpset.hs"; //$NON-NLS-1$
- ClassLoader cl = getClass().getClassLoader();
- URL hsURL = HelpSet.findHelpSet(cl, helpHS);
- HelpSet hs = new HelpSet(null, hsURL);
- HelpBroker hb = hs.createHelpBroker();
- Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-
- // Default HelpBroker size is too small, make bigger unless on
anciente "VGA" resolution
- if (d.width >= 1024 && d.height >= 800) {
- hb.setSize(new Dimension(1024, 700));
- } else {
- hb.setSize(new Dimension(640, 480));
- }
- CSH.DisplayHelpFromSource helpDisplay = new
CSH.DisplayHelpFromSource(hb);
- helpDisplay.actionPerformed(e);
-
- } catch (Exception ev) {
- setEnabled(false);
- ASUtils.showExceptionDialog(session,
- Messages.getString("HelpAction.couldNotLoadHelpFile"),
//$NON-NLS-1$
- ev);
- }
- }
-}
=======================================
--- /trunk/build.xml Thu Aug 13 14:59:34 2009
+++ /trunk/build.xml Tue Nov 10 15:02:09 2009
@@ -656,7 +656,7 @@
</target>
- <target name="stage" depends="checkAntVersion,compile,userguide">
+ <target name="stage" depends="checkAntVersion,compile">
<mkdir dir="${dist.dir}" />
<mkdir dir="${staging.dir}"/>
<mkdir dir="${staging.dir}/lib"/>
@@ -736,10 +736,6 @@
<fileset dir="jdbc_drivers" includes="*.jar"/>
<fileset dir="src"
includes="default_database_types.ini"/>
</copy>
- <copy todir="${staging.dir}/doc">
- <fileset dir="${build}/doc" includes="*-${app.version}.pdf"/>
- <fileset dir="${build}/doc" includes="*.txt"/>
- </copy>
<copy todir="${staging.dir}/doc" file="doc/ReleaseNotes.txt"/>
<copy todir="${staging.dir}" file="LICENSE"/>
=======================================
--- /trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java Fri Jun 19
12:54:42 2009
+++ /trunk/src/ca/sqlpower/architect/swingui/ArchitectFrame.java Tue Nov 10
15:02:09 2009
@@ -93,7 +93,6 @@
import ca.sqlpower.architect.swingui.action.ExportHTMLReportAction;
import ca.sqlpower.architect.swingui.action.ExportPlaypenToPDFAction;
import
ca.sqlpower.architect.swingui.action.FocusToChildOrParentTableAction;
-import ca.sqlpower.architect.swingui.action.HelpAction;
import ca.sqlpower.architect.swingui.action.InsertColumnAction;
import ca.sqlpower.architect.swingui.action.InsertIndexAction;
import ca.sqlpower.architect.swingui.action.KettleJobAction;
@@ -154,7 +153,6 @@
private RedoAction redoAction;
private AboutAction aboutAction;
- private Action helpAction;
private Action newProjectAction;
private OpenProjectAction openProjectAction;
private Action saveProjectAction;
@@ -331,9 +329,6 @@
// Create actions
aboutAction = new AboutAction(session);
- helpAction = new HelpAction(session);
- helpAction.putValue(AbstractAction.SHORT_DESCRIPTION,
Messages.getString("ArchitectFrame.userGuideActionDescription"));
//$NON-NLS-1$
-
newProjectAction = new
AbstractAction(Messages.getString("ArchitectFrame.newProjectActionName"),
//$NON-NLS-1$
SPSUtils.createIcon("new_project",Messages.getString("ArchitectFrame.newProjectActionIconDescription"),sprefs.getInt(ArchitectSwingUserSettings.ICON_SIZE,
ArchitectSwingSessionContext.ICON_SIZE))) { //$NON-NLS-1$ //$NON-NLS-2$
@@ -454,8 +449,6 @@
projectBar.addSeparator();
projectBar.add(autoLayoutAction);
projectBar.add(profileAction);
- projectBar.addSeparator();
- projectBar.add(helpAction);
projectBar.setToolTipText(Messages.getString("ArchitectFrame.projectToolbarToolTip"));
//$NON-NLS-1$
projectBar.setName(Messages.getString("ArchitectFrame.projectToolbarName"));
//$NON-NLS-1$
@@ -692,7 +685,6 @@
helpMenu.add(aboutAction);
helpMenu.addSeparator();
}
- helpMenu.add(helpAction);
helpMenu.add(SPSUtils.forumAction);
helpMenu.addSeparator();
helpMenu.add(checkForUpdateAction);
