Menu
▾
▴
csseditor-cvs — CSS Editor CVS Commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(83) |
Feb
(10) |
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Christopher L. <ce...@us...> - 2004-06-25 10:37:09
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor.tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14725 Modified Files: .classpath Log Message: As PDE likes it (or whatever) Index: .classpath =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/.classpath,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** .classpath 12 Feb 2004 12:05:20 -0000 1.5 --- .classpath 25 Jun 2004 10:36:59 -0000 1.6 *************** *** 1,8 **** <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry kind="src" path="src"/> <classpathentry sourcepath="lib/mockobjectssrc.zip" kind="lib" path="lib/mockobjects.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> --- 1,8 ---- <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry kind="src" path="src/"/> <classpathentry sourcepath="lib/mockobjectssrc.zip" kind="lib" path="lib/mockobjects.jar"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Christopher L. <ce...@us...> - 2004-06-25 10:32:36
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14033/icons Modified Files: style_sheet_obj.gif Log Message: Adapted to new 3.0 icon style Index: style_sheet_obj.gif =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/icons/style_sheet_obj.gif,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsiPErYy and /tmp/cvsPVPAza differ |
|
From: Christopher L. <ce...@us...> - 2004-06-25 10:31:21
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13769/icons Removed Files: class_obj.gif int_obj.gif Log Message: Removed unused icons --- int_obj.gif DELETED --- --- class_obj.gif DELETED --- |
|
From: Christopher L. <ce...@us...> - 2004-06-25 10:17:17
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11481 Modified Files: plugin.xml Log Message: Bump up version number Index: plugin.xml =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/plugin.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** plugin.xml 25 Jun 2004 09:51:22 -0000 1.7 --- plugin.xml 25 Jun 2004 10:17:08 -0000 1.8 *************** *** 4,8 **** id="net.sourceforge.csseditor" name="%pluginName" ! version="0.0.3" provider-name="%providerName" class="net.sourceforge.csseditor.CssEditorPlugin"> --- 4,8 ---- id="net.sourceforge.csseditor" name="%pluginName" ! version="0.0.4" provider-name="%providerName" class="net.sourceforge.csseditor.CssEditorPlugin"> |
|
From: Christopher L. <ce...@us...> - 2004-06-25 10:17:09
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor.tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11416 Modified Files: plugin.xml Log Message: Bump up version number Index: plugin.xml =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/plugin.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** plugin.xml 12 Feb 2004 13:06:34 -0000 1.6 --- plugin.xml 25 Jun 2004 10:17:00 -0000 1.7 *************** *** 4,8 **** id="net.sourceforge.csseditor.tests" name="Cascading Style Sheets Editor Unit Tests" ! version="0.0.3"> <runtime> --- 4,8 ---- id="net.sourceforge.csseditor.tests" name="Cascading Style Sheets Editor Unit Tests" ! version="0.0.4"> <runtime> *************** *** 13,30 **** </runtime> <requires> - <import plugin="org.eclipse.ui.ide"/> - <import plugin="org.eclipse.ui.views"/> - <import plugin="org.eclipse.ui.editors"/> <import plugin="net.sourceforge.csseditor"/> <import plugin="org.eclipse.jface"/> <import plugin="org.eclipse.jface.text"/> - <import plugin="org.eclipse.swt"/> - <import plugin="org.eclipse.text"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.ui.workbench.texteditor"/> <import plugin="org.junit"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.eclipse.core.runtime.compatibility"/> - <import plugin="org.eclipse.osgi"/> </requires> --- 13,25 ---- </runtime> <requires> <import plugin="net.sourceforge.csseditor"/> + <import plugin="org.eclipse.core.resources"/> + <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.jface"/> <import plugin="org.eclipse.jface.text"/> <import plugin="org.eclipse.ui"/> + <import plugin="org.eclipse.ui.ide"/> <import plugin="org.eclipse.ui.workbench.texteditor"/> <import plugin="org.junit"/> </requires> |
|
From: Christopher L. <ce...@us...> - 2004-06-25 09:56:03
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7608/src/net/sourceforge/csseditor/internal/text Modified Files: CssPartitionScanner.java Log Message: Strings can span multiple lines using back-slash for line continuation Index: CssPartitionScanner.java =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text/CssPartitionScanner.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CssPartitionScanner.java 25 Jan 2004 09:14:55 -0000 1.2 --- CssPartitionScanner.java 25 Jun 2004 09:55:53 -0000 1.3 *************** *** 1,65 **** ! /* ! * Copyright (c) 2003 Christopher Lenz and others. ! * All rights reserved. This program and the accompanying materials ! * are made available under the terms of the Common Public License v1.0 ! * which accompanies this distribution, and is available at ! * http://www.eclipse.org/legal/cpl-v10.html ! * ! * Contributors: ! * Christopher Lenz - initial API and implementation ! * ! * $Id$ ! */ ! ! package net.sourceforge.csseditor.internal.text; ! ! import java.util.ArrayList; ! import java.util.List; ! ! import org.eclipse.jface.text.rules.IPredicateRule; ! import org.eclipse.jface.text.rules.IToken; ! import org.eclipse.jface.text.rules.MultiLineRule; ! import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; ! import org.eclipse.jface.text.rules.SingleLineRule; ! import org.eclipse.jface.text.rules.Token; ! ! /** ! * ! */ ! public class CssPartitionScanner extends RuleBasedPartitionScanner { ! ! // Constants --------------------------------------------------------------- ! ! public static final String CSS_COMMENT = ! "__css_comment_partition_content_type"; //$NON-NLS-1$ ! ! public static final String CSS_STRING = ! "__css_string_partition_content_type"; //$NON-NLS-1$ ! ! // Constructors ------------------------------------------------------------ ! ! /** ! * Constructor. ! */ ! public CssPartitionScanner() { ! ! IToken commentToken = new Token(CSS_COMMENT); ! IToken stringToken = new Token(CSS_STRING); ! ! List rules = new ArrayList(); ! ! rules.add(new MultiLineRule( ! "/*", "*/", commentToken)); //$NON-NLS-1$ //$NON-NLS-2$ ! ! // TODO Strings can be continued over a new line using the escape ! // character (#42613) ! rules.add(new SingleLineRule( ! "\"", "\"", stringToken, '\\')); //$NON-NLS-1$ //$NON-NLS-2$ ! rules.add(new SingleLineRule( ! "'", "'", stringToken, '\\')); //$NON-NLS-1$ //$NON-NLS-2$ ! ! setPredicateRules((IPredicateRule[]) ! rules.toArray(new IPredicateRule[rules.size()])); ! } ! ! } --- 1,63 ---- ! /* ! * Copyright (c) 2003 Christopher Lenz and others. ! * All rights reserved. This program and the accompanying materials ! * are made available under the terms of the Common Public License v1.0 ! * which accompanies this distribution, and is available at ! * http://www.eclipse.org/legal/cpl-v10.html ! * ! * Contributors: ! * Christopher Lenz - initial API and implementation ! * ! * $Id$ ! */ ! ! package net.sourceforge.csseditor.internal.text; ! ! import java.util.ArrayList; ! import java.util.List; ! ! import org.eclipse.jface.text.rules.IPredicateRule; ! import org.eclipse.jface.text.rules.IToken; ! import org.eclipse.jface.text.rules.MultiLineRule; ! import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; ! import org.eclipse.jface.text.rules.SingleLineRule; ! import org.eclipse.jface.text.rules.Token; ! ! /** ! * ! */ ! public class CssPartitionScanner extends RuleBasedPartitionScanner { ! ! // Constants --------------------------------------------------------------- ! ! public static final String CSS_COMMENT = ! "__css_comment_partition_content_type"; //$NON-NLS-1$ ! ! public static final String CSS_STRING = ! "__css_string_partition_content_type"; //$NON-NLS-1$ ! ! // Constructors ------------------------------------------------------------ ! ! /** ! * Constructor. ! */ ! public CssPartitionScanner() { ! ! IToken commentToken = new Token(CSS_COMMENT); ! IToken stringToken = new Token(CSS_STRING); ! ! List rules = new ArrayList(); ! ! rules.add(new MultiLineRule( ! "/*", "*/", commentToken)); //$NON-NLS-1$ //$NON-NLS-2$ ! ! rules.add(new SingleLineRule("\"", "\"", //$NON-NLS-1$ //$NON-NLS-2$ ! stringToken, '\\', false, true)); ! rules.add(new SingleLineRule("'", "'", //$NON-NLS-1$ //$NON-NLS-2$ ! stringToken, '\\', false, true)); ! ! setPredicateRules((IPredicateRule[]) ! rules.toArray(new IPredicateRule[rules.size()])); ! } ! ! } |
|
From: Christopher L. <ce...@us...> - 2004-06-25 09:51:40
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6750/src/net/sourceforge/csseditor/internal Modified Files: CssEditorPreferences.java Log Message: Fixes for Eclipse 3.0 Index: CssEditorPreferences.java =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/CssEditorPreferences.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CssEditorPreferences.java 14 Dec 2003 21:59:34 -0000 1.1.1.1 --- CssEditorPreferences.java 25 Jun 2004 09:51:23 -0000 1.2 *************** *** 18,22 **** import org.eclipse.swt.graphics.RGB; import org.eclipse.ui.texteditor.AbstractTextEditor; ! import org.eclipse.ui.texteditor.ExtendedTextEditorPreferenceConstants; /** --- 18,22 ---- import org.eclipse.swt.graphics.RGB; import org.eclipse.ui.texteditor.AbstractTextEditor; ! import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; /** *************** *** 34,59 **** public static final String EDITOR_CURRENT_LINE = ! ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE; public static final String EDITOR_CURRENT_LINE_COLOR = ! ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR; public static final String EDITOR_LINE_NUMBER_RULER = ! ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER; public static final String EDITOR_LINE_NUMBER_RULER_COLOR = ! ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR; public static final String EDITOR_PRINT_MARGIN = ! ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN; public static final String EDITOR_PRINT_MARGIN_COLOR = ! ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR; public static final String EDITOR_PRINT_MARGIN_COLUMN = ! ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN; public static final String EDITOR_OVERVIEW_RULER = ! ExtendedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER; public static final String EDITOR_BACKGROUND_DEFAULT_COLOR = --- 34,59 ---- public static final String EDITOR_CURRENT_LINE = ! AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE; public static final String EDITOR_CURRENT_LINE_COLOR = ! AbstractDecoratedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR; public static final String EDITOR_LINE_NUMBER_RULER = ! AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER; public static final String EDITOR_LINE_NUMBER_RULER_COLOR = ! AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR; public static final String EDITOR_PRINT_MARGIN = ! AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN; public static final String EDITOR_PRINT_MARGIN_COLOR = ! AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR; public static final String EDITOR_PRINT_MARGIN_COLUMN = ! AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN; public static final String EDITOR_OVERVIEW_RULER = ! AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER; public static final String EDITOR_BACKGROUND_DEFAULT_COLOR = |
|
From: Christopher L. <ce...@us...> - 2004-06-25 09:51:39
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6750/src/net/sourceforge/csseditor Modified Files: CssEditorPlugin.java Log Message: Fixes for Eclipse 3.0 Index: CssEditorPlugin.java =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/CssEditorPlugin.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CssEditorPlugin.java 27 Dec 2003 18:46:56 -0000 1.2 --- CssEditorPlugin.java 25 Jun 2004 09:51:22 -0000 1.3 *************** *** 14,22 **** package net.sourceforge.csseditor; - import java.net.MalformedURLException; import java.net.URL; ! import org.eclipse.core.runtime.CoreException; ! import org.eclipse.core.runtime.IPluginDescriptor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; --- 14,23 ---- package net.sourceforge.csseditor; import java.net.URL; ! import net.sourceforge.csseditor.internal.CssEditorPreferences; ! import net.sourceforge.csseditor.internal.ProfileManager; ! import net.sourceforge.csseditor.text.CssTextTools; ! import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; *************** *** 26,33 **** import org.eclipse.ui.editors.text.TextEditorPreferenceConstants; import org.eclipse.ui.plugin.AbstractUIPlugin; ! ! import net.sourceforge.csseditor.internal.CssEditorPreferences; ! import net.sourceforge.csseditor.internal.ProfileManager; ! import net.sourceforge.csseditor.text.CssTextTools; /** --- 27,31 ---- import org.eclipse.ui.editors.text.TextEditorPreferenceConstants; import org.eclipse.ui.plugin.AbstractUIPlugin; ! import org.osgi.framework.BundleContext; /** *************** *** 79,84 **** * @param descriptor the plugin descriptor. */ ! public CssEditorPlugin(IPluginDescriptor descriptor) { ! super(descriptor); plugin = this; } --- 77,81 ---- * @param descriptor the plugin descriptor. */ ! public CssEditorPlugin() { plugin = this; } *************** *** 101,105 **** */ public static String getPluginId() { ! return getDefault().getDescriptor().getUniqueIdentifier(); } --- 98,102 ---- */ public static String getPluginId() { ! return getDefault().getBundle().getSymbolicName(); } *************** *** 139,145 **** URL url = null; try { ! url = new URL(getDescriptor().getInstallURL(), ! "icons/" + key); //$NON-NLS-1$ ! } catch (MalformedURLException e) { // we'll just return null } --- 136,142 ---- URL url = null; try { ! url = getBundle().getEntry("/icons/" + key); //$NON-NLS-1$ ! return ImageDescriptor.createFromURL(url); ! } catch (IllegalStateException e) { // we'll just return null } *************** *** 173,184 **** /* ! * @see org.eclipse.core.runtime.Plugin#shutdown() */ ! public void shutdown() throws CoreException { if (textTools != null) { textTools.dispose(); textTools = null; } ! super.shutdown(); } --- 170,181 ---- /* ! * @see org.eclipse.core.runtime.Plugin#stop(BundleContext) */ ! public void stop(BundleContext context) throws Exception { if (textTools != null) { textTools.dispose(); textTools = null; } ! super.stop(context); } |
|
From: Christopher L. <ce...@us...> - 2004-06-25 09:51:39
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6750/src/net/sourceforge/csseditor/internal/text Modified Files: CssReconcilingStrategy.java Log Message: Fixes for Eclipse 3.0 Index: CssReconcilingStrategy.java =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text/CssReconcilingStrategy.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CssReconcilingStrategy.java 27 Dec 2003 14:33:09 -0000 1.2 --- CssReconcilingStrategy.java 25 Jun 2004 09:51:21 -0000 1.3 *************** *** 23,27 **** import org.eclipse.jface.text.Position; import org.eclipse.jface.text.reconciler.DirtyRegion; - import org.eclipse.jface.text.reconciler.DocumentAdapter; import org.eclipse.jface.text.reconciler.IReconcileResult; import org.eclipse.jface.text.reconciler.IReconcileStep; --- 23,26 ---- *************** *** 62,66 **** public CssReconcilingStrategy(ITextEditor editor) { this.editor = editor; ! this.firstStep = new CssReconcileStep(this.editor); } --- 61,65 ---- public CssReconcilingStrategy(ITextEditor editor) { this.editor = editor; ! firstStep = new CssReconcileStep(editor); } *************** *** 72,76 **** public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) { removeTemporaryAnnotations(); ! process(this.firstStep.reconcile(dirtyRegion, subRegion)); } --- 71,75 ---- public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) { removeTemporaryAnnotations(); ! process(firstStep.reconcile(dirtyRegion, subRegion)); } *************** *** 80,84 **** public void reconcile(IRegion partition) { removeTemporaryAnnotations(); ! process(this.firstStep.reconcile(partition)); } --- 79,83 ---- public void reconcile(IRegion partition) { removeTemporaryAnnotations(); ! process(firstStep.reconcile(partition)); } *************** *** 87,91 **** */ public void setDocument(IDocument document) { ! this.firstStep.setInputModel(new DocumentAdapter(document)); } --- 86,91 ---- */ public void setDocument(IDocument document) { ! // TODO firstStep.setInputModel(new DocumentAdapter(document)); ! firstStep.setInputModel(null); } *************** *** 96,100 **** */ public void initialReconcile() { ! this.firstStep.reconcile(null); } --- 96,100 ---- */ public void initialReconcile() { ! process(firstStep.reconcile(null)); } *************** *** 103,108 **** */ public void setProgressMonitor(IProgressMonitor monitor) { ! this.firstStep.setProgressMonitor(monitor); ! this.progressMonitor = monitor; } --- 103,108 ---- */ public void setProgressMonitor(IProgressMonitor monitor) { ! firstStep.setProgressMonitor(monitor); ! progressMonitor = monitor; } *************** *** 115,120 **** */ private IAnnotationModel getAnnotationModel() { ! IEditorInput input = this.editor.getEditorInput(); ! return this.editor.getDocumentProvider().getAnnotationModel(input); } --- 115,120 ---- */ private IAnnotationModel getAnnotationModel() { ! IEditorInput input = editor.getEditorInput(); ! return editor.getDocumentProvider().getAnnotationModel(input); } *************** *** 129,134 **** protected void execute(IProgressMonitor monitor) { for (int i = 0; i < results.length; i++) { ! if ((CssReconcilingStrategy.this.progressMonitor != null) ! && (CssReconcilingStrategy.this.progressMonitor.isCanceled())) { return; } --- 129,134 ---- protected void execute(IProgressMonitor monitor) { for (int i = 0; i < results.length; i++) { ! if ((progressMonitor != null) ! && (progressMonitor.isCanceled())) { return; } |
|
From: Christopher L. <ce...@us...> - 2004-06-25 09:51:39
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6750 Modified Files: plugin.xml Log Message: Fixes for Eclipse 3.0 Index: plugin.xml =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/plugin.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** plugin.xml 12 Feb 2004 12:42:10 -0000 1.6 --- plugin.xml 25 Jun 2004 09:51:22 -0000 1.7 *************** *** 14,19 **** <import plugin="org.eclipse.compare"/> <import plugin="org.eclipse.core.resources"/> ! <import plugin="org.eclipse.core.runtime.compatibility"/> ! <import plugin="org.eclipse.help"/> <import plugin="org.eclipse.jface.text"/> <import plugin="org.eclipse.osgi"/> --- 14,18 ---- <import plugin="org.eclipse.compare"/> <import plugin="org.eclipse.core.resources"/> ! <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.jface.text"/> <import plugin="org.eclipse.osgi"/> |
|
From: <ce...@us...> - 2004-02-12 13:54:36
|
Update of /cvsroot/csseditor/htdocs/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30590/images Added Files: screenshot_small.png Log Message: Add small screenshot for the plugin central --- NEW FILE: screenshot_small.png --- (This appears to be a binary file; contents omitted.) |
|
From: <ce...@us...> - 2004-02-12 13:11:27
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor.tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21101 Modified Files: plugin.xml Log Message: Increase version number Index: plugin.xml =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/plugin.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** plugin.xml 4 Feb 2004 09:42:29 -0000 1.5 --- plugin.xml 12 Feb 2004 13:06:34 -0000 1.6 *************** *** 4,8 **** id="net.sourceforge.csseditor.tests" name="Cascading Style Sheets Editor Unit Tests" ! version="0.0.1"> <runtime> --- 4,8 ---- id="net.sourceforge.csseditor.tests" name="Cascading Style Sheets Editor Unit Tests" ! version="0.0.3"> <runtime> *************** *** 29,31 **** --- 29,32 ---- </requires> + </plugin> |
|
From: <ce...@us...> - 2004-02-12 12:47:03
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16797 Modified Files: plugin.xml Log Message: Increase version number Index: plugin.xml =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/plugin.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** plugin.xml 4 Feb 2004 09:42:21 -0000 1.5 --- plugin.xml 12 Feb 2004 12:42:10 -0000 1.6 *************** *** 4,8 **** id="net.sourceforge.csseditor" name="%pluginName" ! version="0.0.2" provider-name="%providerName" class="net.sourceforge.csseditor.CssEditorPlugin"> --- 4,8 ---- id="net.sourceforge.csseditor" name="%pluginName" ! version="0.0.3" provider-name="%providerName" class="net.sourceforge.csseditor.CssEditorPlugin"> |
|
From: <ce...@us...> - 2004-02-12 12:37:41
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14458/schema Modified Files: profiles.exsd Log Message: Fix target namespace Index: profiles.exsd =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/schema/profiles.exsd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** profiles.exsd 14 Dec 2003 21:59:32 -0000 1.1.1.1 --- profiles.exsd 12 Feb 2004 12:32:48 -0000 1.2 *************** *** 1,120 **** ! <?xml version='1.0' encoding='UTF-8'?> ! <!-- Schema file written by PDE --> ! <schema targetNamespace="net.sourceforge.wdt.css"> ! <annotation> ! <appInfo> ! <meta.schema plugin="net.sourceforge.wdt.css" id="profiles" name="CSS Profiles"/> ! </appInfo> ! <documentation> ! [Enter description of this extension point.] ! </documentation> ! </annotation> ! ! <element name="extension"> ! <complexType> ! <sequence> ! <element ref="profile" minOccurs="1" maxOccurs="unbounded"/> ! </sequence> ! <attribute name="point" type="string" use="required"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="id" type="string"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="name" type="string"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! </complexType> ! </element> ! ! <element name="profile"> ! <complexType> ! <attribute name="id" type="string" use="required"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="name" type="string" use="required"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="class" type="string" use="required"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="description" type="string"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! </complexType> ! </element> ! ! <annotation> ! <appInfo> ! <meta.section type="since"/> ! </appInfo> ! <documentation> ! [Enter the first release in which this extension point appears.] ! </documentation> ! </annotation> ! ! <annotation> ! <appInfo> ! <meta.section type="examples"/> ! </appInfo> ! <documentation> ! [Enter extension point usage example here.] ! </documentation> ! </annotation> ! ! <annotation> ! <appInfo> ! <meta.section type="apiInfo"/> ! </appInfo> ! <documentation> ! [Enter API information here.] ! </documentation> ! </annotation> ! ! <annotation> ! <appInfo> ! <meta.section type="implementation"/> ! </appInfo> ! <documentation> ! [Enter information about supplied implementation of this extension point.] ! </documentation> ! </annotation> ! ! <annotation> ! <appInfo> ! <meta.section type="copyright"/> ! </appInfo> ! <documentation> ! ! </documentation> ! </annotation> ! ! </schema> --- 1,120 ---- ! <?xml version='1.0' encoding='UTF-8'?> ! <!-- Schema file written by PDE --> ! <schema targetNamespace="net.sourceforge.csseditor"> ! <annotation> ! <appInfo> ! <meta.schema plugin="net.sourceforge.csseditor" id="profiles" name="CSS Profiles"/> ! </appInfo> ! <documentation> ! [Enter description of this extension point.] ! </documentation> ! </annotation> ! ! <element name="extension"> ! <complexType> ! <sequence> ! <element ref="profile" minOccurs="1" maxOccurs="unbounded"/> ! </sequence> ! <attribute name="point" type="string" use="required"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="id" type="string"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="name" type="string"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! </complexType> ! </element> ! ! <element name="profile"> ! <complexType> ! <attribute name="id" type="string" use="required"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="name" type="string" use="required"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="class" type="string" use="required"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! <attribute name="description" type="string"> ! <annotation> ! <documentation> ! ! </documentation> ! </annotation> ! </attribute> ! </complexType> ! </element> ! ! <annotation> ! <appInfo> ! <meta.section type="since"/> ! </appInfo> ! <documentation> ! [Enter the first release in which this extension point appears.] ! </documentation> ! </annotation> ! ! <annotation> ! <appInfo> ! <meta.section type="examples"/> ! </appInfo> ! <documentation> ! [Enter extension point usage example here.] ! </documentation> ! </annotation> ! ! <annotation> ! <appInfo> ! <meta.section type="apiInfo"/> ! </appInfo> ! <documentation> ! [Enter API information here.] ! </documentation> ! </annotation> ! ! <annotation> ! <appInfo> ! <meta.section type="implementation"/> ! </appInfo> ! <documentation> ! [Enter information about supplied implementation of this extension point.] ! </documentation> ! </annotation> ! ! <annotation> ! <appInfo> ! <meta.section type="copyright"/> ! </appInfo> ! <documentation> ! ! </documentation> ! </annotation> ! ! </schema> |
|
From: <ce...@us...> - 2004-02-12 12:10:20
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9168 Modified Files: .project .classpath Log Message: Use required plugins classpath container for dependencies Index: .project =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/.project,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .project 4 Feb 2004 09:42:21 -0000 1.3 --- .project 12 Feb 2004 12:05:29 -0000 1.4 *************** *** 4,19 **** <comment></comment> <projects> - <project>org.eclipse.compare</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.core.runtime.compatibility</project> - <project>org.eclipse.help</project> - <project>org.eclipse.jface.text</project> - <project>org.eclipse.osgi</project> - <project>org.eclipse.ui</project> - <project>org.eclipse.ui.editors</project> - <project>org.eclipse.ui.ide</project> - <project>org.eclipse.ui.views</project> - <project>org.eclipse.ui.workbench.texteditor</project> </projects> <buildSpec> --- 4,7 ---- Index: .classpath =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .classpath 4 Feb 2004 09:42:21 -0000 1.3 --- .classpath 12 Feb 2004 12:05:29 -0000 1.4 *************** *** 2,18 **** <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="/org.eclipse.compare"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.help"/> - <classpathentry kind="src" path="/org.eclipse.jface.text"/> - <classpathentry kind="src" path="/org.eclipse.osgi"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.ui.editors"/> - <classpathentry kind="src" path="/org.eclipse.ui.ide"/> - <classpathentry kind="src" path="/org.eclipse.ui.views"/> - <classpathentry kind="src" path="/org.eclipse.ui.workbench.texteditor"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime.compatibility"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> --- 2,7 ---- <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: <ce...@us...> - 2004-02-12 12:10:13
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor.tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9131 Modified Files: .project .classpath Log Message: Use required plugins classpath container for dependencies Index: .project =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/.project,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .project 4 Feb 2004 09:42:29 -0000 1.3 --- .project 12 Feb 2004 12:05:17 -0000 1.4 *************** *** 5,22 **** <projects> <project>net.sourceforge.csseditor</project> - <project>org.eclipse.core.resources</project> - <project>org.eclipse.core.runtime</project> - <project>org.eclipse.core.runtime.compatibility</project> - <project>org.eclipse.jface</project> - <project>org.eclipse.jface.text</project> - <project>org.eclipse.osgi</project> - <project>org.eclipse.swt</project> - <project>org.eclipse.text</project> - <project>org.eclipse.ui</project> - <project>org.eclipse.ui.editors</project> - <project>org.eclipse.ui.ide</project> - <project>org.eclipse.ui.views</project> - <project>org.eclipse.ui.workbench.texteditor</project> - <project>org.junit</project> </projects> <buildSpec> --- 5,8 ---- Index: .classpath =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/.classpath,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .classpath 4 Feb 2004 09:42:29 -0000 1.4 --- .classpath 12 Feb 2004 12:05:20 -0000 1.5 *************** *** 3,22 **** <classpathentry kind="src" path="src"/> <classpathentry sourcepath="lib/mockobjectssrc.zip" kind="lib" path="lib/mockobjects.jar"/> - <classpathentry kind="src" path="/org.eclipse.ui.ide"/> - <classpathentry kind="src" path="/org.eclipse.ui.views"/> - <classpathentry kind="src" path="/org.eclipse.ui.editors"/> - <classpathentry kind="src" path="/net.sourceforge.csseditor"/> - <classpathentry kind="src" path="/org.eclipse.jface"/> - <classpathentry kind="src" path="/org.eclipse.jface.text"/> - <classpathentry kind="src" path="/org.eclipse.swt"/> - <classpathentry kind="src" path="/org.eclipse.text"/> - <classpathentry kind="src" path="/org.eclipse.ui"/> - <classpathentry kind="src" path="/org.eclipse.ui.workbench.texteditor"/> - <classpathentry kind="src" path="/org.junit"/> - <classpathentry kind="src" path="/org.eclipse.core.resources"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime"/> - <classpathentry kind="src" path="/org.eclipse.osgi"/> - <classpathentry kind="src" path="/org.eclipse.core.runtime.compatibility"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> </classpath> --- 3,8 ---- <classpathentry kind="src" path="src"/> <classpathentry sourcepath="lib/mockobjectssrc.zip" kind="lib" path="lib/mockobjects.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: <ce...@us...> - 2004-02-04 12:04:42
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31527/src/net/sourceforge/csseditor/internal/text Modified Files: CssAutoEditStrategy.java Log Message: Fix for bug #890413 [Insert space for tabs preference ignored] Index: CssAutoEditStrategy.java =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text/CssAutoEditStrategy.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CssAutoEditStrategy.java 4 Feb 2004 09:43:42 -0000 1.3 --- CssAutoEditStrategy.java 4 Feb 2004 12:01:57 -0000 1.4 *************** *** 106,110 **** } } ! convertTabs(d, c); } } --- 106,112 ---- } } ! if (store.getBoolean(SPACES_FOR_TABS)) { ! convertTabs(d, c); ! } } } |
|
From: <ce...@us...> - 2004-02-04 09:46:03
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5503/src/net/sourceforge/csseditor/internal/text Modified Files: CssAutoEditStrategy.java Log Message: Fix bug #876042 where pasting text with tabs would insert DocumentCommand.toString() instead of the actual text on the clipboard. Thanks to Matt Brozowski for the patch! Index: CssAutoEditStrategy.java =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text/CssAutoEditStrategy.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CssAutoEditStrategy.java 27 Dec 2003 16:53:09 -0000 1.2 --- CssAutoEditStrategy.java 4 Feb 2004 09:43:42 -0000 1.3 *************** *** 142,146 **** position += remainder; } else { ! buffer.append(c); position++; } --- 142,146 ---- position += remainder; } else { ! buffer.append(ch); position++; } |
|
From: <ce...@us...> - 2004-02-04 09:44:57
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor.tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5255 Modified Files: .project plugin.xml .classpath Log Message: Make the plugin work in builds after M6 (I hope) Index: .project =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .project 12 Jan 2004 17:27:50 -0000 1.2 --- .project 4 Feb 2004 09:42:29 -0000 1.3 *************** *** 7,10 **** --- 7,11 ---- <project>org.eclipse.core.resources</project> <project>org.eclipse.core.runtime</project> + <project>org.eclipse.core.runtime.compatibility</project> <project>org.eclipse.jface</project> <project>org.eclipse.jface.text</project> Index: plugin.xml =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/plugin.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** plugin.xml 12 Jan 2004 17:27:50 -0000 1.4 --- plugin.xml 4 Feb 2004 09:42:29 -0000 1.5 *************** *** 25,32 **** <import plugin="org.junit"/> <import plugin="org.eclipse.core.resources"/> ! <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.osgi"/> </requires> - </plugin> --- 25,31 ---- <import plugin="org.junit"/> <import plugin="org.eclipse.core.resources"/> ! <import plugin="org.eclipse.core.runtime.compatibility"/> <import plugin="org.eclipse.osgi"/> </requires> </plugin> Index: .classpath =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .classpath 12 Jan 2004 17:27:50 -0000 1.3 --- .classpath 4 Feb 2004 09:42:29 -0000 1.4 *************** *** 17,20 **** --- 17,21 ---- <classpathentry kind="src" path="/org.eclipse.core.runtime"/> <classpathentry kind="src" path="/org.eclipse.osgi"/> + <classpathentry kind="src" path="/org.eclipse.core.runtime.compatibility"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> |
|
From: <ce...@us...> - 2004-02-04 09:44:43
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5225 Modified Files: .project plugin.xml .classpath Log Message: Make the plugin work in builds after M6 (I hope) Index: .project =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/.project,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .project 27 Dec 2003 14:35:53 -0000 1.2 --- .project 4 Feb 2004 09:42:21 -0000 1.3 *************** *** 7,10 **** --- 7,11 ---- <project>org.eclipse.core.resources</project> <project>org.eclipse.core.runtime</project> + <project>org.eclipse.core.runtime.compatibility</project> <project>org.eclipse.help</project> <project>org.eclipse.jface.text</project> Index: plugin.xml =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/plugin.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** plugin.xml 13 Jan 2004 12:16:25 -0000 1.4 --- plugin.xml 4 Feb 2004 09:42:21 -0000 1.5 *************** *** 14,18 **** <import plugin="org.eclipse.compare"/> <import plugin="org.eclipse.core.resources"/> ! <import plugin="org.eclipse.core.runtime"/> <import plugin="org.eclipse.help"/> <import plugin="org.eclipse.jface.text"/> --- 14,18 ---- <import plugin="org.eclipse.compare"/> <import plugin="org.eclipse.core.resources"/> ! <import plugin="org.eclipse.core.runtime.compatibility"/> <import plugin="org.eclipse.help"/> <import plugin="org.eclipse.jface.text"/> *************** *** 25,29 **** </requires> - <extension-point id="profiles" name="CSS Profiles" schema="schema/profiles.exsd"/> --- 25,28 ---- *************** *** 32,39 **** <editor name="%editorName" - icon="icons/style_sheet_obj.gif" extensions="css" ! contributorClass="net.sourceforge.csseditor.internal.editor.CssEditorActionContributor" class="net.sourceforge.csseditor.internal.editor.CssEditor" id="net.sourceforge.csseditor.editor"> </editor> --- 31,38 ---- <editor name="%editorName" extensions="css" ! icon="icons/style_sheet_obj.gif" class="net.sourceforge.csseditor.internal.editor.CssEditor" + contributorClass="net.sourceforge.csseditor.internal.editor.CssEditorActionContributor" id="net.sourceforge.csseditor.editor"> </editor> *************** *** 93,98 **** objectClass="org.eclipse.core.resources.IResource" name="%propertyPage.name" - nameFilter="*.css" class="net.sourceforge.csseditor.internal.properties.CssPropertyPage" id="net.sourceforge.csseditor.propertyPage"> </page> --- 92,97 ---- objectClass="org.eclipse.core.resources.IResource" name="%propertyPage.name" class="net.sourceforge.csseditor.internal.properties.CssPropertyPage" + nameFilter="*.css" id="net.sourceforge.csseditor.propertyPage"> </page> *************** *** 107,112 **** <command name="%commentAction.label" - description="%commentAction.description" category="org.eclipse.jdt.ui.category.source" id="net.sourceforge.csseditor.commentAction"> </command> --- 106,111 ---- <command name="%commentAction.label" category="org.eclipse.jdt.ui.category.source" + description="%commentAction.description" id="net.sourceforge.csseditor.commentAction"> </command> *************** *** 130,135 **** <command name="%uncommentAction.label" - description="%uncommentAction.description" category="org.eclipse.jdt.ui.category.source" id="net.sourceforge.csseditor.uncommentAction"> </command> --- 129,134 ---- <command name="%uncommentAction.label" category="org.eclipse.jdt.ui.category.source" + description="%uncommentAction.description" id="net.sourceforge.csseditor.uncommentAction"> </command> *************** *** 167,178 **** <action label="%shiftLeftAction.label" - retarget="true" menubarPath="net.sourceforge.csseditor.sourceMenu/editGroup" id="org.eclipse.ui.edit.text.shiftLeft"> </action> <action label="%shiftRightAction.label" - retarget="true" menubarPath="net.sourceforge.csseditor.sourceMenu/editGroup" id="org.eclipse.ui.edit.text.shiftRight"> </action> --- 166,177 ---- <action label="%shiftLeftAction.label" menubarPath="net.sourceforge.csseditor.sourceMenu/editGroup" + retarget="true" id="org.eclipse.ui.edit.text.shiftLeft"> </action> <action label="%shiftRightAction.label" menubarPath="net.sourceforge.csseditor.sourceMenu/editGroup" + retarget="true" id="org.eclipse.ui.edit.text.shiftRight"> </action> *************** *** 180,185 **** definitionId="net.sourceforge.csseditor.uncommentAction" label="%uncommentAction.label" - retarget="true" menubarPath="net.sourceforge.csseditor.sourceMenu/editGroup" id="net.sourceforge.csseditor.uncommentAction"> </action> --- 179,184 ---- definitionId="net.sourceforge.csseditor.uncommentAction" label="%uncommentAction.label" menubarPath="net.sourceforge.csseditor.sourceMenu/editGroup" + retarget="true" id="net.sourceforge.csseditor.uncommentAction"> </action> *************** *** 187,192 **** definitionId="net.sourceforge.csseditor.commentAction" label="%commentAction.label" - retarget="true" menubarPath="net.sourceforge.csseditor.sourceMenu/editGroup" id="net.sourceforge.csseditor.commentAction"> </action> --- 186,191 ---- definitionId="net.sourceforge.csseditor.commentAction" label="%commentAction.label" menubarPath="net.sourceforge.csseditor.sourceMenu/editGroup" + retarget="true" id="net.sourceforge.csseditor.commentAction"> </action> Index: .classpath =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .classpath 27 Dec 2003 14:35:53 -0000 1.2 --- .classpath 4 Feb 2004 09:42:21 -0000 1.3 *************** *** 13,16 **** --- 13,17 ---- <classpathentry kind="src" path="/org.eclipse.ui.views"/> <classpathentry kind="src" path="/org.eclipse.ui.workbench.texteditor"/> + <classpathentry kind="src" path="/org.eclipse.core.runtime.compatibility"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="bin"/> |
|
From: <ce...@pr...> - 2004-01-27 14:17:02
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5892/src/net/sourceforge/csseditor/internal/text Modified Files: CssPartitionScanner.java Log Message: Fix for bug #877547 (Incorrect syntax highlighting for seemingly escaped comments) Index: CssPartitionScanner.java =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/text/CssPartitionScanner.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CssPartitionScanner.java 14 Dec 2003 21:59:54 -0000 1.1.1.1 --- CssPartitionScanner.java 25 Jan 2004 09:14:55 -0000 1.2 *************** *** 1,65 **** ! /* ! * Copyright (c) 2003 Christopher Lenz and others. ! * All rights reserved. This program and the accompanying materials ! * are made available under the terms of the Common Public License v1.0 ! * which accompanies this distribution, and is available at ! * http://www.eclipse.org/legal/cpl-v10.html ! * ! * Contributors: ! * Christopher Lenz - initial API and implementation ! * ! * $Id$ ! */ ! ! package net.sourceforge.csseditor.internal.text; ! ! import java.util.ArrayList; ! import java.util.List; ! ! import org.eclipse.jface.text.rules.IPredicateRule; ! import org.eclipse.jface.text.rules.IToken; ! import org.eclipse.jface.text.rules.MultiLineRule; ! import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; ! import org.eclipse.jface.text.rules.SingleLineRule; ! import org.eclipse.jface.text.rules.Token; ! ! /** ! * ! */ ! public class CssPartitionScanner extends RuleBasedPartitionScanner { ! ! // Constants --------------------------------------------------------------- ! ! public static final String CSS_COMMENT = ! "__css_comment_partition_content_type"; //$NON-NLS-1$ ! ! public static final String CSS_STRING = ! "__css_string_partition_content_type"; //$NON-NLS-1$ ! ! // Constructors ------------------------------------------------------------ ! ! /** ! * Constructor. ! */ ! public CssPartitionScanner() { ! ! IToken commentToken = new Token(CSS_COMMENT); ! IToken stringToken = new Token(CSS_STRING); ! ! List rules = new ArrayList(); ! ! rules.add(new MultiLineRule( ! "/*", "*/", commentToken, '\\')); //$NON-NLS-1$ //$NON-NLS-2$ ! ! // TODO Strings can be continued over a new line using the escape ! // character (#42613) ! rules.add(new SingleLineRule( ! "\"", "\"", stringToken, '\\')); //$NON-NLS-1$ //$NON-NLS-2$ ! rules.add(new SingleLineRule( ! "'", "'", stringToken, '\\')); //$NON-NLS-1$ //$NON-NLS-2$ ! ! setPredicateRules((IPredicateRule[]) ! rules.toArray(new IPredicateRule[rules.size()])); ! } ! ! } --- 1,65 ---- ! /* ! * Copyright (c) 2003 Christopher Lenz and others. ! * All rights reserved. This program and the accompanying materials ! * are made available under the terms of the Common Public License v1.0 ! * which accompanies this distribution, and is available at ! * http://www.eclipse.org/legal/cpl-v10.html ! * ! * Contributors: ! * Christopher Lenz - initial API and implementation ! * ! * $Id$ ! */ ! ! package net.sourceforge.csseditor.internal.text; ! ! import java.util.ArrayList; ! import java.util.List; ! ! import org.eclipse.jface.text.rules.IPredicateRule; ! import org.eclipse.jface.text.rules.IToken; ! import org.eclipse.jface.text.rules.MultiLineRule; ! import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; ! import org.eclipse.jface.text.rules.SingleLineRule; ! import org.eclipse.jface.text.rules.Token; ! ! /** ! * ! */ ! public class CssPartitionScanner extends RuleBasedPartitionScanner { ! ! // Constants --------------------------------------------------------------- ! ! public static final String CSS_COMMENT = ! "__css_comment_partition_content_type"; //$NON-NLS-1$ ! ! public static final String CSS_STRING = ! "__css_string_partition_content_type"; //$NON-NLS-1$ ! ! // Constructors ------------------------------------------------------------ ! ! /** ! * Constructor. ! */ ! public CssPartitionScanner() { ! ! IToken commentToken = new Token(CSS_COMMENT); ! IToken stringToken = new Token(CSS_STRING); ! ! List rules = new ArrayList(); ! ! rules.add(new MultiLineRule( ! "/*", "*/", commentToken)); //$NON-NLS-1$ //$NON-NLS-2$ ! ! // TODO Strings can be continued over a new line using the escape ! // character (#42613) ! rules.add(new SingleLineRule( ! "\"", "\"", stringToken, '\\')); //$NON-NLS-1$ //$NON-NLS-2$ ! rules.add(new SingleLineRule( ! "'", "'", stringToken, '\\')); //$NON-NLS-1$ //$NON-NLS-2$ ! ! setPredicateRules((IPredicateRule[]) ! rules.toArray(new IPredicateRule[rules.size()])); ! } ! ! } |
|
From: <ce...@pr...> - 2004-01-26 16:26:47
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor.tests/src/net/sourceforge/csseditor/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6048/src/net/sourceforge/csseditor/tests Modified Files: UITests.java Log Message: Include the new partition scanner tests Index: UITests.java =================================================================== RCS file: /cvsroot/csseditor/net.sourceforge.csseditor.tests/src/net/sourceforge/csseditor/tests/UITests.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** UITests.java 12 Jan 2004 17:37:09 -0000 1.4 --- UITests.java 25 Jan 2004 09:15:52 -0000 1.5 *************** *** 1,33 **** ! /* ! * Copyright (c) 2003 Christopher Lenz and others. ! * All rights reserved. This program and the accompanying materials ! * are made available under the terms of the Common Public License v1.0 ! * which accompanies this distribution, and is available at ! * http://www.eclipse.org/legal/cpl-v10.html ! * ! * Contributors: ! * Christopher Lenz - initial API and implementation ! * ! * $Id$ ! */ ! ! package net.sourceforge.csseditor.tests; ! ! import junit.framework.Test; ! import junit.framework.TestSuite; ! ! import net.sourceforge.csseditor.tests.internal.text.CssCodeScannerTest; ! import net.sourceforge.csseditor.tests.internal.text.CssContentAssistProcessorTest; ! ! public class UITests { ! ! public static Test suite() { ! TestSuite suite = new TestSuite("CSS editor UI tests"); //$NON-NLS-1$ ! //$JUnit-BEGIN$ ! suite.addTestSuite(CssCodeScannerTest.class); ! suite.addTestSuite(CssContentAssistProcessorTest.class); ! //$JUnit-END$ ! return suite; ! } ! ! } --- 1,35 ---- ! /* ! * Copyright (c) 2003 Christopher Lenz and others. ! * All rights reserved. This program and the accompanying materials ! * are made available under the terms of the Common Public License v1.0 ! * which accompanies this distribution, and is available at ! * http://www.eclipse.org/legal/cpl-v10.html ! * ! * Contributors: ! * Christopher Lenz - initial API and implementation ! * ! * $Id$ ! */ ! ! package net.sourceforge.csseditor.tests; ! ! import junit.framework.Test; ! import junit.framework.TestSuite; ! ! import net.sourceforge.csseditor.tests.internal.text.CssCodeScannerTest; ! import net.sourceforge.csseditor.tests.internal.text.CssContentAssistProcessorTest; ! import net.sourceforge.csseditor.tests.internal.text.CssPartitionScannerTest; ! ! public class UITests { ! ! public static Test suite() { ! TestSuite suite = new TestSuite("CSS editor UI tests"); //$NON-NLS-1$ ! //$JUnit-BEGIN$ ! suite.addTestSuite(CssCodeScannerTest.class); ! suite.addTestSuite(CssContentAssistProcessorTest.class); ! suite.addTestSuite(CssPartitionScannerTest.class); ! //$JUnit-END$ ! return suite; ! } ! ! } |
|
From: <ce...@pr...> - 2004-01-26 04:51:48
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor.tests/src/net/sourceforge/csseditor/tests/internal/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6489/src/net/sourceforge/csseditor/tests/internal/text Added Files: CssPartitionScannerTest.java Log Message: Add test case for bug #877547 (Incorrect syntax highlighting for seemingly escaped comments) --- NEW FILE: CssPartitionScannerTest.java --- /* * Copyright (c) 2003 Christopher Lenz and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * * Contributors: * Christopher Lenz - initial API and implementation * * $Id: CssPartitionScannerTest.java,v 1.1 2004/01/24 22:51:48 cell Exp $ */ package net.sourceforge.csseditor.tests.internal.text; import junit.framework.TestCase; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceStore; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.rules.IPartitionTokenScanner; import org.eclipse.jface.text.rules.ITokenScanner; import net.sourceforge.csseditor.IProfile; import net.sourceforge.csseditor.internal.text.CssPartitionScanner; import net.sourceforge.csseditor.profiles.Css2Profile; import net.sourceforge.csseditor.text.CssTextTools; /** * Tests for the <code>CssPartitionScanner</code> class. */ public class CssPartitionScannerTest extends TestCase { // Instance Variables ------------------------------------------------------ private IPreferenceStore store; private IProfile profile; // TestCase Implementation ------------------------------------------------- /* * @see junit.framework.TestCase#setUp() */ protected void setUp() throws Exception { profile = new Css2Profile(null); store = new PreferenceStore(); } /* * @see junit.framework.TestCase#tearDown() */ protected void tearDown() throws Exception { profile = null; store = null; } // Test Methods ------------------------------------------------------------ public void testEmptyCommentDetected() throws Exception { ITokenScanner scanner = prepareScanner("/**/"); //$NON-NLS-1$ assertEquals(CssPartitionScanner.CSS_COMMENT, scanner.nextToken().getData()); } public void testCommentContainingNormalTextDetected() throws Exception { ITokenScanner scanner = prepareScanner("/* test */"); //$NON-NLS-1$ assertEquals(CssPartitionScanner.CSS_COMMENT, scanner.nextToken().getData()); } public void testEscapeInCommentIgnored() throws Exception { ITokenScanner scanner = prepareScanner("/*\\*/"); //$NON-NLS-1$ assertEquals(CssPartitionScanner.CSS_COMMENT, scanner.nextToken().getData()); } // Private Methods --------------------------------------------------------- /** * Creates a new <code>CssParitionScanner</code> instance, and sets its * input to the specified text. * * @param text the input for the scanner * @return the created scanner */ private IPartitionTokenScanner prepareScanner(String text) { CssTextTools tools = new CssTextTools(store, profile); IPartitionTokenScanner scanner = tools.getPartitionScanner(); IDocument document = new Document(text); scanner.setRange(document, 0, document.getLength()); return scanner; } } |
|
From: <ce...@us...> - 2004-01-13 17:15:56
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/text
In directory sc8-pr-cvs1:/tmp/cvs-serv31594/src/net/sourceforge/csseditor/text
Modified Files:
CssSourceViewerConfiguration.java
Log Message:
Cleanup
Index: CssSourceViewerConfiguration.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/text/CssSourceViewerConfiguration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssSourceViewerConfiguration.java 27 Dec 2003 16:53:09 -0000 1.2
--- CssSourceViewerConfiguration.java 13 Jan 2004 17:15:52 -0000 1.3
***************
*** 215,228 ****
ContentAssistant assistant = new ContentAssistant();
assistant.setContentAssistProcessor(
! new CssContentAssistProcessor(getPrefenceStore(), getProfile(),
! this.editor),
IDocument.DEFAULT_CONTENT_TYPE);
assistant.setInformationControlCreator(
getInformationControlCreator(sourceViewer));
! assistant.enableAutoInsert(getPrefenceStore().getBoolean(AUTOINSERT));
! assistant.enableAutoActivation(
! getPrefenceStore().getBoolean(AUTOACTIVATION));
! assistant.setAutoActivationDelay(
! getPrefenceStore().getInt(AUTOACTIVATION_DELAY));
assistant.setContextInformationPopupOrientation(
IContentAssistant.CONTEXT_INFO_BELOW);
--- 215,225 ----
ContentAssistant assistant = new ContentAssistant();
assistant.setContentAssistProcessor(
! new CssContentAssistProcessor(store, getProfile(), editor),
IDocument.DEFAULT_CONTENT_TYPE);
assistant.setInformationControlCreator(
getInformationControlCreator(sourceViewer));
! assistant.enableAutoInsert(store.getBoolean(AUTOINSERT));
! assistant.enableAutoActivation(store.getBoolean(AUTOACTIVATION));
! assistant.setAutoActivationDelay(store.getInt(AUTOACTIVATION_DELAY));
assistant.setContextInformationPopupOrientation(
IContentAssistant.CONTEXT_INFO_BELOW);
***************
*** 230,236 ****
IContentAssistant.PROPOSAL_STACKED);
assistant.setProposalSelectorBackground(getColorManager().getColor(
! PreferenceConverter.getColor(this.store, PROPOSALS_BACKGROUND)));
assistant.setProposalSelectorForeground(getColorManager().getColor(
! PreferenceConverter.getColor(this.store, PROPOSALS_FOREGROUND)));
return assistant;
}
--- 227,233 ----
IContentAssistant.PROPOSAL_STACKED);
assistant.setProposalSelectorBackground(getColorManager().getColor(
! PreferenceConverter.getColor(store, PROPOSALS_BACKGROUND)));
assistant.setProposalSelectorForeground(getColorManager().getColor(
! PreferenceConverter.getColor(store, PROPOSALS_FOREGROUND)));
return assistant;
}
***************
*** 288,302 ****
// Comments
! dr = new DefaultDamagerRepairer(this.textTools.getCommentScanner());
reconciler.setDamager(dr, CssPartitionScanner.CSS_COMMENT);
reconciler.setRepairer(dr, CssPartitionScanner.CSS_COMMENT);
// Strings
! dr = new DefaultDamagerRepairer(this.textTools.getStringScanner());
reconciler.setDamager(dr, CssPartitionScanner.CSS_STRING);
reconciler.setRepairer(dr, CssPartitionScanner.CSS_STRING);
// Code
! dr = new DefaultDamagerRepairer(this.textTools.getCodeScanner());
reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
--- 285,299 ----
// Comments
! dr = new DefaultDamagerRepairer(textTools.getCommentScanner());
reconciler.setDamager(dr, CssPartitionScanner.CSS_COMMENT);
reconciler.setRepairer(dr, CssPartitionScanner.CSS_COMMENT);
// Strings
! dr = new DefaultDamagerRepairer(textTools.getStringScanner());
reconciler.setDamager(dr, CssPartitionScanner.CSS_STRING);
reconciler.setRepairer(dr, CssPartitionScanner.CSS_STRING);
// Code
! dr = new DefaultDamagerRepairer(textTools.getCodeScanner());
reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
***************
*** 309,316 ****
*/
public IReconciler getReconciler(ISourceViewer sourceViewer) {
! if ((this.editor != null) && this.editor.isEditable()) {
Reconciler reconciler = new Reconciler();
IReconcilingStrategy strategy =
! new CssReconcilingStrategy(this.editor);
reconciler.setReconcilingStrategy(strategy,
IDocument.DEFAULT_CONTENT_TYPE);
--- 306,313 ----
*/
public IReconciler getReconciler(ISourceViewer sourceViewer) {
! if ((editor != null) && editor.isEditable()) {
Reconciler reconciler = new Reconciler();
IReconcilingStrategy strategy =
! new CssReconcilingStrategy(editor);
reconciler.setReconcilingStrategy(strategy,
IDocument.DEFAULT_CONTENT_TYPE);
***************
*** 330,334 ****
*/
public int getTabWidth(ISourceViewer sourceViewer) {
! return this.store.getInt(TAB_WIDTH);
}
--- 327,331 ----
*/
public int getTabWidth(ISourceViewer sourceViewer) {
! return store.getInt(TAB_WIDTH);
}
***************
*** 338,344 ****
public ITextHover getTextHover(ISourceViewer sourceViewer,
String contentType) {
! if (this.editor != null) {
! IDocumentProvider provider = this.editor.getDocumentProvider();
! IEditorInput input = this.editor.getEditorInput();
IAnnotationModel model = provider.getAnnotationModel(input);
return new CssAnnotationHover(model);
--- 335,341 ----
public ITextHover getTextHover(ISourceViewer sourceViewer,
String contentType) {
! if (editor != null) {
! IDocumentProvider provider = editor.getDocumentProvider();
! IEditorInput input = editor.getEditorInput();
IAnnotationModel model = provider.getAnnotationModel(input);
return new CssAnnotationHover(model);
***************
*** 355,368 ****
*/
private IColorManager getColorManager() {
! if (this.textTools != null) {
! return this.textTools.getColorManager();
}
return null;
}
- private IPreferenceStore getPrefenceStore() {
- return this.store;
- }
-
/**
* Returns the CSS profile for the resource currently being viewed, or
--- 352,361 ----
*/
private IColorManager getColorManager() {
! if (textTools != null) {
! return textTools.getColorManager();
}
return null;
}
/**
* Returns the CSS profile for the resource currently being viewed, or
***************
*** 373,380 ****
*/
private IProfile getProfile() {
! if (this.profile == null) {
IResource resource = null;
! if (this.editor != null) {
! IEditorInput input = this.editor.getEditorInput();
if (input instanceof IFileEditorInput) {
resource = ((IFileEditorInput) input).getFile();
--- 366,373 ----
*/
private IProfile getProfile() {
! if (profile == null) {
IResource resource = null;
! if (editor != null) {
! IEditorInput input = editor.getEditorInput();
if (input instanceof IFileEditorInput) {
resource = ((IFileEditorInput) input).getFile();
***************
*** 383,389 ****
IProfileManager mgr =
CssEditorPlugin.getDefault().getProfileManager();
! this.profile = mgr.getProfile(resource);
}
! return this.profile;
}
--- 376,382 ----
IProfileManager mgr =
CssEditorPlugin.getDefault().getProfileManager();
! profile = mgr.getProfile(resource);
}
! return profile;
}
|
Update of /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare
In directory sc8-pr-cvs1:/tmp/cvs-serv30009/src/net/sourceforge/csseditor/internal/compare
Modified Files:
CssMergeViewerCreator.java CssStructureCreator.java
CssMergeViewer.java CssNode.java
Log Message:
Cleanup
Index: CssMergeViewerCreator.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare/CssMergeViewerCreator.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CssMergeViewerCreator.java 14 Dec 2003 21:59:35 -0000 1.1.1.1
--- CssMergeViewerCreator.java 13 Jan 2004 17:10:28 -0000 1.2
***************
*** 25,29 ****
public class CssMergeViewerCreator implements IViewerCreator {
! /**
* @see IViewerCreator#createViewer(Composite, CompareConfiguration)
*/
--- 25,29 ----
public class CssMergeViewerCreator implements IViewerCreator {
! /*
* @see IViewerCreator#createViewer(Composite, CompareConfiguration)
*/
Index: CssStructureCreator.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare/CssStructureCreator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssStructureCreator.java 27 Dec 2003 18:46:55 -0000 1.2
--- CssStructureCreator.java 13 Jan 2004 17:10:28 -0000 1.3
***************
*** 48,52 ****
public class CssStructureCreator implements IStructureCreator {
! /**
* @see IStructureCreator#getName()
*/
--- 48,54 ----
public class CssStructureCreator implements IStructureCreator {
! // IStructureCreator Implementation ----------------------------------------
!
! /*
* @see IStructureCreator#getName()
*/
***************
*** 56,60 ****
}
! /**
* @see IStructureCreator#getStructure(Object)
*/
--- 58,62 ----
}
! /*
* @see IStructureCreator#getStructure(Object)
*/
***************
*** 85,89 ****
}
! /**
* @see IStructureCreator#locate(Object, Object)
*/
--- 87,91 ----
}
! /*
* @see IStructureCreator#locate(Object, Object)
*/
***************
*** 93,97 ****
}
! /**
* @see IStructureCreator#getContents(Object, boolean)
*/
--- 95,99 ----
}
! /*
* @see IStructureCreator#getContents(Object, boolean)
*/
***************
*** 126,130 ****
}
! /**
* @see IStructureCreator#save(IStructureComparator, Object)
*/
--- 128,132 ----
}
! /*
* @see IStructureCreator#save(IStructureComparator, Object)
*/
Index: CssMergeViewer.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare/CssMergeViewer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssMergeViewer.java 27 Dec 2003 18:46:55 -0000 1.2
--- CssMergeViewer.java 13 Jan 2004 17:10:28 -0000 1.3
***************
*** 73,77 ****
/**
! * @see TextMergeViewer#TextMergeViewer(Composite, int, CompareConfiguration)
*/
public CssMergeViewer(Composite parent, int style,
--- 73,81 ----
/**
! * Constructor.
! *
! * @param parent the parent control
! * @param style SWT style bits for top level composite of this viewer
! * @param configuration the configuration object
*/
public CssMergeViewer(Composite parent, int style,
***************
*** 155,158 ****
--- 159,166 ----
}
+ /**
+ * Updates the background color of the merge viewer to the value set in the
+ * preferences.
+ */
private void updateBackgroundColor() {
boolean defaultBackgroundColor = preferenceStore.getBoolean(
Index: CssNode.java
===================================================================
RCS file: /cvsroot/csseditor/net.sourceforge.csseditor/src/net/sourceforge/csseditor/internal/compare/CssNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssNode.java 27 Dec 2003 18:46:55 -0000 1.2
--- CssNode.java 13 Jan 2004 17:10:28 -0000 1.3
***************
*** 93,97 ****
"CssStructureViewer.styleSheet"); //$NON-NLS-1$
}
! return this.name;
}
--- 93,97 ----
"CssStructureViewer.styleSheet"); //$NON-NLS-1$
}
! return name;
}
|
