|
From: Francois G. <far...@us...> - 2005-04-27 05:47:07
|
Update of /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/eclipse/xslgen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6376/src/org/easystruts/eclipse/xslgen Modified Files: EclipseResourceWriter.java EclipseJdtWriter.java Log Message: Fixed a lot of compilation errors. Still ~ 400 of them (was 650 before). This requires the plugin "org.eclipse.update.ui.forms", which is not in 3.0 or 3.1 anymore. A solution is to take it from CVS (tag R2_1_3). Index: EclipseResourceWriter.java =================================================================== RCS file: /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/eclipse/xslgen/EclipseResourceWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EclipseResourceWriter.java 15 Apr 2005 04:26:11 -0000 1.1 --- EclipseResourceWriter.java 27 Apr 2005 05:46:56 -0000 1.2 *************** *** 15,18 **** --- 15,19 ---- import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceStatus; + import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; *************** *** 130,134 **** protected IFile createFileHandle(IPath filePath) { ! return WorkbenchPlugin.getPluginWorkspace().getRoot().getFile(filePath); } --- 131,135 ---- protected IFile createFileHandle(IPath filePath) { ! return ResourcesPlugin.getWorkspace().getRoot().getFile(filePath); } Index: EclipseJdtWriter.java =================================================================== RCS file: /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/eclipse/xslgen/EclipseJdtWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EclipseJdtWriter.java 15 Apr 2005 04:26:11 -0000 1.1 --- EclipseJdtWriter.java 27 Apr 2005 05:46:56 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- import java.lang.reflect.InvocationTargetException; import java.util.Iterator; + import java.util.Map; import java.util.StringTokenizer; *************** *** 25,38 **** import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.ToolFactory; import org.eclipse.jdt.internal.corext.codemanipulation.ImportsStructure; import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility; ! import org.eclipse.jdt.internal.corext.template.Template; ! import org.eclipse.jdt.internal.corext.template.Templates; import org.eclipse.jdt.internal.corext.template.java.JavaContext; import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.preferences.ImportOrganizePreferencePage; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; import org.jdom.Document; --- 26,44 ---- import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.ToolFactory; + import org.eclipse.jdt.core.formatter.CodeFormatter; import org.eclipse.jdt.internal.corext.codemanipulation.ImportsStructure; import org.eclipse.jdt.internal.corext.codemanipulation.StubUtility; ! import org.eclipse.jface.text.BadLocationException; ! import org.eclipse.jface.text.templates.Template; ! import org.eclipse.jface.text.templates.TemplateException; import org.eclipse.jdt.internal.corext.template.java.JavaContext; + import org.eclipse.jdt.internal.corext.util.CodeFormatterUtil; import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.preferences.ImportOrganizePreferencePage; + import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableWithProgress; + import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation; import org.jdom.Document; *************** *** 84,87 **** --- 90,125 ---- } + // TODO 3.0: I had to copy this code from old version, there's probably a better way... + // see http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizePreferencePage.java.diff?r1=1.41&r2=1.42 + private static int getImportNumberThreshold() { + IPreferenceStore prefs= JavaPlugin.getDefault().getPreferenceStore(); + int threshold= prefs.getInt(PreferenceConstants.ORGIMPORTS_ONDEMANDTHRESHOLD); + if (threshold < 0) { + threshold= Integer.MAX_VALUE; + } + return threshold; + } + + private static String[] getImportOrderPreference() { + IPreferenceStore prefs= JavaPlugin.getDefault().getPreferenceStore(); + String str= prefs.getString(PreferenceConstants.ORGIMPORTS_IMPORTORDER); + if (str != null) { + return unpackOrderList(str); + } + return new String[0]; + } + + + private static String[] unpackOrderList(String str) { + StringTokenizer tok= new StringTokenizer(str, ";"); //$NON-NLS-1$ + int nTokens= tok.countTokens(); + String[] res= new String[nTokens]; + for (int i= 0; i < nTokens; i++) { + res[i]= tok.nextToken(); + } + return res; + } + // END TODO copied code... + public void createType(IProgressMonitor monitor) throws Exception{ *************** *** 179,184 **** /** Ajout des imports */ ! String[] prefOrder = ImportOrganizePreferencePage.getImportOrderPreference(); ! int threshold = ImportOrganizePreferencePage.getImportNumberThreshold(); ImportsStructure imports = new ImportsStructure(parentCU, prefOrder, threshold, false); for (Iterator i = javaClass.getImports().iterator(); i.hasNext();) { --- 217,222 ---- /** Ajout des imports */ ! String[] prefOrder = /* ImportOrganizePreferencePage. */ getImportOrderPreference(); ! int threshold = /* ImportOrganizePreferencePage. */ getImportNumberThreshold(); ImportsStructure imports = new ImportsStructure(parentCU, prefOrder, threshold, false); for (Iterator i = javaClass.getImports().iterator(); i.hasNext();) { *************** *** 194,199 **** String originalContent = buf.getText(range.getOffset(), range.getLength()); ! String formattedContent = ! StubUtility.codeFormat(originalContent, 0, "\n"); buf.replace(range.getOffset(), range.getLength(), formattedContent); monitor.worked(4); --- 232,242 ---- String originalContent = buf.getText(range.getOffset(), range.getLength()); ! // 3.0: modified as in http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.ui/core%20extension/org/eclipse/jdt/internal/corext/codemanipulation/AddGetterSetterOperation.java.diff?r1=1.25&r2=1.22 ! // String formattedContent = ! // StubUtility.codeFormat(originalContent, 0, "\n"); ! String formattedContent= ! CodeFormatterUtil.format(CodeFormatter.K_CLASS_BODY_DECLARATIONS, originalContent, ! 0, null, "\n", (Map)null) + "\n"; ! buf.replace(range.getOffset(), range.getLength(), formattedContent); monitor.worked(4); *************** *** 245,254 **** protected String getTemplate(String name, ICompilationUnit parentCU, int pos) { try { ! Template[] templates= Templates.getInstance().getTemplates(name); ! if (templates.length > 0) { ! return JavaContext.evaluateTemplate(templates[0], parentCU, pos); } } catch (CoreException e) { JavaPlugin.log(e); } return null; --- 288,301 ---- protected String getTemplate(String name, ICompilationUnit parentCU, int pos) { try { ! Template template = JavaPlugin.getDefault().getTemplateStore().findTemplate(name); ! if (template != null) { ! return JavaContext.evaluateTemplate(template, parentCU, pos); } } catch (CoreException e) { JavaPlugin.log(e); + } catch (BadLocationException e) { + JavaPlugin.log(e); + } catch (TemplateException e) { + JavaPlugin.log(e); } return null; |
