Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • java-team/eclipse-platform-ua
1 result
Show changes
Commits on Source (4)
Hide whitespace changes
Inline Side-by-side
Showing
with 90 additions and 40 deletions
debian/changelog
View file @ 2e035052
eclipse-platform-ua (4.15-1) unstable; urgency=medium
* New upstream release
* Standards-Version updated to 4.5.0
-- Emmanuel Bourg <ebourg@apache.org> Sun, 26 Apr 2020 23:41:48 +0200
eclipse-platform-ua (4.14-1) unstable; urgency=medium
* New upstream version 4.14
......
debian/control
View file @ 2e035052
......@@ -16,7 +16,7 @@ Build-Depends:
libequinox-preferences-java,
libequinox-registry-java,
libicu4j-java
Standards-Version: 4.4.1
Standards-Version: 4.5.0
Vcs-Git: https://salsa.debian.org/java-team/eclipse-platform-ua.git
Vcs-Browser: https://salsa.debian.org/java-team/eclipse-platform-ua
Homepage: https://www.eclipse.org/eclipse/platform-ua/main.html
......
org.eclipse.help.base/.settings/org.eclipse.jdt.ui.prefs
View file @ 2e035052
......@@ -63,4 +63,3 @@ sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
sp_cleanup.use_type_arguments=false
sp_org.autorefactor.ui.autorefactor_clean_up=false
org.eclipse.help.base/META-INF/MANIFEST.MF
View file @ 2e035052
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %help_base_plugin_name
Bundle-SymbolicName: org.eclipse.help.base; singleton:=true
Bundle-Version: 4.2.800.qualifier
Bundle-Version: 4.2.900.qualifier
Bundle-Activator: org.eclipse.help.internal.base.HelpBasePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
......@@ -44,9 +44,9 @@ Require-Bundle: org.eclipse.ant.core;bundle-version="[3.2.200,4.0.0)";resolution
org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",
org.eclipse.core.net;bundle-version="[1.2.200,2.0.0]",
org.apache.lucene.analyzers-common;bundle-version="[8.0.0,9.0.0)",
org.apache.lucene.core;bundle-version="[8.0.0,9.0.0)",
org.apache.lucene.analyzers-smartcn;bundle-version="[8.0.0,9.0.0)"
org.apache.lucene.analyzers-common;bundle-version="[8.4.1,9.0.0)",
org.apache.lucene.core;bundle-version="[8.4.1,9.0.0)",
org.apache.lucene.analyzers-smartcn;bundle-version="[8.4.1,9.0.0)"
Import-Package: com.ibm.icu.text,
org.eclipse.equinox.http.jetty;resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
......
org.eclipse.help.base/about.properties
View file @ 2e035052
###############################################################################
# Copyright (c) 2000, 2018 IBM Corporation and others.
# Copyright (c) 2000, 2020 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
......@@ -22,6 +22,6 @@ blurb=Eclipse Help\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
(c) Copyright Eclipse contributors and others 2000, 2019. All rights reserved.\n\
(c) Copyright Eclipse contributors and others 2000, 2020. All rights reserved.\n\
Visit http://www.eclipse.org/platform
org.eclipse.help.base/doc/book.css
View file @ 2e035052
......@@ -49,4 +49,13 @@ h2 { font-size: 110%; margin-top: 20px; margin-bottom: 3px }
body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {
color: #f0f0f0;
}
/* darken images to add some comfort while reading in dark theme */
img {
opacity: .75;
transition: opacity .5s ease-in-out;
}
img:hover {
opacity: 1;
}
}
\ No newline at end of file
org.eclipse.help.base/doc/darkTheme.css
View file @ 2e035052
......@@ -14,4 +14,13 @@
a.nolink:visited {
color:#ffffff;
}
/* darken images to add some comfort while reading in dark theme */
img {
opacity: .75;
transition: opacity .5s ease-in-out;
}
img:hover {
opacity: 1;
}
}
\ No newline at end of file
org.eclipse.help.base/doc/help_banner.jpg deleted 100644 → 0
View file @ d2410252
org.eclipse.help.base/doc/help_banner.jpg

9.52 KiB

org.eclipse.help.base/doc/help_home.html
View file @ 2e035052
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
<html>
<html lang="en-us">
<head>
<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
<meta http-equiv="Content-Language" content="en-us">
......@@ -9,11 +9,7 @@
</head>
<body>
<div id="banner">
<img src="help_banner.jpg" alt="Help banner">
</div>
<div id="content">
<div id="content" role="main">
<h1>Using the help system</h1>
<p>
......
org.eclipse.help.base/pom.xml
View file @ 2e035052
......@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.ua</artifactId>
<groupId>eclipse.platform.ua</groupId>
<version>4.14.0-SNAPSHOT</version>
<version>4.15.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.help</groupId>
<artifactId>org.eclipse.help.base</artifactId>
<version>4.2.800-SNAPSHOT</version>
<version>4.2.900-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
......
org.eclipse.help.base/src/org/eclipse/help/internal/base/remote/PreferenceFileHandler.java
View file @ 2e035052
......@@ -95,7 +95,7 @@ public class PreferenceFileHandler {
String [] currEntries;
String [] updatedArray=null;
if(!preferenceEntry.equals("")) //$NON-NLS-1$
if(!preferenceEntry.isEmpty())
currEntries=preferenceEntry.split(PREFERENCE_ENTRY_DELIMITER);
else
currEntries = new String[0];
......
org.eclipse.help.base/src/org/eclipse/help/internal/base/scope/ScopeRegistry.java
View file @ 2e035052
......@@ -121,7 +121,7 @@ public class ScopeRegistry {
scopes.add(scope);
}
if (scopes.size()==0)
if (scopes.isEmpty())
return null;
if (scopes.size()==1)
return scopes.get(0);
......@@ -219,14 +219,14 @@ public class ScopeRegistry {
return format(next,current);
next+=current;
}
if (next.equals("")) //$NON-NLS-1$
if (next.isEmpty())
return null;
return next;
}
private String format(String next,char current)
{
if (next.equals("")) //$NON-NLS-1$
if (next.isEmpty())
{
cursor++;
return current+""; //$NON-NLS-1$
......
org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserLog.java
View file @ 2e035052
......@@ -33,7 +33,7 @@ public class BrowserLog {
private String logFileName;
private boolean newSession;
DateFormat formatter = new SimpleDateFormat("MMM dd, yyyy kk:mm:ss.SS"); //$NON-NLS-1$
String LN = System.getProperty("line.separator"); //$NON-NLS-1$
String LN = System.lineSeparator();
/**
* Constructor
*/
......
org.eclipse.help.base/src/org/eclipse/help/internal/search/HTMLDocParser.java
View file @ 2e035052
/*******************************************************************************
* Copyright (c) 2000, 2015 IBM Corporation and others.
* Copyright (c) 2000, 2020 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
......@@ -42,6 +42,7 @@ public class HTMLDocParser {
final static String ATTRIBUTE_HTTP = "http-equiv"; //$NON-NLS-1$
final static String ATTRIBUTE_HTTP_VALUE = "content-type"; //$NON-NLS-1$
final static String ATTRIBUTE_CONTENT = "content"; //$NON-NLS-1$
final static String ATTRIBUTE_CHARSET = "charset"; //$NON-NLS-1$
// states for parsing elements
final static int STATE_ELEMENT_START = 0;
......@@ -58,6 +59,11 @@ public class HTMLDocParser {
final static int STATE_CONTENT_AFTER_NAME = 1;
final static int STATE_CONTENT_AFTER_EQ = 2;
final static int STATE_CONTENT_DONE = 3;
// states for parsing CHARSET attribute
final static int STATE_CHARSET_START = 0;
final static int STATE_CHARSET_AFTER_NAME = 1;
final static int STATE_CHARSET_AFTER_EQ = 2;
final static int STATE_CHARSET_DONE = 3;
private HTMLParser htmlParser;
private InputStream inputStream = null;
......@@ -166,6 +172,7 @@ public class HTMLDocParser {
int stateContent = STATE_HTTP_START;
int stateElement = STATE_ELEMENT_START;
int stateHttp = STATE_HTTP_START;
int stateCharset = STATE_CHARSET_START;
try {
// in the worst case, process tokens until end of file
......@@ -199,6 +206,7 @@ public class HTMLDocParser {
// META element opened
stateElement = STATE_ELEMENT_META;
// initialize state of attributes
stateCharset = STATE_CHARSET_START;
stateHttp = STATE_HTTP_START;
stateContent = STATE_CONTENT_START;
contentValue = null;
......@@ -241,7 +249,10 @@ public class HTMLDocParser {
break;
case StreamTokenizer.TT_WORD :
// string inside META tag, can be attribute name
if (ATTRIBUTE_HTTP
if (ATTRIBUTE_CHARSET.equalsIgnoreCase(tokenizer.sval)) {
// found CHARSET attribute name
stateCharset = STATE_CHARSET_AFTER_NAME;
} else if (ATTRIBUTE_HTTP
.equalsIgnoreCase(tokenizer.sval)) {
// found HTTP-EQUIV attribute name
stateHttp = STATE_HTTP_AFTER_NAME;
......@@ -260,6 +271,9 @@ public class HTMLDocParser {
// some other attribute name or string,
// reset states of seeked attributes,
// unless successfully processed earlier
if (stateCharset != STATE_CHARSET_DONE) {
stateCharset = STATE_CHARSET_START;
}
if (stateHttp != STATE_HTTP_DONE) {
stateHttp = STATE_HTTP_START;
}
......@@ -271,7 +285,10 @@ public class HTMLDocParser {
case '=' :
// = inside META tag, can separate interesing us
// attribute names from values
if (stateHttp == STATE_HTTP_AFTER_NAME) {
if (stateCharset == STATE_CHARSET_AFTER_NAME) {
// we have CHARSET=
stateCharset = STATE_CHARSET_AFTER_EQ;
} else if (stateHttp == STATE_HTTP_AFTER_NAME) {
// we have HTTP-EQUIV=
stateHttp = STATE_HTTP_AFTER_EQ;
} else if (stateContent == STATE_CONTENT_AFTER_NAME) {
......@@ -282,6 +299,9 @@ public class HTMLDocParser {
// name or string,
// reset states of seeked attributes,
// unless successfully processed earlier
if (stateCharset != STATE_CHARSET_DONE) {
stateCharset = STATE_CHARSET_START;
}
if (stateHttp != STATE_HTTP_DONE) {
stateHttp = STATE_HTTP_START;
}
......@@ -293,7 +313,12 @@ public class HTMLDocParser {
case '\"' :
// quoted string inside META tag, can be
// attribute value
if (stateHttp == STATE_HTTP_AFTER_EQ) {
if (stateCharset == STATE_CHARSET_AFTER_EQ) {
// value of CHARSET attribute
// we found <META CHARSET="***"
stateContent = STATE_CHARSET_DONE;
return tokenizer.sval.isEmpty() ? null : tokenizer.sval;
} else if (stateHttp == STATE_HTTP_AFTER_EQ) {
// value of HTTP-EQUIV attribute
if (ATTRIBUTE_HTTP_VALUE
.equalsIgnoreCase(tokenizer.sval)) {
......@@ -314,6 +339,7 @@ public class HTMLDocParser {
} else {
// value for the attribute is missing
// reset states of seeked attributes
stateCharset = STATE_CHARSET_START;
stateHttp = STATE_HTTP_START;
stateContent = STATE_CONTENT_START;
}
......@@ -322,6 +348,9 @@ public class HTMLDocParser {
// other unexpected token inside META tag
// reset states of seeked attributes,
// unless successfully processed earlier
if (stateCharset != STATE_CHARSET_DONE) {
stateCharset = STATE_CHARSET_START;
}
if (stateHttp != STATE_HTTP_DONE) {
stateHttp = STATE_HTTP_START;
}
......
org.eclipse.help.base/src/org/eclipse/help/internal/search/IndexingOperation.java
View file @ 2e035052
......@@ -104,8 +104,7 @@ class IndexingOperation {
removeStaleDocuments(subMonitor.split(numRemoved), staleDocs);
checkCancelled(pm);
// 2. merge prebult plugin indexes and addjust
addNewDocuments(subMonitor.split(10 * numAdded), newDocs,
staleDocs.size() == 0);
addNewDocuments(subMonitor.split(10 * numAdded), newDocs, staleDocs.isEmpty());
pm.done();
BaseHelpSystem.getLocalSearchManager().clearSearchParticipants();
......@@ -156,7 +155,7 @@ class IndexingOperation {
Map<String, String[]> docsToDelete = calculateNewToRemove(newDocs, prebuiltDocs);
SubMonitor subMonitor = SubMonitor.convert(pm, 10 * docsToIndex.size() + docsToDelete.size());
checkCancelled(pm);
addDocuments(subMonitor.split(10 * docsToIndex.size()), docsToIndex, docsToDelete.size() == 0);
addDocuments(subMonitor.split(10 * docsToIndex.size()), docsToIndex, docsToDelete.isEmpty());
checkCancelled(pm);
removeNewDocuments(subMonitor.split(docsToDelete.size()), docsToDelete);
pm.done();
......@@ -195,7 +194,7 @@ class IndexingOperation {
*/
private void removeNewDocuments(IProgressMonitor pm, Map<String, String[]> docsToDelete)
throws IndexingException {
if (docsToDelete.size() == 0) {
if (docsToDelete.isEmpty()) {
return;
}
pm = new LazyProgressMonitor(pm);
......@@ -463,7 +462,7 @@ class IndexingOperation {
private void add(String href, Set<String> hrefs) {
if (href != null
&& !href.equals("") && !href.startsWith("http://") && !href.startsWith("https://")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
&& !href.isEmpty() && !href.startsWith("http://") && !href.startsWith("https://")) //$NON-NLS-1$ //$NON-NLS-2$
hrefs.add(href);
}
......
org.eclipse.help.base/src/org/eclipse/help/internal/search/PluginIndex.java
View file @ 2e035052
......@@ -154,7 +154,7 @@ public class PluginIndex {
.getProperty(SearchIndex.DEPENDENCIES_KEY_ANALYZER);
if (!targetIndex.isLuceneCompatible(lucene) || !targetIndex.isAnalyzerCompatible(analyzer)) {
String message = "Unable to consume Lucene index from bundle '" + bundle.toString() //$NON-NLS-1$
+ "'. The index should be rebuilt with Lucene 8.0.0"; //$NON-NLS-1$
+ "'. The index should be rebuilt with Lucene 8.4.1"; //$NON-NLS-1$
Status warningStatus = new Status(IStatus.WARNING, HelpBasePlugin.PLUGIN_ID, IStatus.OK, message, null);
HelpBasePlugin.logStatus(warningStatus);
return false;
......
org.eclipse.help.base/src/org/eclipse/help/internal/search/PrebuiltIndexes.java
View file @ 2e035052
......@@ -46,7 +46,7 @@ public class PrebuiltIndexes {
List<PluginIndex> indexes = new ArrayList<>(set);
for (int i = 0; i < indexes.size();) {
PluginIndex index = indexes.get(i);
if (index.getPaths().size() == 0) {
if (index.getPaths().isEmpty()) {
set.remove(index);
}
i++;
......
org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
View file @ 2e035052
......@@ -260,7 +260,7 @@ public class QueryBuilder {
// Get queries for parts separated by OR
List<Query> requiredQueries = getRequiredQueries(searchTokens, fieldNames,
boosts);
if (requiredQueries.size() == 0)
if (requiredQueries.isEmpty())
return null;
else if (requiredQueries.size() <= 1)
return requiredQueries.get(0);
......
org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
View file @ 2e035052
......@@ -758,9 +758,9 @@ public class SearchIndex implements IHelpSearchIndex {
}
Version luceneVersion = new Version(luceneVersionString);
Version indexVersion = new Version(indexVersionString);
Version v800 = new Version(8, 0, 0);
if (indexVersion.compareTo(v800) < 0) {
// index is older than Lucene 8.0.0
Version v840 = new Version(8, 4, 0);
if (indexVersion.compareTo(v840) < 0) {
// index is older than Lucene 8.4.0
return false;
}
if ( luceneVersion.compareTo(indexVersion) >= 0 ) {
......
org.eclipse.help.base/src/org/eclipse/help/internal/workingset/AdaptableTopic.java
View file @ 2e035052
......@@ -14,12 +14,14 @@
*******************************************************************************/
package org.eclipse.help.internal.workingset;
import java.util.ArrayDeque;
import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.help.*;
import org.eclipse.help.internal.util.*;
import org.w3c.dom.*;
import org.eclipse.help.IHelpResource;
import org.eclipse.help.ITopic;
import org.w3c.dom.Element;
/**
* Makes help resources adaptable and persistable
......@@ -76,7 +78,7 @@ public class AdaptableTopic extends AdaptableHelpResource {
// traverse TOC and fill in the topicMap
topicMap = new HashMap<>();
topicMap.put(getHref(), element);
FastStack<ITopic> stack = new FastStack<>();
Deque<ITopic> stack = new ArrayDeque<>();
ITopic[] topics = getSubtopics();
for (ITopic topic : topics)
stack.push(topic);
......