From 4769819c17824a646f42385e2f0a11cceeb00108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 23 Dec 2025 09:59:22 +0200 Subject: [PATCH 1/2] Use generics in o.e.compare.examples.xml --- .../.settings/org.eclipse.jdt.core.prefs | 17 +- .../examples/xml/AbstractMatching.java | 13 +- .../xml/ChooseMatcherDropDownAction.java | 37 ++-- .../examples/xml/CreateNewIdMapAction.java | 31 ++- .../eclipse/compare/examples/xml/IdMap.java | 26 +-- .../compare/examples/xml/OrderedMatching.java | 25 ++- .../xml/XMLCompareAddIdMapDialog.java | 25 ++- .../xml/XMLCompareEditCopyIdMapDialog.java | 20 +- .../xml/XMLCompareEditMappingDialog.java | 6 +- .../xml/XMLCompareEditOrderedDialog.java | 6 +- .../xml/XMLComparePreferencePage.java | 179 ++++++++++-------- .../compare/examples/xml/XMLPlugin.java | 95 +++++----- .../examples/xml/XMLStructureCreator.java | 61 +++--- .../examples/xml/XMLStructureViewer.java | 58 +++--- 14 files changed, 310 insertions(+), 289 deletions(-) diff --git a/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs b/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs index d9036c978d6..e7baa1476ea 100644 --- a/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs +++ b/team/examples/org.eclipse.compare.examples.xml/.settings/org.eclipse.jdt.core.prefs @@ -13,9 +13,12 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning +org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 @@ -50,17 +53,20 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error +org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.memberOfDeprecatedTypeNotDeprecated=info org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore @@ -69,7 +75,7 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore @@ -88,10 +94,10 @@ org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariable org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore @@ -106,7 +112,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning @@ -125,6 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverridin org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=error org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java index 299f9ba6632..11d4ab03b1b 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -30,10 +30,11 @@ public abstract class AbstractMatching { protected static final int NO_ENTRY = -1;//value with which fDT elements are initialized protected static final String SIGN_ELEMENT= XMLStructureCreator.SIGN_ELEMENT; int[][] fDT;//Distance Table; 1st index from fNLeft, 2nd index from fNRight - ArrayList[][] fDT_Matchings;//Mathing entries of children for a match. 1st index from fNLeft, 2nd index from fNRight - Vector fNLeft; - Vector fNRight; - Vector fMatches; + ArrayList[][] fDT_Matchings;// Mathing entries of children for a match. 1st index from fNLeft, 2nd index + // from fNRight + Vector fNLeft; + Vector fNRight; + Vector fMatches; /* methods used for match */ @@ -97,7 +98,7 @@ protected int indexOfRN (XMLNode y) { } /* for testing */ - public Vector getMatches() { +public Vector getMatches() { return fMatches; } diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ChooseMatcherDropDownAction.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ChooseMatcherDropDownAction.java index 7f27dd6a47d..fac3255471a 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ChooseMatcherDropDownAction.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ChooseMatcherDropDownAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -13,12 +13,18 @@ *******************************************************************************/ package org.eclipse.compare.examples.xml; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Set; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.ActionContributionItem; +import org.eclipse.jface.action.IMenuCreator; import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.*; - -import org.eclipse.jface.action.*; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; /** @@ -53,14 +59,13 @@ public Menu getMenu(Control parent) { addActionToMenu(menu, new SelectMatcherAction(XMLStructureCreator.USE_UNORDERED, fViewer)); addActionToMenu(menu, new SelectMatcherAction(XMLStructureCreator.USE_ORDERED, fViewer)); new MenuItem(menu, SWT.SEPARATOR); - HashMap IdMaps = plugin.getIdMaps(); - HashMap IdMapsInternal = plugin.getIdMapsInternal(); + HashMap> IdMaps = plugin.getIdMaps(); + HashMap> IdMapsInternal = plugin.getIdMapsInternal(); - Set keySetIdMaps = IdMaps.keySet(); - Set keySetIdMapsInternal = IdMapsInternal.keySet(); + Set keySetIdMaps = IdMaps.keySet(); + Set keySetIdMapsInternal = IdMapsInternal.keySet(); ArrayList internalIdMapsAL= new ArrayList<>(); - for (Iterator iter_internal = keySetIdMapsInternal.iterator(); iter_internal.hasNext(); ) { - String idmap_name = (String)iter_internal.next(); + for (String idmap_name : keySetIdMapsInternal) { internalIdMapsAL.add(idmap_name); } Object[] internalIdMapsA= internalIdMapsAL.toArray(); @@ -71,15 +76,13 @@ public Menu getMenu(Control parent) { new MenuItem(menu, SWT.SEPARATOR); ArrayList userIdMapsAL= new ArrayList<>(); - for (Iterator iter_idmaps = keySetIdMaps.iterator(); iter_idmaps.hasNext(); ) { - String idmap_name = (String)iter_idmaps.next(); + for (String idmap_name : keySetIdMaps) { userIdMapsAL.add(idmap_name); } - HashMap OrderedElements= plugin.getOrderedElements(); - Set keySetOrdered= OrderedElements.keySet(); - for (Iterator iter_orderedElements= keySetOrdered.iterator(); iter_orderedElements.hasNext();) { - String idmap_name= (String) iter_orderedElements.next(); + HashMap> OrderedElements = plugin.getOrderedElements(); + Set keySetOrdered = OrderedElements.keySet(); + for (String idmap_name : keySetOrdered) { if (!keySetIdMaps.contains(idmap_name)) { userIdMapsAL.add(idmap_name); } diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/CreateNewIdMapAction.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/CreateNewIdMapAction.java index 3f52f9b6e9c..82e51598f97 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/CreateNewIdMapAction.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/CreateNewIdMapAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -13,7 +13,8 @@ *******************************************************************************/ package org.eclipse.compare.examples.xml; -import java.util.*; +import java.util.HashMap; +import java.util.Set; import org.eclipse.jface.action.Action; import org.eclipse.jface.window.Window; @@ -23,9 +24,9 @@ */ public class CreateNewIdMapAction extends Action { - private HashMap fIdMaps;// HashMap ( idname -> HashMap (signature -> id) ) - private HashMap fIdMapsInternal; - private HashMap fIdExtensionToName; + private HashMap> fIdMaps;// HashMap ( idname -> HashMap (signature -> id) ) + private HashMap> fIdMapsInternal; + private HashMap fIdExtensionToName; public CreateNewIdMapAction(XMLStructureViewer viewer) { setImageDescriptor(XMLPlugin.getDefault().getImageDescriptor("obj16/addidmap.gif")); //$NON-NLS-1$ @@ -37,19 +38,17 @@ public void run() { XMLPlugin plugin= XMLPlugin.getDefault(); fIdMapsInternal= plugin.getIdMapsInternal();//fIdMapsInternal is only read, not modified - fIdMaps = new HashMap(); - HashMap PluginIdMaps = plugin.getIdMaps(); - Set keySet = PluginIdMaps.keySet(); - for (Iterator iter = keySet.iterator(); iter.hasNext(); ) { - String key = (String) iter.next(); - fIdMaps.put(key, ((HashMap)PluginIdMaps.get(key)).clone()); + fIdMaps = new HashMap<>(); + HashMap> PluginIdMaps = plugin.getIdMaps(); + Set keySet = PluginIdMaps.keySet(); + for (String key : keySet) { + fIdMaps.put(key, new HashMap<>(PluginIdMaps.get(key))); } - fIdExtensionToName= new HashMap(); - HashMap PluginIdExtensionToName= plugin.getIdExtensionToName(); + fIdExtensionToName = new HashMap<>(); + HashMap PluginIdExtensionToName = plugin.getIdExtensionToName(); keySet= PluginIdExtensionToName.keySet(); - for (Iterator iter= keySet.iterator(); iter.hasNext(); ) { - String key= (String) iter.next(); + for (String key : keySet) { fIdExtensionToName.put(key, PluginIdExtensionToName.get(key)); } @@ -57,7 +56,7 @@ public void run() { XMLCompareAddIdMapDialog dialog= new XMLCompareAddIdMapDialog(XMLPlugin.getActiveWorkbenchShell(),idmap,fIdMaps,fIdMapsInternal,fIdExtensionToName,false); if (dialog.open() == Window.OK) { if (!fIdMaps.containsKey(idmap.getName())) { - fIdMaps.put(idmap.getName(),new HashMap()); + fIdMaps.put(idmap.getName(), new HashMap<>()); if (!idmap.getExtension().isEmpty()) fIdExtensionToName.put(idmap.getExtension(),idmap.getName()); XMLPlugin.getDefault().setIdMaps(fIdMaps,fIdExtensionToName,null,false); diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/IdMap.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/IdMap.java index 25173a76880..cef3df8b50a 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/IdMap.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/IdMap.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -22,9 +22,10 @@ public class IdMap { private String fName; private boolean fInternal; - private Vector fMappings; + private Vector fMappings; private String fExtension; - private ArrayList fOrdered;//contains Mapping elements for list of ordered entries (the children of these elements will be compared in ordered fashion) + private ArrayList fOrdered;// contains Mapping elements for list of ordered entries (the children of these + // elements will be compared in ordered fashion) /** * Creates an IdMap which represents an Id Mapping Scheme @@ -40,7 +41,7 @@ public IdMap(boolean internal) { * @param internal true if the IdMap is internal */ public IdMap(String name, boolean internal) { - this(name, internal, new Vector()); + this(name, internal, new Vector<>()); } /** @@ -49,7 +50,7 @@ public IdMap(String name, boolean internal) { * @param internal true if the IdMap is internal * @param mappings Vector of Mapping elements which represent the id mappings of this id mapping scheme */ - public IdMap(String name, boolean internal, Vector mappings) { + public IdMap(String name, boolean internal, Vector mappings) { this(name, internal, mappings, ""); //$NON-NLS-1$ } @@ -60,7 +61,7 @@ public IdMap(String name, boolean internal, Vector mappings) { * @param mappings Vector of Mapping elements which represent the id mappings of this id mapping scheme. * @param extension Optional extension to be associated with this id mapping scheme. */ - public IdMap(String name, boolean internal, Vector mappings, String extension) { + public IdMap(String name, boolean internal, Vector mappings, String extension) { this(name, internal, mappings, extension, null); } @@ -72,7 +73,8 @@ public IdMap(String name, boolean internal, Vector mappings, String extension) { * @param extension Optional extension to be associated with this id mapping scheme. * @param ordered Optional ArrayList of Mapping elements representing ordered entries. */ - public IdMap(String name, boolean internal, Vector mappings, String extension, ArrayList ordered) { + public IdMap(String name, boolean internal, Vector mappings, String extension, + ArrayList ordered) { fName = name; fInternal = internal; fMappings = mappings; @@ -108,11 +110,11 @@ public String getName() { return fName; } - public void setMappings(Vector mappings) { + public void setMappings(Vector mappings) { fMappings = mappings; } - public Vector getMappings() { + public Vector getMappings() { return fMappings; } @@ -131,10 +133,12 @@ public void setExtension(String extension) { public String getExtension() { return fExtension; } - public void setOrdered(ArrayList ordered) { + + public void setOrdered(ArrayList ordered) { fOrdered= ordered; } - public ArrayList getOrdered() { + + public ArrayList getOrdered() { return fOrdered; } diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/OrderedMatching.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/OrderedMatching.java index fddd29f0948..8535b30a5df 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/OrderedMatching.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/OrderedMatching.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -61,7 +61,7 @@ protected int orderedMath(XMLNode x, XMLNode y) { Object[] xc_elements= xc_elementsAL.toArray(); Object[] yc_elements= yc_elementsAL.toArray(); - ArrayList DTMatching= new ArrayList(); + ArrayList DTMatching = new ArrayList<>(); // Matching to be added to Entry in fDT_Matchings int distance= 0; //distance to be added to entry in fDT @@ -115,6 +115,7 @@ else if (yc_attrsAL.isEmpty()) } /* matches two trees according to paper "X-Diff", p. 16 */ + @SuppressWarnings("unchecked") @Override public void match( XMLNode LeftTree, @@ -122,14 +123,14 @@ public void match( boolean rightTreeIsAncestor, IProgressMonitor monitor) { - fNLeft= new Vector(); + fNLeft= new Vector<>(); //numbering LeftTree: Mapping nodes in LeftTree to numbers to be used as array indexes - fNRight= new Vector(); + fNRight= new Vector<>(); //numbering RightTree: Mapping nodes in RightTree to numbers to be used as array indexes numberNodes(LeftTree, fNLeft); numberNodes(RightTree, fNRight); fDT= new int[fNLeft.size()][fNRight.size()]; - fDT_Matchings= new ArrayList[fNLeft.size()][fNRight.size()]; + fDT_Matchings = new ArrayList[fNLeft.size()][fNRight.size()]; for (int i= 0; i < fDT.length; i++) { fDT[i]= new int[fNRight.size()]; for (int j= 0; j < fDT[0].length; j++) { @@ -139,13 +140,13 @@ public void match( dist(LeftTree, RightTree); // /* mark matchings on LeftTree and RightTree */ - fMatches= new Vector(); + fMatches = new Vector<>(); if (!LeftTree.getSignature().equals(RightTree.getSignature())) { //matching is empty } else { fMatches.add(new Match(LeftTree, RightTree)); for (int i_M= 0; i_M < fMatches.size(); i_M++) { - Match m= (Match) fMatches.elementAt(i_M); + Match m = fMatches.elementAt(i_M); if (!isLeaf(m.fx) && !isLeaf(m.fy)) { // if (fDT_Matchings[ indexOfLN(m.fx) ][ indexOfRN(m.fy) ] == null) // System.out.println("Error: ID not unique for " + m.fx.getId()); @@ -161,17 +162,15 @@ public void match( //end of Step2 /* Renumber Id of Nodes to follow Matches. Or for ancestor, copy over Id to ancestor */ if (rightTreeIsAncestor) { - for (ListIterator it_M= fMatches.listIterator(); it_M.hasNext();) { - Match m= (Match) it_M.next(); + for (ListIterator it_M = fMatches.listIterator(); it_M.hasNext();) { + Match m= it_M.next(); if (m.fx != null && m.fy != null) m.fy.setId(m.fx.getId()); } } else { int newId= 0; - for (ListIterator it_M= fMatches.listIterator(); - it_M.hasNext(); - newId++) { - Match m= (Match) it_M.next(); + for (ListIterator it_M = fMatches.listIterator(); it_M.hasNext(); newId++) { + Match m= it_M.next(); if (m.fx != null) m.fx.setId(Integer.toString(newId)); if (m.fy != null) diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java index e45554680a7..5f822f72c05 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -14,15 +14,18 @@ package org.eclipse.compare.examples.xml; import java.text.MessageFormat; -import java.util.*; +import java.util.HashMap; +import org.eclipse.compare.examples.xml.ui.StatusDialog; +import org.eclipse.compare.examples.xml.ui.StatusInfo; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.*; - -import org.eclipse.compare.examples.xml.ui.StatusDialog; -import org.eclipse.compare.examples.xml.ui.StatusInfo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; /** * This class is used to add or edit an ID Mapping Scheme @@ -30,15 +33,17 @@ public class XMLCompareAddIdMapDialog extends StatusDialog { private final IdMap fIdMap; - private final HashMap fIdMaps; - private final HashMap fIdMapsInternal; - private final HashMap fIdExtensionToName; + private final HashMap> fIdMaps; + private final HashMap> fIdMapsInternal; + private final HashMap fIdExtensionToName; private final boolean fEdit; private Text fIdMapText; private Text fIdMapExtText; - public XMLCompareAddIdMapDialog(Shell parent, IdMap idmap, HashMap idmaps, HashMap idmapsInternal, HashMap idextensiontoname, boolean edit) { + public XMLCompareAddIdMapDialog(Shell parent, IdMap idmap, HashMap> idmaps, + HashMap> idmapsInternal, HashMap idextensiontoname, + boolean edit) { super(parent); fEdit= edit; diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditCopyIdMapDialog.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditCopyIdMapDialog.java index fd680560f7b..469675a88b1 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditCopyIdMapDialog.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditCopyIdMapDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -15,21 +15,24 @@ import java.util.HashMap; +import org.eclipse.compare.examples.xml.ui.StatusDialog; +import org.eclipse.compare.examples.xml.ui.StatusInfo; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.*; - -import org.eclipse.compare.examples.xml.ui.StatusDialog; -import org.eclipse.compare.examples.xml.ui.StatusInfo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; /** * This class is used to create an editable ID Mapping Scheme from an internal ID Mappping Scheme */ public class XMLCompareEditCopyIdMapDialog extends StatusDialog { - private final HashMap fIdMaps; - private final HashMap fIdMapsInternal; + private final HashMap> fIdMaps; + private final HashMap> fIdMapsInternal; private Text fIdMapText; private String fResult; @@ -37,7 +40,8 @@ public class XMLCompareEditCopyIdMapDialog extends StatusDialog { /* * Constructs a new edit copy mapping dialog. */ - public XMLCompareEditCopyIdMapDialog(Shell parent, IdMap idmap, HashMap idmaps, HashMap idmapsInternal) { + public XMLCompareEditCopyIdMapDialog(Shell parent, IdMap idmap, HashMap> idmaps, + HashMap> idmapsInternal) { super(parent); setTitle(XMLCompareMessages.XMLCompareEditCopyIdMapDialog_title); diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java index f1733bb40e7..494c4802319 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -33,7 +33,7 @@ public class XMLCompareEditMappingDialog extends StatusDialog { private final Mapping fMapping; - private final HashMap fIdmapHM; + private final HashMap fIdmapHM; private final boolean fEdit; private Text fElementText; @@ -46,7 +46,7 @@ public class XMLCompareEditMappingDialog extends StatusDialog { /* * Constructs a new edit mapping dialog. */ - public XMLCompareEditMappingDialog(Shell parent, Mapping mapping, HashMap idmapHM, boolean edit) { + public XMLCompareEditMappingDialog(Shell parent, Mapping mapping, HashMap idmapHM, boolean edit) { super(parent); int shellStyle= getShellStyle(); diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java index c9a1c64802d..362bec25335 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditOrderedDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -32,7 +32,7 @@ public class XMLCompareEditOrderedDialog extends StatusDialog { private final Mapping fMapping; - private final ArrayList fIdmapAL; + private final ArrayList fIdmapAL; private final boolean fEdit; private Text fElementText; @@ -41,7 +41,7 @@ public class XMLCompareEditOrderedDialog extends StatusDialog { /* * Constructs a new edit mapping dialog. */ - public XMLCompareEditOrderedDialog(Shell parent, Mapping mapping, ArrayList idmapAL, boolean edit) { + public XMLCompareEditOrderedDialog(Shell parent, Mapping mapping, ArrayList idmapAL, boolean edit) { super(parent); int shellStyle= getShellStyle(); diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java index d6dc7d45799..6100b1b9bd4 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -13,19 +13,37 @@ *******************************************************************************/ package org.eclipse.compare.examples.xml; -import java.util.*; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.*; -import org.eclipse.swt.layout.*; -import org.eclipse.swt.widgets.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Set; +import java.util.Vector; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.jface.viewers.*; +import org.eclipse.jface.viewers.ColumnLayoutData; +import org.eclipse.jface.viewers.ColumnPixelData; +import org.eclipse.jface.viewers.ColumnWeightData; +import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.window.Window; - -import org.eclipse.ui.*; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; /** * The XMLComparePreferencePage is the page used to set ID Mappings for XML Compare @@ -48,13 +66,14 @@ public class XMLComparePreferencePage extends PreferencePage implements IWorkben private Button fEditOrderedButton; private Button fRemoveOrderedButton; - private final HashMap fIdMapsInternal; - private HashMap fIdMaps;// HashMap ( idname -> HashMap (signature -> id) ) - private final HashMap fIdExtensionToName; + private final HashMap> fIdMapsInternal; + private HashMap> fIdMaps;// HashMap ( idname -> HashMap (signature -> id) ) + private final HashMap fIdExtensionToName; //fOrderedElements contains signature of xml element whose children must be compared in ordered fashion - private final HashMap fOrderedElements;// HashMap ( idname -> ArrayList (signature) ) - private final HashMap fOrderedElementsInternal; + private final HashMap> fOrderedElements;// HashMap ( idname -> ArrayList + // (signature) ) + private final HashMap> fOrderedElementsInternal; protected static char[] invalidCharacters; protected static final char SIGN_SEPARATOR = XMLStructureCreator.SIGN_SEPARATOR; @@ -71,30 +90,27 @@ public class XMLComparePreferencePage extends PreferencePage implements IWorkben public XMLComparePreferencePage() { super(); - fIdMaps = new HashMap(); + fIdMaps = new HashMap<>(); XMLPlugin plugin= XMLPlugin.getDefault(); - HashMap PluginIdMaps = plugin.getIdMaps(); - Set keySet = PluginIdMaps.keySet(); - for (Iterator iter = keySet.iterator(); iter.hasNext(); ) { - String key = (String) iter.next(); - fIdMaps.put(key, ((HashMap)PluginIdMaps.get(key)).clone() ); + HashMap> PluginIdMaps = plugin.getIdMaps(); + Set keySet = PluginIdMaps.keySet(); + for (String key : keySet) { + fIdMaps.put(key, new HashMap<>(PluginIdMaps.get(key))); } fIdMapsInternal = plugin.getIdMapsInternal(); - fIdExtensionToName= new HashMap(); - HashMap PluginIdExtensionToName= plugin.getIdExtensionToName(); + fIdExtensionToName = new HashMap<>(); + HashMap PluginIdExtensionToName = plugin.getIdExtensionToName(); keySet= PluginIdExtensionToName.keySet(); - for (Iterator iter= keySet.iterator(); iter.hasNext(); ) { - String key= (String) iter.next(); + for (String key : keySet) { fIdExtensionToName.put(key, PluginIdExtensionToName.get(key)); } - fOrderedElements= new HashMap(); - HashMap PluginOrderedElements= plugin.getOrderedElements(); + fOrderedElements = new HashMap<>(); + HashMap> PluginOrderedElements = plugin.getOrderedElements(); keySet= PluginOrderedElements.keySet(); - for (Iterator iter= keySet.iterator(); iter.hasNext();) { - String key= (String) iter.next(); - fOrderedElements.put(key, ((ArrayList)PluginOrderedElements.get(key)).clone()); + for (String key : keySet) { + fOrderedElements.put(key, new ArrayList<>(PluginOrderedElements.get(key))); } fOrderedElementsInternal= plugin.getOrderedElementsInternal(); @@ -404,7 +420,7 @@ private void addIdMap(Shell shell) { XMLCompareAddIdMapDialog dialog= new XMLCompareAddIdMapDialog(shell,idmap,fIdMaps,fIdMapsInternal,fIdExtensionToName,false); if (dialog.open() == Window.OK) { if (!fIdMaps.containsKey(idmap.getName())) { - fIdMaps.put(idmap.getName(),new HashMap()); + fIdMaps.put(idmap.getName(), new HashMap<>()); if (!idmap.getExtension().isEmpty()) fIdExtensionToName.put(idmap.getExtension(),idmap.getName()); newIdMapsTableItem(idmap,true); @@ -418,7 +434,7 @@ private void renameIdMap(Shell shell) { IdMap idmap = (IdMap) itemsIdMaps[0].getData(); String old_name = idmap.getName(); String old_extension= idmap.getExtension(); - HashMap idmapHS = (HashMap) fIdMaps.get(old_name); + HashMap idmapHS = fIdMaps.get(old_name); XMLCompareAddIdMapDialog dialog= new XMLCompareAddIdMapDialog(shell,idmap,fIdMaps,fIdMapsInternal,fIdExtensionToName,true); if (dialog.open() == Window.OK) { fIdMaps.remove(old_name); @@ -466,26 +482,24 @@ private void editIdMap(Shell shell) { String new_idmapName = dialog.getResult(); if (!fIdMaps.containsKey(new_idmapName)) { //copy over id mappings - Vector newMappings = new Vector(); + Vector newMappings = new Vector<>(); IdMap newIdMap = new IdMap(new_idmapName, false, newMappings); - HashMap newIdmapHM = new HashMap(); + HashMap newIdmapHM = new HashMap<>(); fIdMaps.put(newIdMap.getName(),newIdmapHM); - Vector Mappings = idmap.getMappings(); - for (Enumeration enumeration= Mappings.elements(); enumeration.hasMoreElements(); ) { - Mapping mapping = (Mapping) enumeration.nextElement(); + Vector Mappings = idmap.getMappings(); + for (Mapping mapping : Mappings) { Mapping newMapping = new Mapping(mapping.getElement(), mapping.getSignature(), mapping.getIdAttribute()); newMappings.add(newMapping); newIdmapHM.put(newMapping.getKey(), newMapping.getIdAttribute()); } //copy over ordered entries - ArrayList orderedAL= idmap.getOrdered(); + ArrayList orderedAL = idmap.getOrdered(); if (orderedAL != null && orderedAL.size() > 0) { - ArrayList newOrderedAL= new ArrayList(); + ArrayList newOrderedAL = new ArrayList<>(); newIdMap.setOrdered(newOrderedAL); - ArrayList idmapOrdered= new ArrayList(); + ArrayList idmapOrdered = new ArrayList<>(); fOrderedElements.put(newIdMap.getName(),idmapOrdered); - for (Iterator iter= orderedAL.iterator(); iter.hasNext();) { - Mapping ordered= (Mapping) iter.next(); + for (Mapping ordered : orderedAL) { Mapping newOrdered= new Mapping(ordered.getElement(), ordered.getSignature()); newOrderedAL.add(newOrdered); idmapOrdered.add(newOrdered.getKey()); @@ -504,16 +518,16 @@ private void addMapping(Shell shell) { if (items.length > 0) { IdMap idmap = (IdMap) items[0].getData(); Mapping mapping = new Mapping(); - HashMap idmapHM = (HashMap) fIdMaps.get(idmap.getName()); + HashMap idmapHM = fIdMaps.get(idmap.getName()); XMLCompareEditMappingDialog dialog= new XMLCompareEditMappingDialog(shell,mapping,idmapHM,false); if (dialog.open() == Window.OK) { String idmapHMKey = mapping.getKey(); if (idmapHM == null) - idmapHM= new HashMap(); + idmapHM = new HashMap<>(); if (!idmapHM.containsKey(idmapHMKey)) { idmapHM.put(idmapHMKey, mapping.getIdAttribute()); newMappingsTableItem(mapping, true); - Vector mappings = idmap.getMappings(); + Vector mappings = idmap.getMappings(); mappings.add(mapping); } } @@ -525,7 +539,7 @@ private void editMapping(Shell shell) { TableItem[] itemsMappings = fMappingsTable.getSelection(); if (itemsMappings.length > 0) { IdMap idmap = (IdMap) itemsIdMaps[0].getData(); - HashMap idmapHM = (HashMap) fIdMaps.get(idmap.getName()); + HashMap idmapHM = fIdMaps.get(idmap.getName()); Mapping mapping = (Mapping)itemsMappings[0].getData(); String idmapHMKey = mapping.getKey(); idmapHM.remove(idmapHMKey); @@ -546,9 +560,9 @@ private void removeMapping(Shell shell) { if (itemsMappings.length > 0 && itemsIdMaps.length > 0) { Mapping mapping = (Mapping)itemsMappings[0].getData(); IdMap idmap = (IdMap) itemsIdMaps[0].getData(); - HashMap idmapHS = (HashMap) fIdMaps.get( idmap.getName() ); + HashMap idmapHS = fIdMaps.get(idmap.getName()); idmapHS.remove(mapping.getKey()); - Vector mappings= idmap.getMappings(); + Vector mappings = idmap.getMappings(); mappings.remove(mapping); itemsMappings[0].dispose(); //Table is single selection } @@ -567,18 +581,18 @@ private void addOrdered(Shell shell) { // } IdMap idmap = (IdMap) items[0].getData(); Mapping mapping = new Mapping(); - ArrayList idmapAL= (ArrayList) fOrderedElements.get(idmap.getName()); + ArrayList idmapAL = fOrderedElements.get(idmap.getName()); if (idmapAL == null) - idmapAL= new ArrayList(); + idmapAL = new ArrayList<>(); XMLCompareEditOrderedDialog dialog= new XMLCompareEditOrderedDialog(shell,mapping,idmapAL,false); if (dialog.open() == Window.OK) { String idmapALKey = mapping.getKey(); if (!idmapAL.contains(idmapALKey)) { idmapAL.add(idmapALKey); newOrderedTableItem(mapping, true); - ArrayList ordered= idmap.getOrdered(); + ArrayList ordered = idmap.getOrdered(); if (ordered == null) { - ordered= new ArrayList(); + ordered = new ArrayList<>(); ordered.add(mapping); idmap.setOrdered(ordered); } else { @@ -596,7 +610,7 @@ private void editOrdered(Shell shell) { TableItem[] itemsOrdered = fOrderedTable.getSelection(); if (itemsOrdered.length > 0) { IdMap idmap = (IdMap) itemsIdMaps[0].getData(); - ArrayList idmapAL = (ArrayList) fOrderedElements.get(idmap.getName()); + ArrayList idmapAL = fOrderedElements.get(idmap.getName()); Mapping mapping = (Mapping)itemsOrdered[0].getData(); String idmapALKey = mapping.getKey(); idmapAL.remove(idmapALKey); @@ -617,11 +631,11 @@ private void removeOrdered(Shell shell) { if (itemsOrdered.length > 0 && itemsIdMaps.length > 0) { Mapping mapping = (Mapping)itemsOrdered[0].getData(); IdMap idmap = (IdMap) itemsIdMaps[0].getData(); - ArrayList idmapAL = (ArrayList) fOrderedElements.get( idmap.getName() ); + ArrayList idmapAL = fOrderedElements.get(idmap.getName()); idmapAL.remove(mapping.getKey()); if (idmapAL.size() <= 0) fOrderedElements.remove(idmap.getName()); - ArrayList ordered= idmap.getOrdered(); + ArrayList ordered = idmap.getOrdered(); ordered.remove(mapping); if (ordered.size() <= 0) idmap.setOrdered(null); @@ -697,13 +711,12 @@ protected void fillIdMapsTable() { //add user idmaps that have ordered entries but no id mappings //they do not appear in the preference store with name IDMAP_PREFERENCE_NAME - Set OrderedKeys= fOrderedElements.keySet(); - Set IdMapKeys= fIdMaps.keySet(); - for (Iterator iter_orderedElements= OrderedKeys.iterator(); iter_orderedElements.hasNext();) { - String IdMapName= (String) iter_orderedElements.next(); + Set OrderedKeys = fOrderedElements.keySet(); + Set IdMapKeys = fIdMaps.keySet(); + for (String IdMapName : OrderedKeys) { if (!IdMapKeys.contains(IdMapName)) { IdMap idmap= new IdMap(IdMapName, false); - ArrayList idmapOrdered= (ArrayList) fOrderedElements.get(IdMapName); + ArrayList idmapOrdered = fOrderedElements.get(IdMapName); setOrdered(idmap, idmapOrdered); newIdMapsTableItem(idmap, false); } @@ -711,17 +724,17 @@ protected void fillIdMapsTable() { } private void fillIdMaps(boolean internal) { - HashMap IdMaps= (internal)?fIdMapsInternal:fIdMaps; - HashMap OrderedElements= (internal)?fOrderedElementsInternal:fOrderedElements; - Set IdMapKeys = IdMaps.keySet(); - for (Iterator iter_internal = IdMapKeys.iterator(); iter_internal.hasNext(); ) { + HashMap IdMaps = (internal) ? fIdMapsInternal : fIdMaps; + HashMap OrderedElements = (internal) ? fOrderedElementsInternal : fOrderedElements; + Set IdMapKeys = IdMaps.keySet(); + for (Iterator iter_internal = IdMapKeys.iterator(); iter_internal.hasNext();) { String IdMapName = (String) iter_internal.next(); - Vector Mappings = new Vector(); + Vector Mappings = new Vector<>(); IdMap idmap = new IdMap(IdMapName, internal, Mappings); //create mappings of internal idmaps - HashMap idmapHM = (HashMap) IdMaps.get(IdMapName); - Set idmapKeys = idmapHM.keySet(); - for (Iterator iter_idmap = idmapKeys.iterator(); iter_idmap.hasNext(); ) { + HashMap idmapHM = (HashMap) IdMaps.get(IdMapName); + Set idmapKeys = idmapHM.keySet(); + for (Iterator iter_idmap = idmapKeys.iterator(); iter_idmap.hasNext();) { Mapping mapping = new Mapping(); String signature = (String) iter_idmap.next(); int end_of_signature = signature.lastIndexOf(SIGN_SEPARATOR,signature.length()-2); @@ -734,17 +747,17 @@ private void fillIdMaps(boolean internal) { Mappings.add(mapping); } //create ordered mappings - ArrayList idmapOrdered= (ArrayList) OrderedElements.get(IdMapName); + ArrayList idmapOrdered = (ArrayList) OrderedElements.get(IdMapName); if (idmapOrdered != null) { setOrdered(idmap, idmapOrdered); } //set extension if (fIdExtensionToName.containsValue(IdMapName)) { - Set keySet= fIdExtensionToName.keySet(); + Set keySet = fIdExtensionToName.keySet(); String extension= new String(); - for (Iterator iter= keySet.iterator(); iter.hasNext(); ) { - extension= (String)iter.next(); - if ( ((String)fIdExtensionToName.get(extension)).equals(IdMapName) ) + for (Iterator iter = keySet.iterator(); iter.hasNext();) { + extension= iter.next(); + if ( fIdExtensionToName.get(extension).equals(IdMapName) ) break; } idmap.setExtension(extension); @@ -753,9 +766,9 @@ private void fillIdMaps(boolean internal) { } } - protected static void setOrdered(IdMap idmap, ArrayList idmapOrdered) { - ArrayList Ordered= new ArrayList(); - for (Iterator iter_ordered= idmapOrdered.iterator(); iter_ordered.hasNext();) { + protected static void setOrdered(IdMap idmap, ArrayList idmapOrdered) { + ArrayList Ordered = new ArrayList<>(); + for (Iterator iter_ordered = idmapOrdered.iterator(); iter_ordered.hasNext();) { Mapping mapping= new Mapping(); String signature= (String) iter_ordered.next(); int end_of_signature = signature.lastIndexOf(SIGN_SEPARATOR,signature.length()-2); @@ -782,7 +795,7 @@ public boolean performOk() { @Override public boolean performCancel() { - fIdMaps = (HashMap) XMLPlugin.getDefault().getIdMaps().clone(); + fIdMaps = new HashMap<>(XMLPlugin.getDefault().getIdMaps()); return super.performCancel(); } @@ -791,15 +804,15 @@ protected void selectionChanged() { if (items.length > 0) { //Refresh Mappings Table fMappingsTable.removeAll(); - Vector Mappings = ((IdMap)items[0].getData()).getMappings(); - for (Enumeration enumeration = Mappings.elements(); enumeration.hasMoreElements(); ) { + Vector Mappings = ((IdMap) items[0].getData()).getMappings(); + for (Enumeration enumeration = Mappings.elements(); enumeration.hasMoreElements();) { newMappingsTableItem((Mapping)enumeration.nextElement(), false); } //Refresh Ordered Table fOrderedTable.removeAll(); - ArrayList Ordered= ((IdMap)items[0].getData()).getOrdered(); + ArrayList Ordered = ((IdMap) items[0].getData()).getOrdered(); if (Ordered != null) { - for (Iterator iter_ordered= Ordered.iterator(); iter_ordered.hasNext();) { + for (Iterator iter_ordered = Ordered.iterator(); iter_ordered.hasNext();) { newOrderedTableItem((Mapping)iter_ordered.next(), false); } } @@ -843,8 +856,8 @@ private void updateEnabledState() { } static protected boolean containsInvalidCharacters(String text) { - for (int i=0; i -1) + for (char invalidCharacter : invalidCharacters) { + if (text.indexOf(invalidCharacter) > -1) return true; } return false; diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java index 7e37d054370..72003918133 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java @@ -71,13 +71,13 @@ public final class XMLPlugin extends AbstractUIPlugin { private static XMLPlugin fgXMLPlugin; private IPreferenceStore fPrefStore; - private HashMap fIdMapsInternal; - private HashMap fIdMaps; - private HashMap fIdExtensionToName; - private HashMap fOrderedElementsInternal; - private HashMap fOrderedElements; + private HashMap> fIdMapsInternal; + private HashMap> fIdMaps; + private HashMap fIdExtensionToName; + private HashMap> fOrderedElementsInternal; + private HashMap> fOrderedElements; - private final ListenerList fViewers= new ListenerList(); + private final ListenerList fViewers = new ListenerList<>(); /** @@ -132,8 +132,8 @@ public static XMLPlugin getDefault() { * Reads the Preference Store associated with XMLPlugin and initializes ID Mappings. */ public void initPrefStore() { - fIdMaps = new HashMap(); - fIdExtensionToName= new HashMap(); + fIdMaps = new HashMap<>(); + fIdExtensionToName = new HashMap<>(); fPrefStore = getPreferenceStore(); String IdMapPrefValue = fPrefStore.getString(IDMAP_PREFERENCE_NAME); int start = 0; @@ -159,10 +159,10 @@ public void initPrefStore() { } if (fIdMaps.containsKey(IdMapName)) { - HashMap Mappings = (HashMap) fIdMaps.get(IdMapName); + HashMap Mappings = fIdMaps.get(IdMapName); Mappings.put(IdMapSignature,IdMapAttribute); } else { - HashMap Mappings = new HashMap(); + HashMap Mappings = new HashMap<>(); Mappings.put(IdMapSignature,IdMapAttribute); fIdMaps.put(IdMapName,Mappings); } @@ -170,17 +170,17 @@ public void initPrefStore() { end = IdMapPrefValue.indexOf(IDMAP_SEPARATOR,end+1); } - fOrderedElements= new HashMap(); + fOrderedElements = new HashMap<>(); String OrderedPrefValue= fPrefStore.getString(ORDERED_PREFERENCE_NAME); StringTokenizer orderedTokens= new StringTokenizer(OrderedPrefValue, (Character.valueOf(ORDERED_FIELDS_SEPARATOR)).toString()); while (orderedTokens.hasMoreTokens()) { String IdMapName= orderedTokens.nextToken(); String signature= orderedTokens.nextToken(); if (fOrderedElements.containsKey(IdMapName)) { - ArrayList idmapAL= (ArrayList) fOrderedElements.get(IdMapName); + ArrayList idmapAL = fOrderedElements.get(IdMapName); idmapAL.add(signature); } else { - ArrayList idmapAL= new ArrayList(); + ArrayList idmapAL = new ArrayList<>(); idmapAL.add(signature); fOrderedElements.put(IdMapName, idmapAL); } @@ -194,34 +194,31 @@ public void initPrefStore() { * @param IdExtensionToName the new IdExtensionToName mappings * @param refresh whether all the open StructureViewers should be refreshed with the new IdMapping settings */ - public void setIdMaps(HashMap IdMap, HashMap IdExtensionToName, HashMap OrderedElements, boolean refresh) { + public void setIdMaps(HashMap> IdMap, HashMap IdExtensionToName, HashMap> OrderedElements, boolean refresh) { fIdMaps = IdMap; if (IdExtensionToName != null && !IdExtensionToName.equals(fIdExtensionToName)) { CompareUI.removeAllStructureViewerAliases(DEFAULT_PREFIX); fIdExtensionToName= IdExtensionToName; - Set newkeySet= fIdExtensionToName.keySet(); - for (Iterator iter= newkeySet.iterator(); iter.hasNext(); ) { - String extension= (String)iter.next(); + Set newkeySet= fIdExtensionToName.keySet(); + for (String extension : newkeySet) { CompareUI.addStructureViewerAlias(DEFAULT_PREFIX, extension); } } StringBuilder IdMapPrefValue = new StringBuilder(); - Set idmapKeys = fIdMaps.keySet(); - for (Iterator iter_idmap = idmapKeys.iterator(); iter_idmap.hasNext(); ) { - String IdMapName = (String) iter_idmap.next(); - HashMap idmapHM = (HashMap) fIdMaps.get(IdMapName); - Set mappingKeys = idmapHM.keySet(); + Set idmapKeys = fIdMaps.keySet(); + for (String IdMapName : idmapKeys) { + HashMap idmapHM = fIdMaps.get(IdMapName); + Set mappingKeys = idmapHM.keySet(); String extension= ""; //$NON-NLS-1$ if (fIdExtensionToName.containsValue(IdMapName)) { - Set keySet= fIdExtensionToName.keySet(); - for (Iterator iter= keySet.iterator(); iter.hasNext(); ) { - extension= (String)iter.next(); - if ( ((String)fIdExtensionToName.get(extension)).equals(IdMapName) ) + Set keySet= fIdExtensionToName.keySet(); + for (Iterator iter= keySet.iterator(); iter.hasNext(); ) { + extension= iter.next(); + if ( fIdExtensionToName.get(extension).equals(IdMapName) ) break; } } - for (Iterator iter_mapping = mappingKeys.iterator(); iter_mapping.hasNext(); ) { - String signature = (String) iter_mapping.next(); + for (String signature : mappingKeys) { IdMapPrefValue.append(IdMapName+IDMAP_FIELDS_SEPARATOR+signature+IDMAP_FIELDS_SEPARATOR+idmapHM.get(signature)+IDMAP_FIELDS_SEPARATOR+extension+IDMAP_SEPARATOR); } } @@ -232,12 +229,10 @@ public void setIdMaps(HashMap IdMap, HashMap IdExtensionToName, HashMap OrderedE if (OrderedElements != null) { fOrderedElements= OrderedElements; StringBuilder OrderedPrefValue= new StringBuilder(); - Set orderedKeys= fOrderedElements.keySet(); - for (Iterator iter_ordered= orderedKeys.iterator(); iter_ordered.hasNext();) { - String IdMapName= (String) iter_ordered.next(); - ArrayList idmapAL= (ArrayList) fOrderedElements.get(IdMapName); - for (Iterator iter_idmapAL= idmapAL.iterator(); iter_idmapAL.hasNext();) { - String signature= (String) iter_idmapAL.next(); + Set orderedKeys= fOrderedElements.keySet(); + for (String IdMapName : orderedKeys) { + ArrayList idmapAL = fOrderedElements.get(IdMapName); + for (String signature : idmapAL) { OrderedPrefValue.append(IdMapName+ORDERED_FIELDS_SEPARATOR+signature+ORDERED_FIELDS_SEPARATOR); } } @@ -246,32 +241,30 @@ public void setIdMaps(HashMap IdMap, HashMap IdExtensionToName, HashMap OrderedE } if (refresh) { - Object[] viewers = fViewers.getListeners(); - for (Object viewer2 : viewers) { - XMLStructureViewer viewer = (XMLStructureViewer) viewer2; + for (XMLStructureViewer viewer : fViewers) { viewer.updateIdMaps(); viewer.contentChanged(); } } } - public HashMap getIdMaps() { + public HashMap> getIdMaps() { return fIdMaps; } - public HashMap getIdMapsInternal() { + public HashMap> getIdMapsInternal() { return fIdMapsInternal; } - public HashMap getIdExtensionToName() { + public HashMap getIdExtensionToName() { return fIdExtensionToName; } - public HashMap getOrderedElements() { + public HashMap> getOrderedElements() { return fOrderedElements; } - public HashMap getOrderedElementsInternal() { + public HashMap> getOrderedElementsInternal() { return fOrderedElementsInternal; } @@ -284,15 +277,15 @@ private void registerExtensions() { // collect all Id Mappings IConfigurationElement[] idmaps= registry.getConfigurationElementsFor(PLUGIN_ID, ID_MAPPING_EXTENSION_POINT); - fIdMapsInternal = new HashMap(); - fOrderedElementsInternal= new HashMap(); + fIdMapsInternal = new HashMap<>(); + fOrderedElementsInternal= new HashMap<>(); for (IConfigurationElement idmap : idmaps) { //handle IDMAP_NAME_ATTRIBUTE String idmap_name= idmap.getAttribute(IDMAP_NAME_ATTRIBUTE); //ignores idmap if its name equals the reserved name for unordered matching or the the name for ordered matching if ( !idmap_name.equals(XMLStructureCreator.USE_UNORDERED) && !idmap_name.equals(XMLStructureCreator.USE_ORDERED) ) { //handle mappings - HashMap idmapHM = new HashMap(); + HashMap idmapHM = new HashMap<>(); fIdMapsInternal.put(idmap_name, idmapHM); IConfigurationElement[] mappings = idmap.getChildren(MAPPING_ELEMENT_NAME); for (IConfigurationElement mapping : mappings) { @@ -313,7 +306,7 @@ private void registerExtensions() { //handles ordered entries IConfigurationElement[] orderedEntries= idmap.getChildren(ORDERED_ELEMENT_NAME); if (orderedEntries.length > 0) { - ArrayList orderedAL= new ArrayList(); + ArrayList orderedAL = new ArrayList<>(); for (IConfigurationElement ordered : orderedEntries) { //add SIGN_SEPARATOR at the end because not contained in signatures of plugin.xml //also add prefix at beginning @@ -335,7 +328,7 @@ private void registerExtensions() { } } - public ListenerList getViewers() { + public ListenerList getViewers() { return fViewers; } @@ -368,8 +361,8 @@ private static void setActiveWorkbenchWindow(WindowRef windowRef) { Control shell= display.getActiveShell(); while (shell != null) { Object data= shell.getData(); - if (data instanceof IWorkbenchWindow) { - windowRef.window= (IWorkbenchWindow)data; + if (data instanceof IWorkbenchWindow wWindow) { + windowRef.window = wWindow; return; } shell= shell.getParent(); @@ -377,8 +370,8 @@ private static void setActiveWorkbenchWindow(WindowRef windowRef) { Shell shells[]= display.getShells(); for (Shell s : shells) { Object data = s.getData(); - if (data instanceof IWorkbenchWindow) { - windowRef.window= (IWorkbenchWindow)data; + if (data instanceof IWorkbenchWindow wWindow) { + windowRef.window = wWindow; return; } } diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java index 5e0b5bd4170..5fef9dc2ef7 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -17,30 +17,12 @@ import java.io.InputStream; import java.io.StringReader; import java.io.UnsupportedEncodingException; - import java.text.MessageFormat; - import java.util.ArrayList; import java.util.HashMap; import javax.xml.parsers.SAXParser; -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.Locator; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; -import org.xml.sax.helpers.DefaultHandler; -import org.xml.sax.helpers.LocatorImpl; - -import org.eclipse.core.runtime.CoreException; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Position; - import org.eclipse.compare.IEditableContent; import org.eclipse.compare.IEncodedStreamContentAccessor; import org.eclipse.compare.IStreamContentAccessor; @@ -48,6 +30,19 @@ import org.eclipse.compare.structuremergeviewer.IDiffContainer; import org.eclipse.compare.structuremergeviewer.IStructureComparator; import org.eclipse.compare.structuremergeviewer.IStructureCreator; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Position; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.helpers.DefaultHandler; +import org.xml.sax.helpers.LocatorImpl; /** * This structure analyzer builds a parse tree of an XML document found in a @@ -83,13 +78,13 @@ public class XMLStructureCreator implements IStructureCreator { private String fsignature; private Document fdoc; private final boolean ignoreBodies= false; - private HashMap fIdMapsInternal; - private HashMap fIdMaps; - private HashMap fIdExtensionToName; - private HashMap fOrderedElementsInternal; - private HashMap fOrderedElements; - private HashMap idMap; - private ArrayList fOrdered; + private HashMap> fIdMapsInternal; + private HashMap> fIdMaps; + private HashMap fIdExtensionToName; + private HashMap> fOrderedElementsInternal; + private HashMap> fOrderedElements; + private HashMap idMap; + private ArrayList fOrdered; private String fIdMapToUse; private boolean fUseIdMap; private String fFileExt; @@ -158,7 +153,7 @@ public void startElement(String uri, String local, String raw, Attributes attrs) fsignature= fsignature + raw + SIGN_SEPARATOR; if (isUseIdMap() && idMap.containsKey(fsignature)) { - String attrName= (String) idMap.get(fsignature); + String attrName= idMap.get(fsignature); elementId= raw + Character.valueOf(ID_SEPARATOR) + attrs.getValue(attrName); elementName= raw + " [" + attrName + "=" + attrs.getValue(attrName) + "]"; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ } else { @@ -353,7 +348,7 @@ public void characters(char ch[], int start, int length) { if (isUseIdMap() && fcurrentParent.bodies == 1 && idMap.containsKey(popsig)) { String pid= fcurrentParent.getId();//id of parent String pelementname= pid.substring(0, pid.indexOf("<")); //name of parent element //$NON-NLS-1$ - if (((String) idMap.get(popsig)).equals(ID_TYPE_BODY + pelementname)) { + if (idMap.get(popsig).equals(ID_TYPE_BODY + pelementname)) { XMLNode pop= fcurrentParent.getParent(); String popid= pop.getId(); String popelementname= popid.substring(0, popid.indexOf("<")); //$NON-NLS-1$ @@ -546,7 +541,7 @@ public void initIdMaps() { fFirstCall= false; String fileExtLower= fFileExt.toLowerCase(); if (fIdExtensionToName.containsKey(fileExtLower)) - setIdMap((String) fIdExtensionToName.get(fileExtLower)); + setIdMap(fIdExtensionToName.get(fileExtLower)); } setUseIdMap(); @@ -554,15 +549,15 @@ public void initIdMaps() { if (!isUseIdMap()) idMap= null; else if (fIdMaps.containsKey(fIdMapToUse)) { - idMap= (HashMap) fIdMaps.get(fIdMapToUse); + idMap= fIdMaps.get(fIdMapToUse); } else if (fIdMapsInternal.containsKey(fIdMapToUse)) { - idMap= (HashMap) fIdMapsInternal.get(fIdMapToUse); + idMap= fIdMapsInternal.get(fIdMapToUse); } if (fOrderedElements != null) - fOrdered= (ArrayList) fOrderedElements.get(fIdMapToUse); + fOrdered= fOrderedElements.get(fIdMapToUse); if (fOrdered == null && fOrderedElementsInternal != null) - fOrdered= (ArrayList) fOrderedElementsInternal.get(fIdMapToUse); + fOrdered= fOrderedElementsInternal.get(fIdMapToUse); } /* diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java index d2fa2af3c22..19d039ba469 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2024 IBM Corporation and others. + * Copyright (c) 2000, 2025 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.List; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.CompareViewerSwitchingPane; @@ -55,17 +56,17 @@ public class XMLStructureViewer extends StructureDiffViewer { private CompareViewerSwitchingPane fParent; - private HashMap fIdMapsInternal; - private HashMap fIdMaps; - private HashMap fOrderedElementsInternal; - private HashMap fOrderedElements; + private HashMap> fIdMapsInternal; + private HashMap> fIdMaps; + private HashMap> fOrderedElementsInternal; + private HashMap> fOrderedElements; protected static final char SIGN_SEPARATOR= XMLStructureCreator.SIGN_SEPARATOR; class XMLSorter extends ViewerComparator { - ArrayList fOrdered; + ArrayList fOrdered; boolean fAlwaysOrderSort; public XMLSorter() { @@ -73,7 +74,7 @@ public XMLSorter() { fAlwaysOrderSort= false; } - public void setOrdered(ArrayList ordered) { + public void setOrdered(ArrayList ordered) { fOrdered= ordered; } @@ -113,9 +114,9 @@ public void sort(final Viewer viewer, Object[] elements) { sig.length() - XMLStructureCreator.SIGN_ELEMENT.length()); if (fAlwaysOrderSort || fOrdered.contains(newSig)) { - final ArrayList originalTree= - new ArrayList( - Arrays.asList(parent.getChildren())); + final ArrayList originalTree = + new ArrayList<>( + List.of((DiffNode[]) parent.getChildren())); Arrays.sort(elements, (a, b) -> XMLSorter.this.compare( (DiffNode) a, (DiffNode) b, @@ -128,7 +129,7 @@ public void sort(final Viewer viewer, Object[] elements) { super.sort(viewer, elements); } - private int compare(DiffNode a, DiffNode b, ArrayList originalTree) { + private int compare(DiffNode a, DiffNode b, ArrayList originalTree) { int index_a= originalTree.indexOf(a.getId()); int index_b= originalTree.indexOf(b.getId()); @@ -270,22 +271,19 @@ protected void createToolItems(ToolBarManager toolBarManager) { protected void fillContextMenu(IMenuManager manager) { super.fillContextMenu(manager); ISelection s= getSelection(); - if (s instanceof StructuredSelection - && ((StructuredSelection) s).getFirstElement() instanceof DiffNode - && ((DiffNode) ((StructuredSelection) s).getFirstElement()).getId() - instanceof XMLNode) { - DiffNode diffnode= - (DiffNode) ((StructuredSelection) s).getFirstElement(); - String diffnodeIdSig= ((XMLNode) diffnode.getId()).getSignature(); + if (s instanceof StructuredSelection ss + && ss.getFirstElement() instanceof DiffNode diffnode && diffnode.getId() instanceof XMLNode xmlNode) { + String diffnodeIdSig = xmlNode.getSignature(); fIdMaps= XMLPlugin.getDefault().getIdMaps(); String idmap_name= getXMLStructureCreator().getIdMap(); - if (diffnodeIdSig.endsWith(XMLStructureCreator.SIGN_ATTRIBUTE) || (diffnodeIdSig.endsWith(XMLStructureCreator.SIGN_TEXT) && ((XMLNode) diffnode.getId()).getOrigId().endsWith("(1)"))) { //$NON-NLS-1$ + if (diffnodeIdSig.endsWith(XMLStructureCreator.SIGN_ATTRIBUTE) + || (diffnodeIdSig.endsWith(XMLStructureCreator.SIGN_TEXT) && xmlNode.getOrigId().endsWith("(1)"))) { //$NON-NLS-1$ Action action= new SetAsIdAction(diffnode); if (!fIdMaps.containsKey(idmap_name)) { action.setText(XMLCompareMessages.XMLStructureViewer_action_notUserIdMap); action.setEnabled(false); } else { - HashMap idmapHM= (HashMap) fIdMaps.get(idmap_name); + HashMap idmapHM = fIdMaps.get(idmap_name); XMLNode idNode= (XMLNode) diffnode.getId(); String signature= idNode.getSignature(); String idname= ""; //$NON-NLS-1$ @@ -332,7 +330,7 @@ protected void fillContextMenu(IMenuManager manager) { action.setText(XMLCompareMessages.XMLStructureViewer_action_setId_text1); action.setEnabled(false); } else { - String oldId= (String) idmapHM.get(signature); + String oldId= idmapHM.get(signature); if (oldId.startsWith((Character.valueOf(XMLStructureCreator.ID_TYPE_BODY)).toString())) oldId= oldId.substring(1); action.setText(MessageFormat.format("{0} {1}", XMLCompareMessages.XMLStructureViewer_action_setId_text2, oldId)); //$NON-NLS-1$ @@ -351,8 +349,8 @@ protected void fillContextMenu(IMenuManager manager) { action.setText(XMLCompareMessages.XMLStructureViewer_action_notUserIdMap); action.setEnabled(false); } else { - ArrayList idmapOrdered= - (ArrayList) fOrderedElements.get(idmap_name); + ArrayList idmapOrdered = + fOrderedElements.get(idmap_name); XMLNode idNode= (XMLNode) diffnode.getId(); String signature= idNode.getSignature(); // String idname= ""; @@ -411,7 +409,7 @@ public void run() { // DiffNode diffnode = (DiffNode) ((StructuredSelection) getSelection()).getFirstElement(); String idmap_name= sc.getIdMap(); if (fIdMaps.containsKey(idmap_name)) { - HashMap idmapHM= (HashMap) fIdMaps.get(idmap_name); + HashMap idmapHM = fIdMaps.get(idmap_name); if (((XMLNode) fDiffNode.getId()) .getSignature() .endsWith(XMLStructureCreator.SIGN_ATTRIBUTE)) { @@ -474,10 +472,10 @@ public SetOrderedAction(String idmap_name) { public void run() { //String idmap_name= getXMLStructureCreator().getIdMap(); if (fSignature != null) { - ArrayList idmapOrdered= - (ArrayList) fOrderedElements.get(fIdMapName); + ArrayList idmapOrdered = + fOrderedElements.get(fIdMapName); if (idmapOrdered == null) { - idmapOrdered= new ArrayList(); + idmapOrdered = new ArrayList<>(); fOrderedElements.put(fIdMapName, idmapOrdered); } idmapOrdered.add(fSignature); @@ -520,18 +518,18 @@ private void performMatching(final XMLNode left, final XMLNode right, else totalWork= 3; monitor.beginTask(XMLCompareMessages.XMLStructureViewer_matching_beginTask, totalWork); - ArrayList ordered= null; + ArrayList ordered = null; if (!getXMLStructureCreator() .getIdMap() .equals(XMLStructureCreator.USE_UNORDERED) && !getXMLStructureCreator().getIdMap().equals( XMLStructureCreator.USE_ORDERED)) { ordered= - (ArrayList) fOrderedElements.get( + fOrderedElements.get( getXMLStructureCreator().getIdMap()); if (ordered == null) ordered= - (ArrayList) fOrderedElementsInternal.get( + fOrderedElementsInternal.get( getXMLStructureCreator().getIdMap()); } if (getComparator() instanceof XMLSorter) From 606dca1a8723344265d13d4904883fc31d4e5353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 23 Dec 2025 10:02:25 +0200 Subject: [PATCH 2/2] Remove log methods from activator in xml compare examples ILog provides useful methods to do it now. --- .../org/eclipse/compare/examples/xml/XMLPlugin.java | 10 ---------- .../compare/examples/xml/XMLStructureCreator.java | 7 ++++--- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java index 72003918133..860945f63e9 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java @@ -24,10 +24,8 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.widgets.Control; @@ -377,14 +375,6 @@ private static void setActiveWorkbenchWindow(WindowRef windowRef) { } } - public static void log(Throwable e) { - log(new Status(IStatus.ERROR, getPluginId(), IStatus.ERROR, "Internal Error", e)); //$NON-NLS-1$ - } - - public static void log(IStatus status) { - getDefault().getLog().log(status); - } - public static String getPluginId() { return getDefault().getBundle().getSymbolicName(); } diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java index 5fef9dc2ef7..b7fba3fcc28 100644 --- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java +++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java @@ -31,6 +31,7 @@ import org.eclipse.compare.structuremergeviewer.IStructureComparator; import org.eclipse.compare.structuremergeviewer.IStructureCreator; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ILog; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; @@ -595,15 +596,15 @@ public IStructureComparator getStructure(Object input) { if (XMLStructureCreator.DEBUG_MODE) System.out.println("End of parse"); //$NON-NLS-1$ } catch (SAXParseException e) { - XMLPlugin.log(e); + ILog.get().error(e.getMessage(), e); return null; } catch (Exception e) { - XMLPlugin.log(e); + ILog.get().error(e.getMessage(), e); return null; } return root; } catch (CoreException ex) { - XMLPlugin.log(ex); + ILog.get().error(ex.getMessage(), ex); } return null; }