Skip to content
Browse files

cleanup + update site change

  • Loading branch information...
1 parent 56a204b commit 671bf8374a3bfb5aad2bf0093736a1e0ad493437 @winterstein committed
View
3 feature/build.properties
@@ -1 +1,4 @@
bin.includes = feature.xml
+src.includes = feature.xml,\
+ build.properties,\
+ .project
View
15 feature/feature.xml
@@ -2,21 +2,20 @@
<feature
id="markdown.editor.feature"
label="Markdown Editor"
- version="0.2.2"
+ version="0.2.3"
provider-name="Winterwell">
<description url="http://www.winterwell.com/software/markdown-editor.php">
Support for editing the text-markup language Markdown. Also provides
-some nice enhancements to the text editor.&lt;br&gt;
-
+some nice enhancements to the text editor.
+&lt;p&gt;
Markdown Features:
- Content outline
- Section folding
- Export to HTML and HTML Preview
-
+&lt;p&gt;
General Text Features:
-
- Word wrapping
- TODO task tags
- Format paragraph command
@@ -33,10 +32,14 @@ Contains code from the MarkdownJ project, released under a BSD license. See http
The Markdown syntax is copyright (c) 2004, John Gruber. It is used under a BSD-style license. See http://daringfireball.net/projects/markdown/license for more information.
</copyright>
- <license url="http://www.eclipse.org/org/documents/epl-v10.html">
+ <license url="http://www.eclipse.org/legal/epl-v10.html">
Eclipse Public License
</license>
+ <url>
+ <update label="Winterwell Eclipse Plugins (markdown)" url="http://www.winterwell.com/software/updatesite/"/>
+ </url>
+
<plugin
id="winterwell.markdown"
download-size="0"
View
19 plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Markdown
Bundle-SymbolicName: winterwell.markdown;singleton:=true
-Bundle-Version: 0.2.2
+Bundle-Version: 0.2.3
Bundle-Activator: winterwell.markdown.Activator
Bundle-Vendor: Winterwell Associates Ltd
Require-Bundle: org.eclipse.ui,
@@ -19,3 +19,20 @@ Import-Package: org.eclipse.core.internal.resources,
Bundle-ClassPath: .,target/classes,lib/markdownj-1.0.2b4-0.3.0.jar,
lib/winterwell.utils.jar,
lib/net.sf.paperclips_1.0.1.jar
+Export-Package: com.petebevin.markdown,
+ com.petebevin.markdown.test,
+ net.sf.paperclips,
+ net.sf.paperclips.decorator,
+ winterwell.markdown,
+ winterwell.markdown.editors,
+ winterwell.markdown.pagemodel,
+ winterwell.markdown.preferences,
+ winterwell.markdown.views,
+ winterwell.utils,
+ winterwell.utils.containers,
+ winterwell.utils.gui,
+ winterwell.utils.io,
+ winterwell.utils.reporting,
+ winterwell.utils.threads,
+ winterwell.utils.time,
+ winterwell.utils.web
View
10 plugin/src/winterwell/markdown/StringMethods.java
@@ -4,20 +4,10 @@
*/
package winterwell.markdown;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.regex.Pattern;
View
11 plugin/src/winterwell/markdown/editors/ActionBarContributor.java
@@ -1,20 +1,9 @@
package winterwell.markdown.editors;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.editors.text.TextEditorActionContributor;
-import org.eclipse.ui.internal.editors.text.PreviousPulldownActionDelegate;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.texteditor.BasicTextEditorActionContributor;
import winterwell.markdown.views.MarkdownPreview;
View
1 plugin/src/winterwell/markdown/editors/ExportHTMLAction.java
@@ -7,7 +7,6 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.internal.editors.text.FileEditorInputAdapterFactory;
import winterwell.utils.io.FileUtils;
View
7 plugin/src/winterwell/markdown/editors/FormatAction.java
@@ -8,22 +8,15 @@
import org.eclipse.core.commands.IHandlerListener;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
import winterwell.markdown.pagemodel.MarkdownFormatter;
import winterwell.markdown.pagemodel.MarkdownPage;
import winterwell.markdown.pagemodel.MarkdownPage.KLineType;
-import winterwell.utils.StrUtils;
import winterwell.utils.containers.IntRange;
/**
View
6 plugin/src/winterwell/markdown/editors/HeaderRule.java
@@ -5,14 +5,8 @@
*/
package winterwell.markdown.editors;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.ICharacterScanner;
-import org.eclipse.jface.text.rules.IPredicateRule;
import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.PatternRule;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.swt.SWT;
/**
*
View
26 plugin/src/winterwell/markdown/editors/MDConfiguration.java
@@ -1,23 +1,10 @@
package winterwell.markdown.editors;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.presentation.IPresentationReconciler;
import org.eclipse.jface.text.presentation.PresentationReconciler;
import org.eclipse.jface.text.reconciler.DirtyRegion;
@@ -25,22 +12,9 @@
import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
import org.eclipse.jface.text.reconciler.MonoReconciler;
import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
-import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
-import org.eclipse.jface.text.source.projection.ProjectionViewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
-import winterwell.markdown.pagemodel.MarkdownPage;
-import winterwell.markdown.pagemodel.MarkdownPage.Header;
-
public class MDConfiguration extends TextSourceViewerConfiguration {
private ColorManager colorManager;
View
6 plugin/src/winterwell/markdown/editors/MDScanner.java
@@ -7,19 +7,13 @@
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.ITokenScanner;
import org.eclipse.jface.text.rules.IWhitespaceDetector;
-import org.eclipse.jface.text.rules.IWordDetector;
import org.eclipse.jface.text.rules.MultiLineRule;
import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.rules.WhitespaceRule;
-import org.eclipse.jface.text.rules.WordRule;
import org.eclipse.swt.SWT;
import winterwell.markdown.Activator;
View
8 plugin/src/winterwell/markdown/editors/MDTextHover.java
@@ -3,21 +3,13 @@
*/
package winterwell.markdown.editors;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DefaultInformationControl;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControl;
-import org.eclipse.jface.text.IInformationControlCreator;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextHoverExtension;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.Region;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
import winterwell.markdown.StringMethods;
-import winterwell.utils.StrUtils;
import winterwell.utils.containers.Pair;
/**
View
1 plugin/src/winterwell/markdown/editors/MarkdownContentOutlinePage.java
@@ -43,7 +43,6 @@
import winterwell.markdown.pagemodel.MarkdownPage.KLineType;
import winterwell.utils.StrUtils;
import winterwell.utils.Utils;
-import winterwell.utils.containers.Containers;
import winterwell.utils.web.WebUtils;
/**
View
21 plugin/src/winterwell/markdown/editors/MarkdownEditor.java
@@ -2,16 +2,11 @@
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
-import org.eclipse.core.internal.resources.File;
-import org.eclipse.core.internal.resources.Workspace;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
@@ -20,21 +15,15 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentListener;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.IViewportListener;
import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.jface.text.source.SourceViewer;
import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
import org.eclipse.jface.text.source.projection.ProjectionSupport;
@@ -43,24 +32,14 @@
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorActionBarContributor;
import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.ui.texteditor.AddTaskAction;
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
import winterwell.markdown.Activator;
import winterwell.markdown.pagemodel.MarkdownPage;
import winterwell.markdown.pagemodel.MarkdownPage.Header;
View
8 plugin/src/winterwell/markdown/pagemodel/MarkdownPage.java
@@ -6,14 +6,11 @@
package winterwell.markdown.pagemodel;
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Callable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -23,11 +20,10 @@
import winterwell.markdown.StringMethods;
import winterwell.markdown.preferences.MarkdownPreferencePage;
import winterwell.utils.FailureException;
-import winterwell.utils.TodoException;
-import winterwell.utils.Utils;
+import winterwell.utils.Process;
import winterwell.utils.StrUtils;
+import winterwell.utils.Utils;
import winterwell.utils.io.FileUtils;
-import winterwell.utils.Process;
import com.petebevin.markdown.MarkdownProcessor;
View
1 plugin/src/winterwell/markdown/pagemodel/MarkdownPageTest.java
@@ -1,7 +1,6 @@
package winterwell.markdown.pagemodel;
import java.io.File;
-import java.util.Collections;
import java.util.List;
import winterwell.markdown.pagemodel.MarkdownPage.Header;
View
18 plugin/src/winterwell/markdown/preferences/MarkdownPreferencePage.java
@@ -1,20 +1,18 @@
package winterwell.markdown.preferences;
-import org.eclipse.jface.preference.*;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.ColorFieldEditor;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.preference.StringFieldEditor;
import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.editors.text.TextEditorPreferencePage;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
+import org.eclipse.ui.IWorkbenchPreferencePage;
import winterwell.markdown.Activator;
-import winterwell.markdown.editors.MarkdownEditor;
/**
* This class represents a preference page that
View
14 plugin/src/winterwell/markdown/views/MarkdownPreview.java
@@ -4,17 +4,13 @@
import java.io.File;
import java.net.URI;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.part.*;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.*;
-import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IPathEditorInput;
+import org.eclipse.ui.part.ViewPart;
import winterwell.markdown.editors.ActionBarContributor;
import winterwell.markdown.editors.MarkdownEditor;
View
2 updatesite/site.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/markdown.editor.feature_0.2.2.jar" id="markdown.editor.feature" version="0.2.2">
+ <feature url="features/markdown.editor.feature_0.2.3.jar" id="markdown.editor.feature" version="0.2.3">
<category name="markdowneditor"/>
</feature>
<category-def name="markdowneditor" label="Markdown Editor">

0 comments on commit 671bf83

Please sign in to comment.
Something went wrong with that request. Please try again.