[Git][java-team/eclipse-wtp][master] 2 commits: Add upstream patches
Sudip Mukherjee
gitlab at salsa.debian.org
Wed Nov 4 18:36:05 GMT 2020
Sudip Mukherjee pushed to branch master at Debian Java Maintainers / eclipse-wtp
Commits:
430e1550 by Sudip Mukherjee at 2020-11-04T12:44:33+00:00
Add upstream patches
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
1c0406d4 by Sudip Mukherjee at 2020-11-04T17:39:28+00:00
Add changelog for 3.18-5 release
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
4 changed files:
- debian/changelog
- debian/patches/0001-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch
- + debian/patches/0002-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+eclipse-wtp (3.18-5) unstable; urgency=medium
+
+ * Fix FTBFS cannot find symbol. (Closes: #972993)
+ - Add upstream patch and fix missing symbol issue caused
+ by an update to eclipse-platform-ui.
+
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com> Wed, 04 Nov 2020 17:38:55 +0000
+
eclipse-wtp (3.18-4) unstable; urgency=medium
* Fix FTBFS due to update in libeclipse-jface-text-java.
=====================================
debian/patches/0001-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch
=====================================
@@ -1,7 +1,7 @@
From 5dd251905b5179b9b583da56265f0f5ab208787f Mon Sep 17 00:00:00 2001
From: Nitin Dahyabhai <thatnitind at gmail.com>
Date: Sun, 9 Aug 2020 03:26:37 -0400
-Subject: [PATCH] [528191] Replace uses of org.eclipse.jface.util.Assert and
+Subject: [PATCH] [528191] Replace uses of org.eclipse.jface.util.Assert and
org.eclipse.jface.text.Assert because of their deletion.
---
@@ -93,6 +93,20 @@ index 5d285b81b..bb3949640 100644
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
+diff --git a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/StatusInfo.java b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/StatusInfo.java
+index f45d6eca7..0ccfd4b05 100644
+--- a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/StatusInfo.java
++++ b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/StatusInfo.java
+@@ -14,8 +14,8 @@
+ *******************************************************************************/
+ package org.eclipse.wst.sse.ui.internal.preferences.ui;
+
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.core.runtime.IStatus;
+-import org.eclipse.jface.util.Assert;
+ import org.eclipse.ui.editors.text.EditorsUI;
+
+ /**
diff --git a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TranslucencyPreferenceTab.java b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TranslucencyPreferenceTab.java
index 2e568434d..890447f59 100644
--- a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TranslucencyPreferenceTab.java
@@ -119,6 +133,92 @@ index 2e568434d..890447f59 100644
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
+diff --git a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/SelectionHistory.java b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/SelectionHistory.java
+index e60810f45..dc3929d53 100644
+--- a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/SelectionHistory.java
++++ b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/SelectionHistory.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2001, 2005 IBM Corporation and others.
++ * Copyright (c) 2001, 2020 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+@@ -18,24 +18,24 @@ import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.List;
+
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.jface.action.IAction;
+ import org.eclipse.jface.text.IRegion;
+-import org.eclipse.jface.util.Assert;
+ import org.eclipse.jface.viewers.ISelectionChangedListener;
+ import org.eclipse.jface.viewers.SelectionChangedEvent;
+ import org.eclipse.ui.texteditor.ITextEditor;
+
+ public class SelectionHistory {
+ private ITextEditor fEditor;
+- private List fHistory;
+- private List fHistoryActions;
++ private List<IRegion> fHistory;
++ private List<IAction> fHistoryActions;
+ private int fSelectionChangeListenerCounter;
+ private ISelectionChangedListener fSelectionListener;
+
+ public SelectionHistory(ITextEditor editor) {
+ Assert.isNotNull(editor);
+ fEditor = editor;
+- fHistory = new ArrayList(3);
++ fHistory = new ArrayList<>(3);
+ fSelectionListener = new ISelectionChangedListener() {
+ public void selectionChanged(SelectionChangedEvent event) {
+ if (fSelectionChangeListenerCounter == 0)
+@@ -67,7 +67,7 @@ public class SelectionHistory {
+ if (isEmpty())
+ return null;
+ int size = fHistory.size();
+- IRegion result = (IRegion) fHistory.remove(size - 1);
++ IRegion result = fHistory.remove(size - 1);
+ updateHistoryAction();
+ return result;
+ }
+@@ -93,7 +93,7 @@ public class SelectionHistory {
+ Assert.isNotNull(action);
+
+ if (fHistoryActions == null)
+- fHistoryActions = new ArrayList();
++ fHistoryActions = new ArrayList<IAction>();
+ if (!fHistoryActions.contains(action))
+ fHistoryActions.add(action);
+
+@@ -110,9 +110,9 @@ public class SelectionHistory {
+ if (fHistory != null && !fHistory.isEmpty())
+ enabled = true;
+
+- Iterator iter = fHistoryActions.iterator();
++ Iterator<IAction> iter = fHistoryActions.iterator();
+ while (iter.hasNext()) {
+- ((IAction)iter.next()).setEnabled(enabled);
++ iter.next().setEnabled(enabled);
+ }
+ }
+ }
+diff --git a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectAction.java b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectAction.java
+index 04bb4ab78..fe46927fa 100644
+--- a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectAction.java
++++ b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/selection/StructureSelectAction.java
+@@ -14,10 +14,10 @@
+ *******************************************************************************/
+ package org.eclipse.wst.sse.ui.internal.selection;
+
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.jface.action.Action;
+ import org.eclipse.jface.text.IDocument;
+ import org.eclipse.jface.text.Region;
+-import org.eclipse.jface.util.Assert;
+ import org.eclipse.wst.sse.core.StructuredModelManager;
+ import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+ import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
--
2.11.0
=====================================
debian/patches/0002-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch
=====================================
@@ -0,0 +1,233 @@
+From 9bca530de450dda6e2ed818daa7707d29e20a214 Mon Sep 17 00:00:00 2001
+From: Nitin Dahyabhai <thatnitind at gmail.com>
+Date: Sun, 9 Aug 2020 10:24:17 -0400
+Subject: [PATCH] [528191] Replace uses of
+ org.eclipse.jface.util.Assert and org.eclipse.jface.text.Assert
+ because of their deletion.
+
+---
+
+upstream link: https://git.eclipse.org/c/sourceediting/webtools.sourceediting.git/commit/?id=9bca530de450dda6e2ed818daa7707d29e20a214
+
+diff --git a/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java b/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java
+index a46a2e51f..603fe61dc 100644
+--- a/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java
++++ b/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2001, 2006 IBM Corporation and others.
++ * Copyright (c) 2001, 2020 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+@@ -12,9 +12,9 @@
+ *******************************************************************************/
+ package org.eclipse.wst.xml.ui.internal.wizards;
+
++import java.util.ArrayList;
+ import java.util.Hashtable;
+ import java.util.List;
+-import java.util.Vector;
+
+ import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
+ import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
+@@ -23,8 +23,8 @@ import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
+
+ public class NamespaceInfoContentBuilder extends ContentBuilder {
+ protected int count = 1;
+- public List list = new Vector();
+- protected Hashtable table = new Hashtable();
++ public List<NamespaceInfo> list = new ArrayList<>();
++ protected Hashtable<String, NamespaceInfo> table = new Hashtable<>();
+
+ public NamespaceInfoContentBuilder() {
+ super();
+diff --git a/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java b/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
+index f75e76d06..a5d327709 100644
+--- a/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
++++ b/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2001, 2016 IBM Corporation and others.
++ * Copyright (c) 2001, 2020 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+@@ -18,6 +18,7 @@ import java.io.File;
+ import java.io.FileOutputStream;
+ import java.io.OutputStreamWriter;
+ import java.io.PrintWriter;
++import java.util.ArrayList;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Vector;
+@@ -26,12 +27,12 @@ import javax.xml.parsers.DocumentBuilderFactory;
+
+ import org.eclipse.core.resources.IFile;
+ import org.eclipse.core.resources.ProjectScope;
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.core.runtime.Platform;
+ import org.eclipse.core.runtime.Preferences;
+ import org.eclipse.core.runtime.content.IContentType;
+ import org.eclipse.core.runtime.preferences.IScopeContext;
+ import org.eclipse.core.runtime.preferences.InstanceScope;
+-import org.eclipse.jface.util.Assert;
+ import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
+ import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
+ import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
+@@ -66,7 +67,7 @@ public class NewXMLGenerator {
+ protected String defaultSystemId;
+
+ // info for xsd
+- public List namespaceInfoList;
++ public List<NamespaceInfo> namespaceInfoList;
+
+ public NewXMLGenerator() {
+ super();
+@@ -229,7 +230,7 @@ public class NewXMLGenerator {
+
+ // TODO... instead of relying on file extensions, we need to keep
+ // track of the grammar type
+- // better yet we should reate an SSE document so that we can format it
++ // better yet we should create an SSE document so that we can format it
+ // nicely before saving
+ // then we won't need the DOMWriter at all
+ //
+@@ -242,14 +243,14 @@ public class NewXMLGenerator {
+
+
+ public void createNamespaceInfoList() {
+- List result = new Vector();
++ List<NamespaceInfo> result = new ArrayList<>();
+ if (cmDocument != null) {
+- List result2 = (List) cmDocument.getProperty("http://org.eclipse.wst/cm/properties/completeNamespaceInfo"); //$NON-NLS-1$
++ List<NamespaceInfo> result2 = (List<NamespaceInfo>) cmDocument.getProperty("http://org.eclipse.wst/cm/properties/completeNamespaceInfo"); //$NON-NLS-1$
+ if (result2 != null) {
+ result = result2;
+ int size = result.size();
+ for (int i = 0; i < size; i++) {
+- NamespaceInfo info = (NamespaceInfo) result.get(i);
++ NamespaceInfo info = result.get(i);
+ if (i == 0) {
+ String locationInfo = null;
+ if (xmlCatalogEntry != null) {
+@@ -284,8 +285,8 @@ public class NewXMLGenerator {
+
+ public boolean isMissingNamespaceLocation() {
+ boolean result = false;
+- for (Iterator i = namespaceInfoList.iterator(); i.hasNext();) {
+- NamespaceInfo info = (NamespaceInfo) i.next();
++ for (Iterator<NamespaceInfo> i = namespaceInfoList.iterator(); i.hasNext();) {
++ NamespaceInfo info = i.next();
+ if (info.locationHint == null) {
+ result = true;
+ break;
+@@ -376,11 +377,11 @@ public class NewXMLGenerator {
+
+
+ protected class MyExternalCMDocumentSupport implements DOMContentBuilderImpl.ExternalCMDocumentSupport {
+- protected List namespaceInfoList1;
++ protected List<NamespaceInfo> namespaceInfoList1;
+ protected URIResolver idResolver;
+ protected String resourceLocation;
+
+- protected MyExternalCMDocumentSupport(List namespaceInfoListParam, String resourceLocation) {
++ protected MyExternalCMDocumentSupport(List<NamespaceInfo> namespaceInfoListParam, String resourceLocation) {
+ this.namespaceInfoList1 = namespaceInfoListParam;
+ this.resourceLocation = resourceLocation;
+ idResolver = URIResolverPlugin.createResolver();
+diff --git a/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java b/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java
+index 2e0f51ef7..4244145d7 100644
+--- a/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java
++++ b/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2001, 2012 IBM Corporation and others.
++ * Copyright (c) 2001, 2020 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+@@ -15,12 +15,14 @@ package org.eclipse.wst.xml.ui.internal.wizards;
+
+ import java.io.File;
+ import java.lang.reflect.InvocationTargetException;
++import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.List;
+ import java.util.Vector;
+
+ import org.eclipse.core.resources.IFile;
+ import org.eclipse.core.resources.IResource;
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.core.runtime.CoreException;
+ import org.eclipse.core.runtime.IPath;
+ import org.eclipse.core.runtime.IProgressMonitor;
+@@ -30,7 +32,6 @@ import org.eclipse.jface.dialogs.Dialog;
+ import org.eclipse.jface.dialogs.MessageDialog;
+ import org.eclipse.jface.operation.IRunnableWithProgress;
+ import org.eclipse.jface.resource.ImageDescriptor;
+-import org.eclipse.jface.util.Assert;
+ import org.eclipse.jface.viewers.IStructuredSelection;
+ import org.eclipse.jface.wizard.IWizardPage;
+ import org.eclipse.jface.wizard.WizardDialog;
+@@ -659,17 +660,17 @@ public class NewXMLWizard extends NewModelWizard {
+ combo.removeAll();
+ if ((generator.getCMDocument() != null) && (cmDocumentErrorMessage == null)) {
+ CMNamedNodeMap nameNodeMap = generator.getCMDocument().getElements();
+- Vector nameNodeVector = new Vector();
++ List<String> nameNodeList = new ArrayList<>();
+
+ for (int i = 0; i < nameNodeMap.getLength(); i++) {
+ CMElementDeclaration cmElementDeclaration = (CMElementDeclaration) nameNodeMap.item(i);
+ Object value = cmElementDeclaration.getProperty("Abstract"); //$NON-NLS-1$
+ if (value != Boolean.TRUE) {
+- nameNodeVector.add(cmElementDeclaration.getElementName());
++ nameNodeList.add(cmElementDeclaration.getElementName());
+ }
+ }
+
+- Object[] nameNodeArray = nameNodeVector.toArray();
++ String[] nameNodeArray = nameNodeList.toArray(new String[nameNodeList.size()]);
+ if (nameNodeArray.length > 0) {
+ Arrays.sort(nameNodeArray, Collator.getInstance());
+ }
+@@ -677,7 +678,7 @@ public class NewXMLWizard extends NewModelWizard {
+ String defaultRootName = (String) (generator.getCMDocument()).getProperty("http://org.eclipse.wst/cm/properties/defaultRootName"); //$NON-NLS-1$
+ int defaultRootIndex = -1;
+ for (int i = 0; i < nameNodeArray.length; i++) {
+- String elementName = (String) nameNodeArray[i];
++ String elementName = nameNodeArray[i];
+
+ combo.add(elementName);
+ if ((defaultRootName != null) && defaultRootName.equals(elementName)) {
+@@ -700,7 +701,7 @@ public class NewXMLWizard extends NewModelWizard {
+
+ // Provide default namespace prefix if none
+ for (int i = 0; i < generator.namespaceInfoList.size(); i++) {
+- NamespaceInfo nsinfo = (NamespaceInfo) generator.namespaceInfoList.get(i);
++ NamespaceInfo nsinfo = generator.namespaceInfoList.get(i);
+ if (((nsinfo.prefix == null) || (nsinfo.prefix.trim().length() == 0)) && ((nsinfo.uri != null) && (nsinfo.uri.trim().length() != 0))) {
+ nsinfo.prefix = getDefaultPrefix(generator.namespaceInfoList);
+ }
+@@ -726,15 +727,15 @@ public class NewXMLWizard extends NewModelWizard {
+ }
+ }
+
+- private String getDefaultPrefix(List nsInfoList) {
++ private String getDefaultPrefix(List<NamespaceInfo> nsInfoList) {
+ String defaultPrefix = "p"; //$NON-NLS-1$
+ if (nsInfoList == null) {
+ return defaultPrefix;
+ }
+
+- Vector v = new Vector();
++ Vector<String> v = new Vector<>();
+ for (int i = 0; i < nsInfoList.size(); i++) {
+- NamespaceInfo nsinfo = (NamespaceInfo) nsInfoList.get(i);
++ NamespaceInfo nsinfo = nsInfoList.get(i);
+ if (nsinfo.prefix != null) {
+ v.addElement(nsinfo.prefix);
+ }
+--
+2.11.0
+
=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ build_stub.patch
versionless.patch
0001-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch
fix_jface_text.patch
+0002-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch
View it on GitLab: https://salsa.debian.org/java-team/eclipse-wtp/-/compare/c28db841c043d1b71f239dbb45ad754da49e0bdb...1c0406d435b4de02ae1257dde5b7abe6a2a1aef0
--
View it on GitLab: https://salsa.debian.org/java-team/eclipse-wtp/-/compare/c28db841c043d1b71f239dbb45ad754da49e0bdb...1c0406d435b4de02ae1257dde5b7abe6a2a1aef0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201104/43f0d682/attachment.html>
More information about the pkg-java-commits
mailing list