diff options
| author | cbateman | 2007-04-09 02:52:44 +0000 |
|---|---|---|
| committer | cbateman | 2007-04-09 02:52:44 +0000 |
| commit | 27e56c2d67b998cd50968101eeddbd5422672d64 (patch) | |
| tree | e434ddc85215e5dcd643e5c4807706ce92739f6c | |
| parent | 073bfca325bbb6ac26d2a095f0a1dfe3cbb9a5ef (diff) | |
| download | webtools.jsf-27e56c2d67b998cd50968101eeddbd5422672d64.tar.gz webtools.jsf-27e56c2d67b998cd50968101eeddbd5422672d64.tar.xz webtools.jsf-27e56c2d67b998cd50968101eeddbd5422672d64.zip | |
Increased warning levels and fixed more severe problems.
81 files changed, 503 insertions, 235 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..555e7217e --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,77 @@ +#Fri Apr 06 22:45:35 PDT 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=error +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.4 diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..82eb6c152 --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,3 @@ +#Fri Apr 06 18:25:15 PDT 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java index 44c20b65a..69cbda413 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java @@ -103,9 +103,7 @@ public class EditorPlugin extends AbstractUIPlugin {//implements IStartup { } /** - * get the alerts objects associated with this plugin for alerting the user. - * - * @return + * @return the alerts objects associated with this plugin for alerting the user. */ public static Alerts getAlerts() { return alerts; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java index a6aac5e34..90e5cae8d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java @@ -566,7 +566,7 @@ public class MultiPageEditorOutlinePage extends Page implements * * @param part * the input part - * @param pageRecord + * @param rec * a page record for the part */ protected void doDestroyPage(IWorkbenchPart part, PageRec rec) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java index d712593ed..5858df634 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java @@ -321,7 +321,8 @@ public class AddEditManagedPropertyDialog extends Dialog { } /** - * @param textControl + * @param valueType_ + * @param value */ protected void handleChangeValue(String valueType_, String value) { if (valueType_.equalsIgnoreCase(IFacesConfigConstants.VALUE)) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java index f436c042e..1c0d3b613 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java @@ -63,6 +63,11 @@ public class AddEditRendererDialog extends Dialog { private IFacesConfigPage page; + /** + * @param parentShell + * @param page + * @param isNew + */ public AddEditRendererDialog(Shell parentShell, IFacesConfigPage page, boolean isNew) { super(parentShell); @@ -73,10 +78,10 @@ public class AddEditRendererDialog extends Dialog { /** * * @param parentShell - * @param attributeName - * @param attributeClass - * @param defaultValue - * @param suggestedValue + * @param rendererName + * @param rendererClass + * @param componentFamily + * @param renderType */ public AddEditRendererDialog(Shell parentShell, String rendererName, String rendererClass, String componentFamily, String renderType) { @@ -207,6 +212,9 @@ public class AddEditRendererDialog extends Dialog { shellSize.y); } + /** + * @return the associated project + */ public IProject getProject() { return project; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java index ac59104ef..75dd0bc20 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java @@ -111,8 +111,7 @@ public class CommonListDialog extends Dialog implements * Defaultly create a tableviewer. * * @param parent - * @param toolkit - * @return + * @return the structured viewer */ protected StructuredViewer createViewer(Composite parent) { @@ -167,7 +166,7 @@ public class CommonListDialog extends Dialog implements * Config the viewer, such as set a filter and so on. Sub classes should * override this method to add filter. * - * @param structuredViewer + * @param structuredViewer_ */ protected void configViewer(StructuredViewer structuredViewer_) { // do nothing; sub-classes should override diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java index c35e402ce..b89a83b16 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java @@ -81,8 +81,9 @@ public class EditListEntriesDialog extends Dialog { /** * * @param parentShell - * @param mapEntries - * the map-entries element that working on. + * @param listEntries + * the list-entries element that working on. + * @param section */ public EditListEntriesDialog(Shell parentShell, ListEntriesType listEntries, AbstractFacesConfigSection section) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java index 9925d93de..ffca1f868 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java @@ -187,7 +187,7 @@ public abstract class FacesConfigMasterDetailPage extends FormPage implements * @param managedForm * @param toolkit * @param page - * @return + * @return the detail sections */ abstract protected FacesConfigMasterSection[] createMasterSections( Composite composite, IManagedForm managedForm, FormToolkit toolkit, @@ -231,7 +231,7 @@ public abstract class FacesConfigMasterDetailPage extends FormPage implements * what the key is. Defaultly the EClass object of the selected object in * the structured viewer will be taken as the page key. * - * @see getPageKey + * @see #getPageKey * */ abstract public IDetailsPage getPage(Object key); @@ -303,7 +303,7 @@ public abstract class FacesConfigMasterDetailPage extends FormPage implements /** * get the section that is expanded. * - * @return + * @return the master section */ protected FacesConfigMasterSection getActiveSection() { for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) { @@ -317,7 +317,6 @@ public abstract class FacesConfigMasterDetailPage extends FormPage implements } public void addSelectionChangedListener(ISelectionChangedListener listener) { - // TODO Auto-generated method stub selectionChangedListeners.add(listener); } @@ -334,8 +333,7 @@ public abstract class FacesConfigMasterDetailPage extends FormPage implements } public void setSelection(ISelection selection) { - // TODO Auto-generated method stub - + // no selection setting } public Object getAdapter(Class adapter) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java index 198aa357a..b27a4b01b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java @@ -473,7 +473,7 @@ public class OthersPage extends FormPage implements IFacesConfigPage, /** * get the section that is expanded. * - * @return + * @return the page section */ protected OthersPageBaseSection getActiveSection() { for (int i = 0, n = leftSections.size(); i < n; i++) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java index b2edbb7ca..5937e9177 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java @@ -46,6 +46,9 @@ public abstract class FacesConfigDetailsPage extends AbstractFormPart implements private List selectionChangedListeners = new ArrayList(); + /** + * @param page + */ public FacesConfigDetailsPage(FacesConfigMasterDetailPage page) { super(); this.page = page; @@ -88,8 +91,8 @@ public abstract class FacesConfigDetailsPage extends AbstractFormPart implements * @param composite * @param managedForm * @param toolkit - * @param page - * @return + * @param page_ + * @return the detail sections */ abstract protected IFacesConfigSection[] createDetailSections( Composite composite, IManagedForm managedForm, FormToolkit toolkit, @@ -145,7 +148,6 @@ public abstract class FacesConfigDetailsPage extends AbstractFormPart implements * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) */ public void addSelectionChangedListener(ISelectionChangedListener listener) { - // TODO Auto-generated method stub selectionChangedListeners.add(listener); } @@ -155,7 +157,6 @@ public abstract class FacesConfigDetailsPage extends AbstractFormPart implements * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection() */ public ISelection getSelection() { - // TODO Auto-generated method stub return StructuredSelection.EMPTY; } @@ -166,7 +167,6 @@ public abstract class FacesConfigDetailsPage extends AbstractFormPart implements */ public void removeSelectionChangedListener( ISelectionChangedListener listener) { - // TODO Auto-generated method stub selectionChangedListeners.remove(listener); } @@ -176,8 +176,7 @@ public abstract class FacesConfigDetailsPage extends AbstractFormPart implements * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection) */ public void setSelection(ISelection selection) { - // TODO Auto-generated method stub - + // no selection allowed } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java index 882c4f01f..1efb7434e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java @@ -504,11 +504,10 @@ public class PageflowEditor extends GraphicalEditorWithFlyoutPalette implements /** * Saves the pageflow under the specified path. + * @param file * - * @param pageflow - * @param path - * workspace relative path * @param progressMonitor + * @throws CoreException */ public void doSave(IFile file, IProgressMonitor progressMonitor) throws CoreException { @@ -972,7 +971,7 @@ public class PageflowEditor extends GraphicalEditorWithFlyoutPalette implements * * @param property - * property's string name - * @param part-EditPart + * @param part */ private void processPropertyChange(String property, EditPart part) { IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java index 0c1e65255..3e239190d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java @@ -79,7 +79,7 @@ public class PageflowEditorContextMenuProvider extends ContextMenuProvider { /** * Appends the alignment subment. * - * @param menuManager-menu + * @param menuManager * manager of workbench */ private void appendShowViewSubmenu(IMenuManager menuManager) { @@ -107,7 +107,7 @@ public class PageflowEditorContextMenuProvider extends ContextMenuProvider { /** * Appends the alignment subment. * - * @param menuManager-menu + * @param menuManager * manager of workbench */ private void appendAlignmentSubmenu(IMenuManager menuManager) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java index af82b38f3..2f036ad0d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java @@ -222,7 +222,6 @@ public class PageflowEditorOutlinePage extends Page implements /** * initialize Overview. * - * @return - the edit domain */ private void initializeOverview() { // check if control was created diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java index 3e29b7803..e0940623c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java @@ -89,7 +89,6 @@ public class OpenEditorCommand extends Command { /** * open existed JSF file or call the wizard to create a new one. * - * @param void */ private void executeOpenPFPage() { IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java index 0a2850486..e3e526920 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java @@ -59,8 +59,7 @@ public class RenameNodeCommand extends Command { /** * Sets the source Activity - * - * @param activity + * @param node * the source Activity */ public void setSource(PageflowNode node) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java index 501ff47e3..2c489f855 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java @@ -37,7 +37,7 @@ public interface IAnnotationEditPart { /** * get the maker's resource instance. * - * @return + * @return marker resource */ IResource getMarkerResource(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java index dcc7d38a1..0ff56f2e9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java @@ -67,7 +67,7 @@ public class PageflowEditPart extends PageflowContainerEditPart implements /** * Creates a new PageflowEditPart instance. * - * @param element - + * @param pageflow - * pageflow model */ protected PageflowEditPart(Pageflow pageflow) { @@ -300,6 +300,7 @@ public class PageflowEditPart extends PageflowContainerEditPart implements /** * get the foreground color from preference + * @return the router style value * */ public int getConnectionRouterStyle() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java index a564f8f48..8b945157b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java @@ -28,7 +28,6 @@ public class PageflowTreeEditPart extends PageflowElementTreeEditPart { * Creates a new PageflowTreeEditPart instance. * * @param pageflow - * @param showOnlyCompoundTasks */ public PageflowTreeEditPart(Pageflow pageflow) { super(pageflow); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java index c6bf6d404..fa5764d82 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java @@ -28,7 +28,6 @@ public class NodeLabel extends Label { */ public NodeLabel() { super(); - // TODO Auto-generated constructor stub } /** @@ -36,7 +35,6 @@ public class NodeLabel extends Label { */ public NodeLabel(String s) { super(s); - // TODO Auto-generated constructor stub } /** @@ -44,7 +42,6 @@ public class NodeLabel extends Label { */ public NodeLabel(Image i) { super(i); - // TODO Auto-generated constructor stub } /** @@ -53,7 +50,6 @@ public class NodeLabel extends Label { */ public NodeLabel(String s, Image i) { super(s, i); - // TODO Auto-generated constructor stub } /* @@ -86,7 +82,7 @@ public class NodeLabel extends Label { /** * get tooltip's text * - * @return + * @return the tool tip text string */ public String getToolTipText() { if (getToolTip() != null) diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java index 5e812b4de..041fce3c8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java @@ -102,7 +102,7 @@ public class PFLinkFigure extends PolylineConnection { /** * set the connection's label string * - * @param strLabel + * @param image */ public void setImage(Image image) { if (textLabel == null) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java index 1f52470d6..74c3470a9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java @@ -348,9 +348,8 @@ public class PageflowLayoutManager { /** * update new pageflow's layout using the existing one. - * - * @param pageflow - * @param model + * @param newPageflow + * @param oldPageflow */ public void updatePageflowLayout(Pageflow newPageflow, Pageflow oldPageflow) { List notUpdatedNodes = new ArrayList(); @@ -414,7 +413,6 @@ public class PageflowLayoutManager { * Update pageflow node using the same node * * @param object - * @return */ private void updatePageflowNode(PageflowNode newNode, PageflowNode node) { newNode.setX(node.getX()); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java index 379d526a7..d0fe7c62e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java @@ -252,7 +252,6 @@ public interface PageflowElement extends EObject { * * @return the value of the '<em>Reference Link</em>' attribute. * @see #setReferenceLink(String) - * @see pageflow.PageflowPackage#getPageflowElement_ReferenceLink() * @model default="" dataType="org.eclipse.emf.ecore.xml.type.String" * extendedMetaData="kind='attribute' name='referenceLink'" * @generated @@ -260,7 +259,7 @@ public interface PageflowElement extends EObject { String getReferenceLink(); /** - * Sets the value of the '{@link pageflow.PageflowElement#getReferenceLink <em>Reference Link</em>}' + * Sets the value of the '{@link PageflowElement#getReferenceLink() <em>Reference Link</em>}' * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @param value diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java index 642a92b9a..5d5f57a1f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java @@ -34,7 +34,7 @@ import org.eclipse.emf.common.util.EList; * </ul> * </p> * - * @see org.eclipse.jst.jsf.facesconfig.ui.org.eclipse.jst.jsf.facesconfig.editor.pageflow.model.model.PageflowPackage#getPFLink() + * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink() * @model * @generated */ @@ -137,7 +137,6 @@ public interface PageflowLink extends PageflowElement { * <!-- end-user-doc --> * @return the value of the '<em>Smallicon</em>' attribute. * @see #setSmallicon(String) - * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Smallicon() * @model * @generated */ @@ -163,7 +162,6 @@ public interface PageflowLink extends PageflowElement { * <!-- end-user-doc --> * @return the value of the '<em>Largeicon</em>' attribute. * @see #setLargeicon(String) - * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Largeicon() * @model * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java index 6d54c3189..72e08e6f8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java @@ -62,7 +62,7 @@ public abstract class ReferenceElement { * The fragment path of a node. * * @param object - * @return + * @return the path */ public static String resolvePath(EObject object) { if (object != null) { @@ -83,7 +83,7 @@ public abstract class ReferenceElement { * Resolve each referenced data's path and combine the result into one * string, the path will be seperated with '|'. * - * @return + * @return the resolved string */ public String resolveReferenceString() { String result = ""; @@ -99,7 +99,7 @@ public abstract class ReferenceElement { /** * The EMF paths of all referenced elements. * - * @return + * @return the list of resolved paths for the data elements */ public List getPaths() { List paths = new ArrayList(); @@ -112,7 +112,7 @@ public abstract class ReferenceElement { /** * The facesconfig elements that are referenced. * - * @return + * @return the list of elements */ public List getData() { return data; @@ -142,7 +142,7 @@ public abstract class ReferenceElement { * Return a pageflow property's value with referenced faces-config element. * * @param eFeature - * @return + * @return the value for eFeature */ abstract public Object get(int eFeature); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java index fb52d250b..7ebd1e133 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java @@ -324,7 +324,7 @@ public class GeneralViewSection implements ISection, * * @param part * the input part - * @param pageRecord + * @param rec * a page record for the part */ protected void doDestroyPage(IWorkbenchPart part, PageRec rec) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java index 6382d9c8e..37d902d6c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java @@ -153,7 +153,7 @@ public abstract class AbstractEditPartSection extends AbstractPropertySection { /** * get the <code>CommandStack</code> * - * @return + * @return the command stack */ public CommandStack getCommandStack() { return commandStack; @@ -162,7 +162,7 @@ public abstract class AbstractEditPartSection extends AbstractPropertySection { /** * get the property source registered for current editpart * - * @return + * @return the property source */ public IPropertySource getPropertySource() { return propertySource; @@ -172,7 +172,7 @@ public abstract class AbstractEditPartSection extends AbstractPropertySection { * get the property's EMF featureID based on property name. * * @param propertyName - * @return + * @return the feature id for propertyName */ protected Object getFeatureID(String propertyName) { if (editPart != null && !(editPart.getModel() instanceof EObject)) { @@ -196,9 +196,7 @@ public abstract class AbstractEditPartSection extends AbstractPropertySection { } /** - * get the property registry - * - * @return + * @return the property registry */ protected Map getPropertyRegistry() { if (propertyRegistry == null) { @@ -210,7 +208,7 @@ public abstract class AbstractEditPartSection extends AbstractPropertySection { /** * get the input edit part * - * @return + * @return the input */ public Object getInput() { return editPart; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java index c1167f652..87d191e2a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java @@ -76,13 +76,8 @@ public class EditorGroup extends AbstractEditPartGroup { } - /* - * (non-Javadoc) - * - * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields() - */ /** - * @param _provider + * @param elem */ public void setPropertyProvider(Pageflow elem) { pageflow = elem; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java index e59f877dc..7b0e90bb5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java @@ -850,7 +850,7 @@ public class FC2PFTransformer extends AdapterImpl { * * @param fromViewID - * page's from-view-id - * @return + * @return the page flow page */ public PageflowPage createPFPage(String fromViewID) { PageflowPage page = PageflowFactory.eINSTANCE.createPFPage(); @@ -865,11 +865,8 @@ public class FC2PFTransformer extends AdapterImpl { /** * update pageflow model according to the face-config model * - * @param pageflow - - * pageflow model - * @param facesConfig - - * face-config model * @author sfshi + * @return true if new rules were added */ public boolean updatePageflowModelFromEMF() { if (pageflow != null && facesConfig != null) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java index 50ae29c9a..a1e3c645b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java @@ -40,6 +40,7 @@ public class EditPartMarkerUtil { * * @param model - * the emf model related with edit part + * @throws CoreException */ public static void removeAllMarkers(EObject model) throws CoreException { IResource resource = getResource(model); @@ -108,11 +109,9 @@ public class EditPartMarkerUtil { /** * Create a problem marker. * - * @param part - - * the target editpart. It can be null, then the editpart will - * not be updated. * @param model - * the model related with this edit part. + * @param sMarkerType * @param severity - * the problem severity, one of IMarker.SEVERITY_ERROR, * IMarker.SEVERITY_WARNING or IMarker.SEVERITY_INFO @@ -145,17 +144,10 @@ public class EditPartMarkerUtil { /** * Removes a specific problem marker type with the given severity. * - * @param part - - * the target editpart. It can be null, then the editpart will - * not be updated. * @param model - * the model related with this edit part. * @param sMarkerType - * the marker type, either IMarker.PROBLEM or IMarker.TASK - * @param iSeverity - - * severity/priority: if sMarkerType is IMarker.PROBLEM, then - * this value is one of the PROBLEM severities; if sMarkerType is - * IMarker.TASK, this is a task priority. * @throws CoreException * passed on from IResource.findMarkers() */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java index 70b7c423e..0954c3c12 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java @@ -107,7 +107,7 @@ public class JSPDomAdapter { * http://java.sun.com/jsf/html -> "h" * * @param taglibURI - * @return + * @return the prefix */ public String getTagLibPrefix(String taglibURI) { String prefix = null; @@ -193,6 +193,9 @@ public class JSPDomAdapter { } + /** + * signal we are done with the model + */ public void releaseModel() { if (model != null) { model.releaseFromRead(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java index 36c5bc21c..a50fbd191 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java @@ -42,7 +42,8 @@ public class JSPUtil { * * @param model * @param uri - * @return + * @param defaultPrefix + * @return the prefix if model has one or the default */ public static String getOrCreatePrefix(IDOMModel model, String uri, String defaultPrefix) { @@ -82,6 +83,11 @@ public class JSPUtil { return null; } + /** + * @param model + * @param suggestion + * @return the unsued prefix + */ public static String findUnusedPrefix(IDOMModel model, String suggestion) { if (suggestion == null) suggestion = "p"; @@ -108,7 +114,7 @@ public class JSPUtil { * * @param model * @param prefix - * @return + * @return the uri corresponding to the prefix */ public static String findURIForPrefix(IDOMModel model, String prefix) { if (prefix == null || model == null) @@ -134,6 +140,7 @@ public class JSPUtil { /** * get the action list in the jsp file + * @param jspFileName * * @return - action list */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java index d2431d60c..8da99bf53 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java @@ -32,6 +32,7 @@ import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage; * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage * @generated */ +// FIXME: this appears to be a dead class. public class PageflowAdapterFactory extends AdapterFactoryImpl { /** * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -177,13 +178,11 @@ public class PageflowAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFAction <em>PF Action</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that * we can easily ignore cases; it's useful to ignore a case when inheritance * will catch all the cases anyway. <!-- end-user-doc --> * * @return the new adapter. - * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFAction * @generated */ public Adapter createPFActionAdapter() { @@ -205,13 +204,11 @@ public class PageflowAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFBegin <em>PF Begin</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that * we can easily ignore cases; it's useful to ignore a case when inheritance * will catch all the cases anyway. <!-- end-user-doc --> * * @return the new adapter. - * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFBegin * @generated */ public Adapter createPFBeginAdapter() { @@ -219,13 +216,11 @@ public class PageflowAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFEnd <em>PF End</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that * we can easily ignore cases; it's useful to ignore a case when inheritance * will catch all the cases anyway. <!-- end-user-doc --> * * @return the new adapter. - * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFEnd * @generated */ public Adapter createPFEndAdapter() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java index 2f2e44b98..e09795a11 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java @@ -74,11 +74,11 @@ public class PageflowModelManager { } /** - * Returns the resource containing the pageflow. Uses lazy initialization. + * Uses lazy initialization. * * @param path - * pageflow file name - * @return + * @return the resource containing the pageflow */ public Resource getResource(IPath path) { if (resourcePageflow == null) { @@ -92,9 +92,8 @@ public class PageflowModelManager { } /** - * Gets the top level pageflow model. * - * @return + * @return the top level pageflow model */ public Pageflow getModel() { if (null == pageflow) { @@ -230,10 +229,8 @@ public class PageflowModelManager { } /** - * found page node according the web path. - * * @param webPath - * @return + * @return found page node according the web path. */ public PageflowPage foundPage(String webPath) { PageflowPage page = null; @@ -264,7 +261,7 @@ public class PageflowModelManager { * @param pathFacesConfig - * faces-config file path. * - * @return + * @return the ipath */ public static IPath makePageflowPath(IPath pathFacesConfig) { IPath pageflowPath; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java index e3e14f5d6..944ee4460 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java @@ -25,7 +25,7 @@ import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage; /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance - * hierarchy. It supports the call {@link #doSwitch doSwitch(object)} to invoke + * hierarchy. It supports the call {@link #doSwitch(EObject)} to invoke * the <code>caseXXX</code> method for each class of the model, starting with * the actual class of the object and proceeding up the inheritance hierarchy * until a non-null result is returned, which is the result of the switch. <!-- diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java index 61b948a8f..42e49e776 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java @@ -43,7 +43,7 @@ public class PageflowValidation { /** * get the singleton instance of pageflow validation * - * @return + * @return the singleton instance of pageflow validation */ public static PageflowValidation getInstance() { if (instance == null) { @@ -154,7 +154,7 @@ public class PageflowValidation { * * @param pageflow * @param page - * @return + * @return true if page exists (?) */ public boolean isExistedPage(Pageflow pageflow, PageflowPage page) { if (pageflow == null || page == null || page.getPath() == null) { @@ -169,7 +169,7 @@ public class PageflowValidation { * * @param pageflow * @param pagePath - * @return + * @return true if pageflow's path is equal to pagePath */ public boolean isExistedPage(Pageflow pageflow, String pagePath) { if (pageflow == null || pagePath == null) { @@ -199,8 +199,8 @@ public class PageflowValidation { * the form of /foldername/* (it contains the folder), the folder should be * existed. * - * @param element - * @return + * @param page + * @return the notify message for page */ public String getNotifyMessage(PageflowPage page) { String errorMessage = null; @@ -269,7 +269,7 @@ public class PageflowValidation { * The return will be beanName. * * @param actionEL - * @return + * @return the managed bean name */ public static String getManagedBeanforAction(String actionEL) { String managedBeanName = null; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java index 37e3fe863..2dbcbd853 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java @@ -837,10 +837,10 @@ public class BaseNodeFigure extends Figure implements IBaseFigure { * This method is used to set it. Passing a null or zero-length string will * remove the tool tip * - * @param description + * @param text * the description to use for this node's tool tip * - * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText(java.lang.String) + * @see IBaseFigure#setToolTipText(java.lang.String) */ public void setToolTipText(String text) { baseFigure.setToolTipText(text); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java index f44871def..6ddceb61f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java @@ -296,7 +296,7 @@ public class CompoundNodeFigure extends BaseNodeFigure implements } /** - * @return + * @return the window figure */ public WindowFigure getWindowFigure() { return windowFigure; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java index 9252af1fd..9c06a6813 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java @@ -148,7 +148,8 @@ public class IconFigure extends Label implements IBaseFigure { } /** - * @param s + * @param name + * @param icon */ public IconFigure(String name, Image icon) { super(name, icon); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java index 27af4754d..70b72e212 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java @@ -31,7 +31,7 @@ import org.eclipse.draw2d.geometry.Rectangle; * Apparently there is a bug in the GEF XYLayout class because it does not * observe visibility. * - * @see AbstractLayout.isObservingVisibility() + * @see org.eclipse.draw2d.AbstractLayout#isObservingVisibility() */ public class ObserveVisibleXYLayout extends FreeformLayout { protected Dimension calculatePreferredSize(IFigure f, int wHint, int hHint) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java index 01e0abd9e..81114276d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java @@ -291,8 +291,8 @@ public class TabbedTitleBarBorder extends SchemeBorder { /** * Calculates and returns the Insets for this border. * - * @param pane - * the pane on which Insets calculations are based + * @param figure + * the figure on which Insets calculations are based * @return the calculated Insets * @since 2.0 */ @@ -314,7 +314,7 @@ public class TabbedTitleBarBorder extends SchemeBorder { } /** - * @see Border#paint(IFigure, Graphics, Insets) + * @see org.eclipse.draw2d.Border#paint(IFigure, Graphics, Insets) */ public void paint(IFigure figure, Graphics g, Insets in) { if (!visible) diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java index c7935cae5..9e8ce1356 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java @@ -84,11 +84,10 @@ public class TabbedWindowBorder extends FrameBorder { * Paints the border using the information in the set Scheme and the * inputs given. Side widths are determined by the number of colors in * the Scheme for each side. - * - * @param graphics + * @param comp + * the composit whose rect should be used for the inset bounds + * @param gc * the graphics object - * @param fig - * the figure this border belongs to * @param insets * the insets * @param tl diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java index 389fbdd10..8d4748938 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java @@ -73,10 +73,10 @@ public abstract class AbstractFacesConfigSection extends SectionPart implements /** * Constructor with help option. - * - * @param editorId - * id of the editor this page is for. + + * @param parent * @param managedForm + * @param page * @param toolkit * @param helpContextId * @param helpTooltip @@ -154,7 +154,7 @@ public abstract class AbstractFacesConfigSection extends SectionPart implements * contents in the section * * @param container - * @param toolkit + * @param toolkit_ */ protected abstract void createContents(Composite container, FormToolkit toolkit_); @@ -203,9 +203,7 @@ public abstract class AbstractFacesConfigSection extends SectionPart implements } /** - * get the page that this section lies in. - * - * @return + * @return the page that this section lies in. */ public IFacesConfigPage getPage() { return page; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java index 54cde38c2..34b51e9f0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java @@ -34,6 +34,9 @@ import org.eclipse.ui.forms.widgets.FormToolkit; public abstract class AbstractOverviewSection extends AbstractFacesConfigSection { + /** + * the common table viewer used for the contents + */ protected TableViewer tableViewer; private String targetPageID; @@ -100,7 +103,8 @@ public abstract class AbstractOverviewSection extends /** * - * @return + * @param container + * @return the table */ abstract protected Table createTable(Composite container); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java index 3f58d4984..cdc56f643 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java @@ -88,7 +88,7 @@ public class ApplicationSection extends OthersPageBaseSection { /** * Create an object which is instance of <code>applicationChildClass</code>. * - * @return + * @return the child class object */ public EObject createApplicationChildObject() { String textValue = null; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java index a150a60e8..551b85f95 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java @@ -41,8 +41,6 @@ public class ComponentMasterSection extends FacesConfigMasterSection { * @param managedForm * @param toolkit * @param page - * @param helpContextId - * @param helpTooltip */ public ComponentMasterSection(Composite parent, IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java index 887124630..054fff77c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java @@ -40,8 +40,6 @@ public class ConverterMasterSection extends FacesConfigMasterSection { * @param managedForm * @param toolkit * @param page - * @param helpContextId - * @param helpTooltip */ public ConverterMasterSection(Composite parent, IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java index cb7ba57a6..baa845c72 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java @@ -49,7 +49,7 @@ public abstract class FacesConfigMasterSection extends AbstractFacesConfigSectio private StructuredViewer structuredViewer; - protected Button removeButton; + private Button removeButton; /** * @@ -85,7 +85,7 @@ public abstract class FacesConfigMasterSection extends AbstractFacesConfigSectio * * @param parent * @param toolkit - * @return + * @return the structured viewer */ protected StructuredViewer createViewer(Composite parent, FormToolkit toolkit) { @@ -151,14 +151,14 @@ public abstract class FacesConfigMasterSection extends AbstractFacesConfigSectio } }); - removeButton = toolkit.createButton(operationContainer, - EditorMessages.UI_Button_Remove, SWT.PUSH); + setRemoveButton(toolkit.createButton(operationContainer, + EditorMessages.UI_Button_Remove, SWT.PUSH)); gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); gd.grabExcessHorizontalSpace = false; - removeButton.setLayoutData(gd); - removeButton.addSelectionListener(new SelectionAdapter() { + getRemoveButton().setLayoutData(gd); + getRemoveButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { removeButtonSelected(e); } @@ -208,7 +208,7 @@ public abstract class FacesConfigMasterSection extends AbstractFacesConfigSectio IStructuredSelection ssel = (IStructuredSelection) structuredViewer .getSelection(); - removeButton.setEnabled(!ssel.isEmpty()); + getRemoveButton().setEnabled(!ssel.isEmpty()); } /** @@ -293,7 +293,7 @@ public abstract class FacesConfigMasterSection extends AbstractFacesConfigSectio /** * get the viewer. * - * @return + * @return the viewer */ public StructuredViewer getStructuredViewer() { return structuredViewer; @@ -303,8 +303,18 @@ public abstract class FacesConfigMasterSection extends AbstractFacesConfigSectio * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) */ public void selectionChanged(SelectionChangedEvent event) { - // TODO Auto-generated method stub super.selectionChanged(event); updateButtons(); } + + private void setRemoveButton(Button removeButton) { + this.removeButton = removeButton; + } + + /** + * @return the remove button + */ + protected Button getRemoveButton() { + return removeButton; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java index 2ca34293f..fef6d45d1 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java @@ -76,9 +76,7 @@ public class FactorySection extends OthersPageBaseSection { } /** - * Create an object which is instance of <code>factoryChildClass</code>. - * - * @return + * @return an new object which is instance of <code>factoryChildClass</code>. */ public EObject createFactoryChildObject() { String superType = ModelUtil.getSuperType(factoryChildClass); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java index f3f928667..5c5b7c544 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java @@ -27,9 +27,7 @@ public interface IDialogFieldGroup { void setInput(Object newInput); /** - * get the input of this section - * - * @return + * @return the input of this section */ Object getInput(); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java index f43197c27..4fb65dcd2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java @@ -27,9 +27,7 @@ public interface IFacesConfigSection { void setInput(Object newInput); /** - * get the input of this section - * - * @return + * @return the input of this section */ Object getInput(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java index c6e3fb20d..db1dcb425 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java @@ -72,9 +72,10 @@ public class InitializationSection extends AbstractFacesConfigSection { private int currentPageIndex = 0; /** + * @param parent * @param managedForm + * @param page * @param toolkit - * @param editor */ public InitializationSection(Composite parent, IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java index d75ba3537..1f623822a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java @@ -95,7 +95,7 @@ public class ListEntriesEditGroup extends DialogFieldGroup implements private List selectionChangedListeners = new ArrayList(); /** - * @param propertyRecorder + * @param section */ public ListEntriesEditGroup(AbstractFacesConfigSection section) { super(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java index 31450a2e3..518364884 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java @@ -113,7 +113,7 @@ public class LocaleConfigSection extends ApplicationSection implements * Pop up a dialog for user to select a locale string, then create a * <supported-locale> element with the string as value. * - * @return + * @return the supported locale object */ public SupportedLocaleType createSupportedLocaleObject() { ArrayList locales = new ArrayList(); diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java index 025dc0c14..eb3ba4f10 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java @@ -187,7 +187,7 @@ public class ManagedBeanMasterSection extends FacesConfigMasterSection { isRemoveEnable = true; } } - removeButton.setEnabled(isRemoveEnable); + getRemoveButton().setEnabled(isRemoveEnable); } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java index 1e355d939..1d1d31243 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java @@ -48,13 +48,15 @@ import org.eclipse.ui.forms.widgets.FormToolkit; */ public abstract class OthersPageBaseSection extends AbstractFacesConfigSection { + /** + * Table viewer for all sections based on this calss + */ protected TableViewer tableViewer; - protected Button removeButton; + private Button removeButton; /** * - * @param componentClass * @param parent * @param managedForm * @param page @@ -69,8 +71,6 @@ public abstract class OthersPageBaseSection extends AbstractFacesConfigSection { } /** - * - * @param componentClass * @param parent * @param managedForm * @param page @@ -101,7 +101,7 @@ public abstract class OthersPageBaseSection extends AbstractFacesConfigSection { * a new type tableViewer. for example CheckboxTableViewer. * * @param parent - * @return + * @return the table viewer for this section */ protected TableViewer createTableViewer(Composite parent) { return new TableViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL @@ -170,15 +170,15 @@ public abstract class OthersPageBaseSection extends AbstractFacesConfigSection { } }); - removeButton = toolkit.createButton(operationContainer, - EditorMessages.UI_Button_Remove, SWT.PUSH); + setRemoveButton(toolkit.createButton(operationContainer, + EditorMessages.UI_Button_Remove, SWT.PUSH)); - removeButton.setEnabled(true); + getRemoveButton().setEnabled(true); gd = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING); gd.grabExcessHorizontalSpace = false; - removeButton.setLayoutData(gd); - removeButton.addSelectionListener(new SelectionListener() { + getRemoveButton().setLayoutData(gd); + getRemoveButton().addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { removeButtonSelected(e); } @@ -192,6 +192,10 @@ public abstract class OthersPageBaseSection extends AbstractFacesConfigSection { abstract void addButtonSelected(SelectionEvent e); + /** + * Respond to selection of the remove button + * @param e + */ protected void removeButtonSelected(SelectionEvent e) { IStructuredSelection ssel = StructuredSelection.EMPTY; ISelection selection = getSelection(); @@ -225,10 +229,13 @@ public abstract class OthersPageBaseSection extends AbstractFacesConfigSection { return tableViewer.getSelection(); } + /** + * update all buttons with the current selection + */ protected void updateButtons() { - if (!removeButton.isDisposed()) { + if (!getRemoveButton().isDisposed()) { IStructuredSelection ssel = (IStructuredSelection) getSelection(); - removeButton.setEnabled(!ssel.isEmpty()); + getRemoveButton().setEnabled(!ssel.isEmpty()); } } @@ -291,4 +298,18 @@ public abstract class OthersPageBaseSection extends AbstractFacesConfigSection { super.selectionChanged(event); updateButtons(); } + + /** + * @param removeButton + */ + protected void setRemoveButton(Button removeButton) { + this.removeButton = removeButton; + } + + /** + * @return the button widget + */ + protected Button getRemoveButton() { + return removeButton; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java index 356c87ef5..c19346d49 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java @@ -35,8 +35,9 @@ public class OverviewGeneralSection extends AbstractFacesConfigSection { /** * @param parent + * @param managedForm + * @param page * @param toolkit - * @param style */ public OverviewGeneralSection(Composite parent, IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java index 7da706b10..3e8e20f17 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java @@ -40,8 +40,6 @@ public class RenderkitMasterSection extends FacesConfigMasterSection { * @param managedForm * @param toolkit * @param page - * @param helpContextId - * @param helpTooltip */ public RenderkitMasterSection(Composite parent, IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java index 135367387..034e70f52 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java @@ -40,8 +40,6 @@ public class ValidatorMasterSection extends FacesConfigMasterSection { * @param managedForm * @param toolkit * @param page - * @param helpContextId - * @param helpTooltip */ public ValidatorMasterSection(Composite parent, IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java index a0496b014..59283e3ad 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java @@ -34,9 +34,15 @@ import org.eclipse.jst.jsf.common.ui.internal.utils.JavaModelUtil; * @version */ public final class JavaBeanUtils { - public static final String JAVA_UTIL_LIST = "java.util.List"; + /** + * fully qualified name of a List + */ + private static final String JAVA_UTIL_LIST = "java.util.List"; - public static final String JAVA_UTIL_MAP = "java.util.Map"; + /** + * fully qualifed name of a Map + */ + private static final String JAVA_UTIL_MAP = "java.util.Map"; /** * @@ -244,7 +250,6 @@ public final class JavaBeanUtils { * @return - True means the property name is valid bean's property, * otherwise, not. * - * @throws JavaModelException */ public static boolean isBeanProperty(IType baseType, String propertyName) { @@ -262,7 +267,6 @@ public final class JavaBeanUtils { * @param propertyName * @return - can be <b>null</b>, if not found * - * @throws JavaModelException */ public static IType getBeanPropertyType(IType baseType, String propertyName) { if (baseType == null || !baseType.exists() || propertyName == null) { @@ -496,7 +500,7 @@ public final class JavaBeanUtils { * set the first character into low case. * * @param str - * @return + * @return str with the first char lower cased */ public static String toLowCaseFirstChar(String str) { // change the first alphabet to lowcase. @@ -514,7 +518,7 @@ public final class JavaBeanUtils { * set the first character into low case. * * @param str - * @return + * @return str with the first char upper-cased */ public static String toUpperCaseFirstChar(String str) { // change the first alphabet to lowcase. @@ -661,7 +665,7 @@ public final class JavaBeanUtils { /** * Creates an array of bean properties * - * @param classType + * @param type * @param methods * * @return - the array of java bean properties. diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java index 6a7fdb963..2983664a0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java @@ -90,7 +90,7 @@ public class JavaClassUtils { * check whether the method is public or not. * * @param method - * @return + * @return true if method is public */ public static boolean isPublicMethod(IMethod method) { int accessFlags = 0; @@ -132,7 +132,6 @@ public class JavaClassUtils { * @param methods - * the IMethod array to examine * @return boolean - true, if method is a constructor - * @throws JavaModelException */ public static boolean hasPublicConstructor(IMethod[] methods) { for (int m = 0; m < methods.length; m++) { @@ -160,9 +159,7 @@ public class JavaClassUtils { * Determines if a datatype is primitive type or part of java.lang or * java.util package. If not, it is considered to be a bean reference * - * @param jProject - - * the Java Project - * @param cUnit - + * @param classType - * the parent class compilation unit * @param signatureName - * the datatype of the property @@ -194,7 +191,7 @@ public class JavaClassUtils { * get the type from the input class name * * @param project - * @param text + * @param className * @return - can be null. */ public static IType getType(IProject project, String className) { @@ -218,6 +215,7 @@ public class JavaClassUtils { * open the type in the editor. * * @param type + * @return true if the type could opened in an editor */ public static boolean openType(IType type) { if (type == null || !type.exists()) { @@ -320,6 +318,7 @@ public class JavaClassUtils { * @param paramTypes * The type signatures of the parameters e.g. * <code>{"QString;","I"}</code> + * @param curr * @return Returns <code>true</code> if the method has the given name and * parameter types and constructor state. */ @@ -346,7 +345,6 @@ public class JavaClassUtils { /** * get methods for the class Type including its super class * - * @param jProject * @param classType * @return - can be null * @throws JavaModelException @@ -397,7 +395,7 @@ public class JavaClassUtils { * resolve and get the qualified name for the incomplete typename * * @param classType - * @param typeName + * @param signatureName * @return - at least equal to Signature.toString(signatureName). */ public static String getQualifiedTypeNameInTypeHierarchy(IType classType, @@ -493,7 +491,7 @@ public class JavaClassUtils { * @param superClass - * fully qualified name of super class * - * @return + * @return true if subClass is a sub of superClass */ public static boolean isSubClassOf(IJavaProject jProject, String subClass, String superClass) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java index 7f6bf469a..ecfe36df3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java @@ -29,6 +29,7 @@ public class ManagedBeanUtil { /** * Determines if the new bean to be added is already a member of the * configuration set. + * @param project * * @param beanName - * The name of the bean being added diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java index 09ff8683b..1a0030af4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java @@ -29,7 +29,8 @@ public class ModelUtil { * * @param key * the EClass object of the application child. - * @return + * @return the expected super type for a particular element + * TODO: could make common with the faces-config validator */ public static String getSuperType(Object key) { if (key == FacesConfigPackage.eINSTANCE.getActionListenerType()) { @@ -147,6 +148,10 @@ public class ModelUtil { return (buffer == null) ? str : buffer.toString(); } + /** + * @param str + * @return removes XML/HTML escaped characters from str. + */ public static String unEscapeEntities(String str) { if (isEmptyString(str)) { return ""; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java index f433e9f85..e0bc3a127 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java @@ -36,6 +36,7 @@ public class WebrootUtil extends * "/projectname/webroot/filename.jsp", or "/projectname/webroot/folder". * The project information should be removed from project path, e.g, * "/filename.jsp" or "/folder/*"; + * @param model * * @param strPath - * the web path @@ -68,11 +69,9 @@ public class WebrootUtil extends } /** - * get the current resource according to EMF model - * * @param model - * emf model - * @return + * @return the current resource according to EMF model */ static public IResource getResource(EObject model) { IResource resource = null; @@ -98,7 +97,7 @@ public class WebrootUtil extends * * @param model - * emf model - * @return + * @return the current project according to EMF model */ static public IProject getProject(EObject model) { IProject project = null; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java index 7fed98fa3..3875e8a7f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java @@ -220,7 +220,7 @@ public class ManagedBeanClassSelectionPage extends WizardPage { /** * create a new java class or not * - * @return + * @return true if the create new java class radio button is selected */ public boolean isCreateNewJavaClass() { return createRadioButton.getSelection(); @@ -238,6 +238,9 @@ public class ManagedBeanClassSelectionPage extends WizardPage { return searchedType; } + /** + * @return the class name + */ public String getClassName() { return className; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java index ebb8e648a..4226952ae 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java @@ -45,13 +45,13 @@ public class NewManagedBeanWizard extends Wizard implements ISummaryDataSource { private ManagedBeanPropertyPage managedBeanPropertyPage; - public String managedBeanName; + private String managedBeanName; - public String managedBeanScope; + private String managedBeanScope; - public String managedBeanClass; + private String managedBeanClass; - public String managedBeanDescription; + private String managedBeanDescription; private IProject project; @@ -152,7 +152,7 @@ public class NewManagedBeanWizard extends Wizard implements ISummaryDataSource { } /** - * @return + * @return the suggested bean name */ public String getSuggestedBeanName() { return suggestedBeanName; @@ -170,7 +170,7 @@ public class NewManagedBeanWizard extends Wizard implements ISummaryDataSource { } /** - * @return + * @return the default scope value */ public String getDefaultScope() { return defaultScope; @@ -185,18 +185,30 @@ public class NewManagedBeanWizard extends Wizard implements ISummaryDataSource { this.defaultScope = defaultScope; } + /** + * @return the class name + */ public String getManagedBeanClass() { return managedBeanClass; } + /** + * @return the bean description + */ public String getManagedBeanDescription() { return managedBeanDescription; } + /** + * @return the managed bean's symbolic name + */ public String getManagedBeanName() { return managedBeanName; } + /** + * @return the managed bean's scope + */ public String getManagedBeanScope() { return managedBeanScope; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java index 0aeed247f..a62ede967 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java @@ -135,11 +135,11 @@ public class SummaryPage extends WizardPage * @param visible - * the visible state of the page */ - public void setVisible( boolean value ) + public void setVisible( boolean visible ) { - super.setVisible( value ); + super.setVisible( visible ); - if ( value == true ) + if ( visible == true ) { loadSummaryData(); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..555e7217e --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,77 @@ +#Fri Apr 06 22:45:35 PDT 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=error +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.4 diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..82eb6c152 --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,3 @@ +#Fri Apr 06 18:25:15 PDT 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibrariesPreferencePage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibrariesPreferencePage.java index 9724380b0..3948644bc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibrariesPreferencePage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibrariesPreferencePage.java @@ -209,10 +209,6 @@ public class JSFLibrariesPreferencePage extends PreferencePage implements IWorkb // will never happen } - public boolean isDeleted(Object element) { - return false; - } - public void dispose() { // do nothing } @@ -268,10 +264,19 @@ public class JSFLibrariesPreferencePage extends PreferencePage implements IWorkb } + /** + * Respond to a list selection event + * + * @param event + */ protected void doListSelected(SelectionChangedEvent event) { updateButtonState(); } + /** + * Respond to a double click event by opening the edit dialog + * @param event + */ protected void doDoubleClick(DoubleClickEvent event) { openJSFLibraryEditDialog(tv.getTree().getSelection()[0]); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryContainerWizardPage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryContainerWizardPage.java index 7dd6eebe8..0bb83ae75 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryContainerWizardPage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryContainerWizardPage.java @@ -104,9 +104,9 @@ public class JSFLibraryContainerWizardPage extends WizardPage implements /* (non-Javadoc) * @see org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension#initialize(org.eclipse.jdt.core.IJavaProject, org.eclipse.jdt.core.IClasspathEntry[]) */ - public void initialize(IJavaProject project, IClasspathEntry[] currentEntries) { + public void initialize(IJavaProject project, IClasspathEntry[] currentEntries_) { isJSFProject = false; - this.currentEntries = currentEntries; + this.currentEntries = currentEntries_; try { //check for faceted nature //NOTE: use of following constant produces warnings; this was known @@ -210,11 +210,11 @@ public class JSFLibraryContainerWizardPage extends WizardPage implements JSFLibrary lib = (JSFLibrary)lv.getCheckedElements()[0]; if (lib != null){ if (lib == getJSFLibraryForEdit(containerEntry)) + { return containerEntry; - else { - IPath path = new Path(JSFLibrariesContainerInitializer.JSF_LIBRARY_CP_CONTAINER_ID).append(new Path(lib.getID())); - entry = JavaCore.newContainerEntry(path, containerEntry.getAccessRules(), containerEntry.getExtraAttributes(),containerEntry.isExported()); } + IPath path = new Path(JSFLibrariesContainerInitializer.JSF_LIBRARY_CP_CONTAINER_ID).append(new Path(lib.getID())); + entry = JavaCore.newContainerEntry(path, containerEntry.getAccessRules(), containerEntry.getExtraAttributes(),containerEntry.isExported()); } } return entry; @@ -434,9 +434,9 @@ public class JSFLibraryContainerWizardPage extends WizardPage implements private JSFLibrary getJSFLibraryForEdit( - IClasspathEntry containerEntry) { + IClasspathEntry containerEntry_) { if (currentLib == null){ - String id = containerEntry.getPath().segment(1); + String id = containerEntry_.getPath().segment(1); currentLib = JSFLibraryRegistryUtil.getInstance().getJSFLibraryRegistry().getJSFLibraryByID(id); } return currentLib; diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryValidationListener.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryValidationListener.java index ffb05255d..dc0b40736 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryValidationListener.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryValidationListener.java @@ -7,7 +7,7 @@ package org.eclipse.jst.jsf.ui.internal.classpath; public interface JSFLibraryValidationListener { /** * Callback - * @param JSFLibraryValidationEvent + * @param e */ public void notifyValidation(JSFLibraryValidationEvent e); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizard.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizard.java index 6baaa3447..20c5e356a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizard.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizard.java @@ -64,8 +64,8 @@ public class JSFLibraryWizard extends Wizard implements INewWizard { /** * Constructor - * @see IMPLS - * @see NONIMPLS + * see IMPLS + * see NONIMPLS * @param libTypes */ public JSFLibraryWizard(int libTypes) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizardPage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizardPage.java index 019d67f4e..c84f07581 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizardPage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizardPage.java @@ -82,10 +82,11 @@ public class JSFLibraryWizardPage extends WizardPage { } - /* (non-Javadoc) - * @see org.eclipse.jdt.ui.wizards.IClasspathContainerPage#finish() + /** + * @return true if can finish */ - public boolean finish() { + public boolean finish() { + // TODO: dead? return true; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFImplLibraryCreationEvent.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFImplLibraryCreationEvent.java index d5774bef0..df3b0f1e3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFImplLibraryCreationEvent.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFImplLibraryCreationEvent.java @@ -23,6 +23,10 @@ public class JSFImplLibraryCreationEvent extends EventObject { private static final long serialVersionUID = 6390319185522362453L; private boolean isLibCreated; + /** + * @param source + * @param okClicked + */ public JSFImplLibraryCreationEvent(Object source, boolean okClicked) { super(source); this.isLibCreated = okClicked; diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControl.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControl.java index 5928bc0f0..422d26be5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControl.java @@ -139,6 +139,8 @@ public class JSFLibraryConfigControl extends Composite { if (_initing) return; SafeRunnable.run(new ISafeRunnable(){ public void handleException(Throwable exception) { + // TODO: should we perhaps do something here? + JSFUiPlugin.log(IStatus.ERROR, exception.getLocalizedMessage()); } public void run() throws Exception { for (Iterator it=getChangeListeners().iterator();it.hasNext();){ @@ -768,10 +770,6 @@ public class JSFLibraryConfigControl extends Composite { // will never happen } - public boolean isDeleted(Object element) { - return false; - } - public void dispose() { // do nothing } diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControlChangeEvent.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControlChangeEvent.java index 58bd7b1ee..97c50aa6a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControlChangeEvent.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControlChangeEvent.java @@ -11,7 +11,7 @@ public class JSFLibraryConfigControlChangeEvent { /** * Constructor - * @param java.util.EventObject + * @param ev */ public JSFLibraryConfigControlChangeEvent(EventObject ev){ this.event = ev; diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControlChangeListener.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControlChangeListener.java index 5aa451474..98cfa15cb 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControlChangeListener.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControlChangeListener.java @@ -8,7 +8,7 @@ package org.eclipse.jst.jsf.ui.internal.jsflibraryconfig; public interface JSFLibraryConfigControlChangeListener { /** * Callback method - * @param JSFLibraryConfigControlChangeEvent + * @param e */ public void changed(JSFLibraryConfigControlChangeEvent e); } diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..a92ec7bad --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,77 @@ +#Sat Apr 07 15:19:56 PDT 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.4 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=ignore +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=error +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.4 diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..82eb6c152 --- /dev/null +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,3 @@ +#Fri Apr 06 18:25:15 PDT 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/metadata/TaglibLocator.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/metadata/TaglibLocator.java index 554bc1441..b40a1115e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/metadata/TaglibLocator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/metadata/TaglibLocator.java @@ -30,8 +30,10 @@ public class TaglibLocator extends AbstractMetaDataLocator implements IPathSensi //project must be set to the current project context during locate only... should not be used when noifying observers private IProject project; private TaglibMetaDataSource source; - private String uri; - private boolean _notificationEventOccuring; + + // FIXME: unused + // private String uri; +// private boolean _notificationEventOccuring; public TaglibLocator(){ super(); @@ -40,7 +42,7 @@ public class TaglibLocator extends AbstractMetaDataLocator implements IPathSensi } public List/*<IMetaDataModelProvider>*/ locateMetaDataModelProviders(String uri) { - this.uri = uri; + // FIXME: unused this.uri = uri; List ret = new ArrayList(); CMDocument doc = null; |