From 648e0a06796e2834998336c1a5ab8d06a359eeb3 Mon Sep 17 00:00:00 2001 From: khartlage Date: Tue, 20 Jan 2004 22:47:15 +0000 Subject: [PATCH 1/1] changes to install phpeclipse under wampp distribution --- archive/net.sourceforge.phpeclipse.sql/.classpath | 6 +- archive/net.sourceforge.phpeclipse.sql/build.xml | 31 +- .../sourceforge/phpdt/sql/PHPEclipseSQLPlugin.java | 450 +++++++++----------- net.sourceforge.phpeclipse.phphelp/.classpath | 20 +- net.sourceforge.phpeclipse.phphelp/.project | 2 +- net.sourceforge.phpeclipse.phphelp/build.xml | 7 +- .../sourceforge/phpdt/phphelp/PHPHelpPlugin.java | 2 +- 7 files changed, 238 insertions(+), 280 deletions(-) diff --git a/archive/net.sourceforge.phpeclipse.sql/.classpath b/archive/net.sourceforge.phpeclipse.sql/.classpath index 33c942c..676dc38 100644 --- a/archive/net.sourceforge.phpeclipse.sql/.classpath +++ b/archive/net.sourceforge.phpeclipse.sql/.classpath @@ -2,13 +2,13 @@ + path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.1.3/boot.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_2.1.3/bootsrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.1.2/ws/win32/swt.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.swt.win32_2.1.2/ws/win32/swtsrc.zip"/> + + diff --git a/archive/net.sourceforge.phpeclipse.sql/build.xml b/archive/net.sourceforge.phpeclipse.sql/build.xml index 129f91e..0e7630a 100644 --- a/archive/net.sourceforge.phpeclipse.sql/build.xml +++ b/archive/net.sourceforge.phpeclipse.sql/build.xml @@ -5,10 +5,13 @@ + + + - + @@ -19,14 +22,14 @@ - + - + @@ -35,12 +38,12 @@ - + - + @@ -52,14 +55,14 @@ - + - + - + @@ -82,7 +85,7 @@ - + @@ -91,10 +94,11 @@ - + + - + @@ -108,8 +112,11 @@ - + + + + diff --git a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/PHPEclipseSQLPlugin.java b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/PHPEclipseSQLPlugin.java index 9fbd506..5926e37 100644 --- a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/PHPEclipseSQLPlugin.java +++ b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/PHPEclipseSQLPlugin.java @@ -41,280 +41,232 @@ import net.sourceforge.phpdt.sql.view.bookmark.SubsetContentProvider; /** * @author */ -public class PHPEclipseSQLPlugin -extends AbstractUIPlugin -implements IConstants { +public class PHPEclipseSQLPlugin extends AbstractUIPlugin implements IConstants { - private static PHPEclipseSQLPlugin plugin; - public final static String PLUGIN_ID = "net.sourceforge.phpeclipse.sql"; + private static PHPEclipseSQLPlugin plugin; + public final static String PLUGIN_ID = "net.sourceforge.phpeclipse.sql"; - public PHPEclipseSQLPlugin(IPluginDescriptor descriptor) { - super(descriptor); - plugin = this; - } + public PHPEclipseSQLPlugin(IPluginDescriptor descriptor) { + super(descriptor); + plugin = this; + } - public static PHPEclipseSQLPlugin getDefault() { - return plugin; - } - /** - * Reads the PHPEclipseSQL Plugin state from a file. The file has been created with writeImportantState - * @param target - */ - protected void readStateFrom(File target) { - String fileName = target.getName(); -// if (!fileName.endsWith("ext")) { //$NON-NLS-1$ -// // It's the 2.0 format for preferences -// BookmarkContentProvider.getInstance().load(target); -// } else { - //It's the 2.1 format for preferences and subsets - XmlDocument doc = new XmlDocument(); - FileInputStream source = null; - try { - source = new FileInputStream(target); - } catch (FileNotFoundException e1) { - e1.printStackTrace(); - return; - } - DocumentBuilderFactory factory = - DocumentBuilderFactory.newInstance(); - DocumentBuilder parser; - try { - parser = factory.newDocumentBuilder(); - doc = (XmlDocument) parser.parse(source); - } catch (ParserConfigurationException e) { - e.printStackTrace(); - return; - } catch (SAXException e) { - e.printStackTrace(); - return; - } catch (IOException e) { - e.printStackTrace(); - return; - } - Element root = doc.getDocumentElement(); - BookmarkContentProvider.getInstance().importXML(root); - SubsetContentProvider.getInstance().importXML(root); -// } - } + public static PHPEclipseSQLPlugin getDefault() { + return plugin; + } + /** + * Reads the PHPEclipseSQL Plugin state from a file. The file has been created with writeImportantState + * @param target + */ + protected void readStateFrom(File target) { + String fileName = target.getName(); + // if (!fileName.endsWith("ext")) { //$NON-NLS-1$ + // // It's the 2.0 format for preferences + // BookmarkContentProvider.getInstance().load(target); + // } else { + //It's the 2.1 format for preferences and subsets + XmlDocument doc = new XmlDocument(); + FileInputStream source = null; + try { + source = new FileInputStream(target); + } catch (FileNotFoundException e1) { + e1.printStackTrace(); + return; + } + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder parser; + try { + parser = factory.newDocumentBuilder(); + doc = (XmlDocument) parser.parse(source); + } catch (ParserConfigurationException e) { + e.printStackTrace(); + return; + } catch (SAXException e) { + e.printStackTrace(); + return; + } catch (IOException e) { + e.printStackTrace(); + return; + } + Element root = doc.getDocumentElement(); + BookmarkContentProvider.getInstance().importXML(root); + SubsetContentProvider.getInstance().importXML(root); + // } + } - public void startup() throws CoreException { - super.startup(); - ISaveParticipant saveParticipant = new PHPSQLSaveParticipant(); - ISavedState lastState = - ResourcesPlugin.getWorkspace().addSaveParticipant( - this, - saveParticipant); - if (lastState == null) - return; - IPath location = lastState.lookup(new Path("save")); - if (location == null) - return; - // the plugin instance should read any important state from the file. - File f = getStateLocation().append(location).toFile(); - readStateFrom(f); - } + public void startup() throws CoreException { + super.startup(); + ISaveParticipant saveParticipant = new PHPSQLSaveParticipant(); + ISavedState lastState = ResourcesPlugin.getWorkspace().addSaveParticipant(this, saveParticipant); + if (lastState == null) + return; + IPath location = lastState.lookup(new Path("save")); + if (location == null) + return; + // the plugin instance should read any important state from the file. + File f = getStateLocation().append(location).toFile(); + readStateFrom(f); + } - protected void writeImportantState(File target) { - XmlDocument doc = new XmlDocument(); - FileOutputStream out = null; - try { - out = new FileOutputStream(target); - } catch (FileNotFoundException e1) { - e1.printStackTrace(); - return; - } - Element root = (Element) doc.appendChild(doc.createElement(Messages.getString("ExportXMLAction.SavedData"))); //$NON-NLS-1$ + protected void writeImportantState(File target) { + XmlDocument doc = new XmlDocument(); + FileOutputStream out = null; + try { + out = new FileOutputStream(target); + } catch (FileNotFoundException e1) { + e1.printStackTrace(); + return; + } + Element root = (Element) doc.appendChild(doc.createElement(Messages.getString("ExportXMLAction.SavedData"))); //$NON-NLS-1$ - BookmarkContentProvider.getInstance().exportXML(root); - SubsetContentProvider.getInstance().exportXML(root); + BookmarkContentProvider.getInstance().exportXML(root); + SubsetContentProvider.getInstance().exportXML(root); - try { - doc.write(out); - out.close(); - } catch (IOException e) { - e.printStackTrace(); - } + try { + doc.write(out); + out.close(); + } catch (IOException e) { + e.printStackTrace(); + } - } + } - /** - * Gets an image descriptof from a file in the icons directory - * @param name of the file to get - * @return ImageDescriptor or null if not found - */ - public static ImageDescriptor getImageDescriptor(String name) { - ImageDescriptor descriptor = null; - try { - URL installURL = - PHPEclipseSQLPlugin - .getDefault() - .getDescriptor() - .getInstallURL(); - URL url = new URL(installURL, "icons/" + name); - descriptor = ImageDescriptor.createFromURL(url); - } catch (Exception e) { - e.printStackTrace(); - } - return descriptor; - } - public static Image getImage(String name) { - return getImageDescriptor(name).createImage(); - } + /** + * Gets an image descriptof from a file in the icons directory + * @param name of the file to get + * @return ImageDescriptor or null if not found + */ + public static ImageDescriptor getImageDescriptor(String name) { + ImageDescriptor descriptor = null; + try { + URL installURL = PHPEclipseSQLPlugin.getDefault().getDescriptor().getInstallURL(); + URL url = new URL(installURL, "icons/" + name); + descriptor = ImageDescriptor.createFromURL(url); + } catch (Exception e) { + e.printStackTrace(); + } + return descriptor; + } + public static Image getImage(String name) { + return getImageDescriptor(name).createImage(); + } - public void dispose() throws CoreException { - } + public void dispose() throws CoreException { + } - protected void initializeDefaultPluginPreferences() { - RGB BACKGROUND = new RGB(255, 255, 255); - RGB COMMENT = new RGB(88, 148, 64); - RGB KEYWORD = new RGB(126, 0, 75); - RGB STRING = new RGB(0, 0, 255); - RGB NUMERIC = new RGB(255, 0, 0); - RGB DEFAULT = new RGB(0, 0, 0); - IPreferenceStore store = getPreferenceStore(); - PreferenceConverter.setDefault( - store, - "phpeclipse.sql.background.color", - BACKGROUND); - PreferenceConverter.setDefault( - store, - "phpeclipse.sql.text.color", - DEFAULT); - PreferenceConverter.setDefault( - store, - "phpeclipse.sql.keyword.color", - KEYWORD); - PreferenceConverter.setDefault( - store, - "phpeclipse.sql.comment.color", - COMMENT); - PreferenceConverter.setDefault( - store, - "phpeclipse.sql.string.color", - STRING); - PreferenceConverter.setDefault( - store, - "phpeclipse.sql.numeric.color", - NUMERIC); - getPreferenceStore().setDefault("phpeclipse.sql.text.bold", false); - getPreferenceStore().setDefault("phpeclipse.sql.keyword.bold", true); - getPreferenceStore().setDefault("phpeclipse.sql.string.bold", false); - getPreferenceStore().setDefault("phpeclipse.sql.comment.bold", false); - getPreferenceStore().setDefault("phpeclipse.sql.numeric.bold", false); - PreferenceConverter.setDefault(getPreferenceStore(), "phpeclipsesql.font", (FontData) null); //$NON-NLS-1$ - } + protected void initializeDefaultPluginPreferences() { + RGB BACKGROUND = new RGB(255, 255, 255); + RGB COMMENT = new RGB(88, 148, 64); + RGB KEYWORD = new RGB(126, 0, 75); + RGB STRING = new RGB(0, 0, 255); + RGB NUMERIC = new RGB(255, 0, 0); + RGB DEFAULT = new RGB(0, 0, 0); + IPreferenceStore store = getPreferenceStore(); + PreferenceConverter.setDefault(store, "phpeclipse.sql.background.color", BACKGROUND); + PreferenceConverter.setDefault(store, "phpeclipse.sql.text.color", DEFAULT); + PreferenceConverter.setDefault(store, "phpeclipse.sql.keyword.color", KEYWORD); + PreferenceConverter.setDefault(store, "phpeclipse.sql.comment.color", COMMENT); + PreferenceConverter.setDefault(store, "phpeclipse.sql.string.color", STRING); + PreferenceConverter.setDefault(store, "phpeclipse.sql.numeric.color", NUMERIC); + getPreferenceStore().setDefault("phpeclipse.sql.text.bold", false); + getPreferenceStore().setDefault("phpeclipse.sql.keyword.bold", true); + getPreferenceStore().setDefault("phpeclipse.sql.string.bold", false); + getPreferenceStore().setDefault("phpeclipse.sql.comment.bold", false); + getPreferenceStore().setDefault("phpeclipse.sql.numeric.bold", false); + PreferenceConverter.setDefault(getPreferenceStore(), "phpeclipsesql.font", (FontData) null); //$NON-NLS-1$ + getPreferenceStore().setDefault( + "phpeclipse.sql.select.template", + "$results = mysql_query(\"SELECT {0} FROM {1} WHERE {2} \");"); - public boolean showView(String view) { - IWorkbench workbench = getWorkbench(); - IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); - IWorkbenchPage page = window.getActivePage(); - IViewPart viewPart = null; - try { - viewPart = page.showView(view); - } catch (PartInitException e) { - e.printStackTrace(); - return false; - } + getPreferenceStore().setDefault( + "phpeclipse.sql.insert.template", + "$results = mysql_query(\"INSERT INTO {0} ({1}) VALUES {2} \");"); - getPreferenceStore().setDefault( - "phpeclipse.sql.select.template", - "$results = mysql_query(\"SELECT {0} FROM {1} WHERE {2} \");"); + getPreferenceStore().setDefault("phpeclipse.sql.update.template", "$results = mysql_query(\"UPDATE {0} SET {1} WHERE {2} \");"); - getPreferenceStore().setDefault( - "phpeclipse.sql.insert.template", - "$results = mysql_query(\"INSERT INTO {0} ({1}) VALUES {2} \");"); + getPreferenceStore().setDefault("phpeclipse.sql.delete.template", "$results = mysql_query(\"DELETE FROM {0} WHERE {1} \");"); - getPreferenceStore().setDefault( - "phpeclipse.sql.update.template", - "$results = mysql_query(\"UPDATE {0} SET {1} WHERE {2} \");"); + getPreferenceStore().setDefault("phpeclipse.sql.username.connect", "root"); - getPreferenceStore().setDefault( - "phpeclipse.sql.delete.template", - "$results = mysql_query(\"DELETE FROM {0} WHERE {1} \");"); + getPreferenceStore().setDefault("phpeclipse.sql.connect.connect", "jdbc:mysql://localhost/mysql"); - getPreferenceStore().setDefault( - "phpeclipse.sql.username.connect", - "root"); + getPreferenceStore().setDefault("phpeclipse.sql.driver.connect", "com.mysql.jdbc.Driver"); - getPreferenceStore().setDefault( - "phpeclipse.sql.connect.connect", - "jdbc:mysql://localhost/test"); + getPreferenceStore().setDefault("phpeclipse.sql.type.connect", "MySQL"); - getPreferenceStore().setDefault( - "phpeclipse.sql.driver.connect", - "com.mysql.jdbc.Driver"); + getPreferenceStore().setDefault( + "phpeclipse.sql.filename.connect", + "C:\\wampp2\\mysql\\lib\\mysql-connector.jar"); + } - getPreferenceStore().setDefault("phpeclipse.sql.type.connect", "MySQL"); + public boolean showView(String view) { + IWorkbench workbench = getWorkbench(); + IWorkbenchWindow window = workbench.getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + IViewPart viewPart = null; + try { + viewPart = page.showView(view); + } catch (PartInitException e) { + e.printStackTrace(); + return false; + } - getPreferenceStore().setDefault( - "phpeclipse.sql.filename.connect", - "C:\\apache\\mysql\\lib\\mysql-connector-java-2.0.14-bin.jar"); - - PreferenceConverter.setDefault( - getPreferenceStore(), - "phpeclipse.sql.font", - (FontData) null); - return(viewPart != null); - } + PreferenceConverter.setDefault(getPreferenceStore(), "phpeclipse.sql.font", (FontData) null); + return (viewPart != null); + } } class PHPSQLSaveParticipant implements ISaveParticipant, IConstants { - /** - * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(ISaveContext) - */ - public void doneSaving(ISaveContext context) { - } + /** + * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(ISaveContext) + */ + public void doneSaving(ISaveContext context) { + } - /** - * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(ISaveContext) - */ - public void prepareToSave(ISaveContext context) throws CoreException { - } + /** + * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(ISaveContext) + */ + public void prepareToSave(ISaveContext context) throws CoreException { + } - /** - * @see org.eclipse.core.resources.ISaveParticipant#rollback(ISaveContext) - */ - public void rollback(ISaveContext context) { - } + /** + * @see org.eclipse.core.resources.ISaveParticipant#rollback(ISaveContext) + */ + public void rollback(ISaveContext context) { + } - /** - * @see org.eclipse.core.resources.ISaveParticipant#saving(ISaveContext) - */ - public void saving(ISaveContext context) throws CoreException { - switch (context.getKind()) { - case ISaveContext.FULL_SAVE : - PHPEclipseSQLPlugin sqlPluginInstance = - PHPEclipseSQLPlugin.getDefault(); - // save the plug in state - if (BookmarkContentProvider.getInstance().hasChanged()) { - int saveNumber = context.getSaveNumber(); - String saveFileName = - "save " + Integer.toString(saveNumber); - File f = - sqlPluginInstance - .getStateLocation() - .append(saveFileName) - .toFile(); - // if we fail to write, an exception is thrown and we do not update the path - sqlPluginInstance.writeImportantState(f); - context.map(new Path("save"), new Path(saveFileName)); - context.needSaveNumber(); - } else { - if (DEBUG) { - System.out.println("Not saving unchanged bookmarks"); - } - } - break; - case ISaveContext.PROJECT_SAVE : - // get the project related to this save operation - //IProject project = context.getProject(); - // save its information, if necessary - break; - case ISaveContext.SNAPSHOT : - // This operation needs to be really fast because - // snapshots can be requested frequently by the - // workspace. - break; - } - } + /** + * @see org.eclipse.core.resources.ISaveParticipant#saving(ISaveContext) + */ + public void saving(ISaveContext context) throws CoreException { + switch (context.getKind()) { + case ISaveContext.FULL_SAVE : + PHPEclipseSQLPlugin sqlPluginInstance = PHPEclipseSQLPlugin.getDefault(); + // save the plug in state + if (BookmarkContentProvider.getInstance().hasChanged()) { + int saveNumber = context.getSaveNumber(); + String saveFileName = "save " + Integer.toString(saveNumber); + File f = sqlPluginInstance.getStateLocation().append(saveFileName).toFile(); + // if we fail to write, an exception is thrown and we do not update the path + sqlPluginInstance.writeImportantState(f); + context.map(new Path("save"), new Path(saveFileName)); + context.needSaveNumber(); + } else { + if (DEBUG) { + System.out.println("Not saving unchanged bookmarks"); + } + } + break; + case ISaveContext.PROJECT_SAVE : + // get the project related to this save operation + //IProject project = context.getProject(); + // save its information, if necessary + break; + case ISaveContext.SNAPSHOT : + // This operation needs to be really fast because + // snapshots can be requested frequently by the + // workspace. + break; + } + } } diff --git a/net.sourceforge.phpeclipse.phphelp/.classpath b/net.sourceforge.phpeclipse.phphelp/.classpath index 6696591..35bb74e 100644 --- a/net.sourceforge.phpeclipse.phphelp/.classpath +++ b/net.sourceforge.phpeclipse.phphelp/.classpath @@ -2,21 +2,21 @@ + path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_2.1.1/resources.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_2.1.1/resourcessrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.ui_2.1.1/ui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_2.1.1/uisrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.swt.win32_2.1.2/ws/win32/swt.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.swt.win32_2.1.2/ws/win32/swtsrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.jface_2.1.1/jface.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_2.1.1/jfacesrc.zip"/> + path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_2.1.1/workbench.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_2.1.1/workbenchsrc.zip"/> - + path="ECLIPSE_HOME/plugins/org.eclipse.help_2.1.2/help.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.help_2.1.2/helpsrc.zip"/> + + path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.1.3/boot.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_2.1.3/bootsrc.zip"/> - + path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.1.1/runtime.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_2.1.1/runtimesrc.zip"/> + diff --git a/net.sourceforge.phpeclipse.phphelp/.project b/net.sourceforge.phpeclipse.phphelp/.project index 39448c4..ceb9e2c 100644 --- a/net.sourceforge.phpeclipse.phphelp/.project +++ b/net.sourceforge.phpeclipse.phphelp/.project @@ -3,7 +3,7 @@ net.sourceforge.phpeclipse.phphelp - net.sourceforge.phpeclipse + net.sourceforge.phpeclipse213 diff --git a/net.sourceforge.phpeclipse.phphelp/build.xml b/net.sourceforge.phpeclipse.phphelp/build.xml index feaefb6..8f6a806 100644 --- a/net.sourceforge.phpeclipse.phphelp/build.xml +++ b/net.sourceforge.phpeclipse.phphelp/build.xml @@ -36,9 +36,6 @@ - - - @@ -46,7 +43,7 @@ - + @@ -97,7 +94,7 @@ - + diff --git a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/PHPHelpPlugin.java b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/PHPHelpPlugin.java index f12c1f9..9ddc55a 100644 --- a/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/PHPHelpPlugin.java +++ b/net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/PHPHelpPlugin.java @@ -121,7 +121,7 @@ public class PHPHelpPlugin extends AbstractUIPlugin { if (windowsSystem.equals(BootLoader.WS_WIN32)) { store.setDefault(PHP_CHM_ENABLED, "false"); - store.setDefault(PHP_CHM_FILE, ""); + store.setDefault(PHP_CHM_FILE, "c:\\wampp2\\php\\php_manual_en.chm"); store.setDefault(PHP_CHM_COMMAND, "hh.exe \"mk:@MSITStore:{0}::/en/function.{1}.html\""); } else { store.setDefault(PHP_CHM_ENABLED, "false"); -- 1.7.1