Skip to content

Fix CSS Spy for the e4 engine's SAC removal #2385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix CSS Spy for the e4 engine's SAC removal #2385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CSSScratchPadPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.w3c.css.sac.CSSParseException;
import org.w3c.dom.stylesheets.StyleSheet;
import org.w3c.dom.stylesheets.StyleSheetList;

Expand Down Expand Up @@ -153,9 +152,8 @@ private void applyCSS() {

long nanoDiff = System.nanoTime() - start;
sb.append(MessageFormat.format("\n{0}", MessageFormat.format(Messages.CSSScratchPadPart_Time_ms, nanoDiff / 1000000))); //$NON-NLS-1$
} catch (CSSParseException e) {
sb.append(MessageFormat.format("\n{0}", MessageFormat.format(Messages.CSSScratchPadPart_Error_line_col, e.getLineNumber(), e.getColumnNumber(), e.getLocalizedMessage()))); //$NON-NLS-1$
} catch (IOException e) {
} catch (IOException | RuntimeException e) {
// e4's parser throws an unchecked CssParseException whose message already carries line and column.
sb.append(MessageFormat.format("\n{0}", MessageFormat.format(Messages.CSSScratchPadPart_Error, e.getLocalizedMessage()))); //$NON-NLS-1$
}
}
Expand Down
3 changes: 2 additions & 1 deletion ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/CssSpyPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,8 @@ private void appendWidgetSubtree(Widget widget, StringBuilder sb, int depth) {
*/
private Map<String, String> getCSSRuleSources(CSSEngine engine, CSSStylableElement element) {
Map<String, String> sources = new HashMap<>();
if (!(engine instanceof DocumentCSS docCSS)) {
DocumentCSS docCSS = engine.getDocumentCSS();
if (docCSS == null) {
return sources;
}
StyleSheetList sheets = docCSS.getStyleSheets();
Expand Down
1 change: 0 additions & 1 deletion ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ private Messages() {
public static String CSSScratchPadPart_Close;
public static String CSSScratchPadPart_Engine;
public static String CSSScratchPadPart_Error;
public static String CSSScratchPadPart_Error_line_col;
public static String CSSScratchPadPart_No_theme_engine_available;
public static String CSSScratchPadPart_Time_ms;
public static String CssSpyPart_actual_values;
Expand Down
1 change: 0 additions & 1 deletion ui/org.eclipse.pde.spy.css/src/org/eclipse/pde/spy/css/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ CSSScratchPadPart_Apply=Apply
CSSScratchPadPart_Close=Close
CSSScratchPadPart_Engine=Engine[{0}]
CSSScratchPadPart_Error=Error: {0}
CSSScratchPadPart_Error_line_col=Error: line {0} col {1}: {2}
CSSScratchPadPart_No_theme_engine_available=No theme engine available!
CSSScratchPadPart_Time_ms=Time: {0}ms
CssSpyPart_actual_values=actual values
Expand Down
Loading