Skip to content

Export and import projects on working sets export/import. Fixes #137 #138

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
fabioz wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Export and import projects on working sets export/import. Fixes #137 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8fc921d
Export and import projects on working sets export/import. Fixes #137
fabioz Feb 22, 2021
995e161
Remove nullable references.
fabioz Oct 3, 2021
cdffd4a
Mark Java 11 as required version.
fabioz Oct 31, 2021
72b5340
Minor changes in deps
fabioz Oct 1, 2022
612ded4
Done Liclipse 9.0.0 release
fabioz Oct 1, 2022
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
9 changes: 4 additions & 5 deletions AnyEditTools-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="AnyEditTools"
label="AnyEditTools"
version="2.7.2.qualifier"
version="2.7.3.qualifier"
provider-name="Andrey Loskutov"
plugin="de.loskutov.anyedit.AnyEditTools">

Expand All @@ -27,7 +27,7 @@
</url>

<requires>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.filesystem"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.ui.ide"/>
Expand All @@ -38,16 +38,15 @@
<import plugin="org.eclipse.debug.ui"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.compare"/>
<import plugin="org.eclipse.core.net"/>
<import plugin="org.eclipse.core.expressions"/>
<import plugin="org.eclipse.ui.workbench" version="3.8.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.workbench"/>
</requires>

<plugin
id="de.loskutov.anyedit.AnyEditTools"
download-size="400"
install-size="400"
version="0.0.0"
version="2.7.3.qualifier"
unpack="false"/>

</feature>
2 changes: 1 addition & 1 deletion AnyEditTools/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<classpathentry kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="output" path="bin"/>
</classpath>
10 changes: 0 additions & 10 deletions AnyEditTools/.settings/AnyeditPlatform_3.7.1.target
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions AnyEditTools/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand Down Expand Up @@ -108,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
Expand Down
12 changes: 5 additions & 7 deletions AnyEditTools/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: de.loskutov.anyedit.AnyEditTools;singleton:=true
Bundle-Version: 2.7.2.qualifier
Bundle-Version: 2.7.3.qualifier
Bundle-ClassPath: .
Bundle-Activator: de.loskutov.anyedit.AnyEditToolsPlugin
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.filesystem,
org.eclipse.ui,
org.eclipse.ui.ide,
Expand All @@ -19,18 +19,17 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
org.eclipse.jface.text,
org.eclipse.core.expressions,
org.eclipse.compare,
org.eclipse.core.net,
org.eclipse.ui.workbench,
org.eclipse.jdt.launching;resolution:=optional,
org.eclipse.jdt.ui;resolution:=optional,
org.eclipse.jdt.core;resolution:=optional,
org.junit;resolution:=optional,
org.eclipse.jdt.annotation;bundle-version="[1.1.0,1.2.0)";resolution:=optional,
org.eclipse.ui.workbench;bundle-version="3.8.0"
org.eclipse.jdt.annotation;resolution:=optional
Bundle-ActivationPolicy: lazy
Export-Package: de.loskutov.anyedit,
de.loskutov.anyedit.actions,
de.loskutov.anyedit.actions.compare,
de.loskutov.anyedit.actions.internal;x-internal:=true,
de.loskutov.anyedit.actions.internal,
de.loskutov.anyedit.actions.replace,
de.loskutov.anyedit.actions.sort,
de.loskutov.anyedit.compare,
Expand All @@ -41,4 +40,3 @@ Export-Package: de.loskutov.anyedit,
de.loskutov.anyedit.ui.util,
de.loskutov.anyedit.ui.wizards,
de.loskutov.anyedit.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
4 changes: 0 additions & 4 deletions AnyEditTools/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,16 @@ bin.includes = META-INF/,\
.,\
icons/,\
plugin.properties,\
src/,\
build.properties,\
about.ini,\
about.properties,\
about.html,\
schema/,\
epl-v10.html,\
.settings/,\
.project,\
.settings/edu.umd.cs.findbugs.core.prefs,\
.classpath,\
loskutov32.png
javacProjectSettings = true
src.excludes = test/
javacDefaultEncoding.. = UTF-8
jre.compilation.profile = JavaSE-1.7
additional.bundles = org.eclipse.jdt.annotation
9 changes: 4 additions & 5 deletions AnyEditTools/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<keywordReference id="AnyEditTools.keyword7"/>
<keywordReference id="AnyEditTools.keyword8"/>
<keywordReference id="org.eclipse.debug.ui.console"/>
<keywordReference id="org.eclipse.team.cvs.ui.cvs.console"/>
<keywordReference id="org.eclipse.ui.editors.general"/>
<keywordReference id="org.eclipse.ui.ide.editors"/>

Expand Down Expand Up @@ -602,9 +601,9 @@
class="de.loskutov.anyedit.ui.wizards.WorkingSetExportWizard"
icon="icons/workingSets2.gif"
id="AnyEditTools.workingSetExportWizard"
name="Working Sets">
name="Working Sets and Projects">
<description>
Exports all working sets to the file.
Exports all working sets and local projects to a file.
</description>
</wizard>
</extension>
Expand All @@ -616,9 +615,9 @@
class="de.loskutov.anyedit.ui.wizards.WorkingSetImportWizard"
icon="icons/workingSets.gif"
id="AnyEditTools.workingSetImportWizard"
name="Working Sets">
name="Working Sets and Projects">
<description>
Imports all working sets from file.
Imports all working sets and projects from previously exported file.
</description>
</wizard>
</extension>
Expand Down
2 changes: 0 additions & 2 deletions AnyEditTools/src/de/loskutov/anyedit/actions/ConvertAllInFolderAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
Expand Down Expand Up @@ -61,7 +60,6 @@ protected boolean getEnablement() {
return !selectedResources.isEmpty();
}

@Nullable
protected IResource getResource(Object selection) {
if(selection instanceof IContainer || selection instanceof IFile) {
return (IResource)selection;
Expand Down
34 changes: 15 additions & 19 deletions AnyEditTools/src/de/loskutov/anyedit/ui/editor/AbstractEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.DocumentRewriteSession;
import org.eclipse.jface.text.DocumentRewriteSessionType;
Expand Down Expand Up @@ -63,7 +61,7 @@ public class AbstractEditor implements ITextEditorExtension2 {
/**
* Proxy for different editor types
*/
public AbstractEditor(final @Nullable IWorkbenchPart editorPart) {
public AbstractEditor(final IWorkbenchPart editorPart) {
this();
wPart = editorPart;
if(editorPart instanceof FormEditor){
Expand Down Expand Up @@ -134,7 +132,7 @@ public boolean isMultiPage(){
/**
* @return may return null
*/
@Nullable

public IDocumentProvider getDocumentProvider() {
if (wPart == null) {
return null;
Expand All @@ -150,7 +148,7 @@ public IDocumentProvider getDocumentProvider() {
/**
* @return may return null
*/
@Nullable

public IEditorInput getInput() {
if (!(wPart instanceof IEditorPart)) {
return null;
Expand All @@ -161,7 +159,7 @@ public IEditorInput getInput() {
/**
* @return may return null
*/
@Nullable

public IFile getIFile(){
if(wPart == null){
return null;
Expand All @@ -177,7 +175,7 @@ public IFile getIFile(){
return adapter;
}

@Nullable

public File getFile(){
if(wPart == null){
return null;
Expand Down Expand Up @@ -206,7 +204,7 @@ public File getFile(){
/**
* @see ITypedElement#getType()
*/
@Nullable

public String getContentType(){
URI uri = getURI();
String path;
Expand All @@ -226,7 +224,6 @@ public String getContentType(){
return path;
}

@NonNull
public String getTitle(){
if(wPart == null){
return "";
Expand All @@ -238,12 +235,11 @@ public String getTitle(){
/**
* @return may return null
*/
@Nullable

private URI getURI(){
return EclipseUtils.getURI(getInput());
}

@NonNull
public String computeEncoding() {
IFile file = getIFile();
if(file != null) {
Expand All @@ -267,7 +263,7 @@ public String computeEncoding() {
return TextUtil.SYSTEM_CHARSET;
}

@Nullable

public ISelectionProvider getSelectionProvider() {
if (wPart == null) {
return null;
Expand All @@ -291,7 +287,7 @@ public ISelectionProvider getSelectionProvider() {
return null;
}

@Nullable

public IDocument getDocument() {
IEditorInput input = getInput();
if(input != null) {
Expand Down Expand Up @@ -322,7 +318,7 @@ public IDocument getDocument() {
return null;
}

@Nullable

public ITextSelection getSelection(){
ISelectionProvider selectionProvider = getSelectionProvider();
if (selectionProvider == null) {
Expand All @@ -335,7 +331,7 @@ public ITextSelection getSelection(){
return null;
}

@Nullable

public String getSelectedText(){
ITextSelection selection = getSelection();
if(selection == null){
Expand Down Expand Up @@ -373,7 +369,7 @@ public boolean isDirty(){
return ((ISaveablePart) wPart).isDirty();
}

@Nullable

private <T> T getAdapterFromPart(Class<T> clazz){
if (wPart == null) {
return null;
Expand Down Expand Up @@ -441,7 +437,7 @@ public void stopSequentialRewriteMode(DocumentRewriteSession session) {
* @param normalized <code>true</code> if the rewrite is performed
* from the start to the end of the document
*/
@Nullable

public DocumentRewriteSession startSequentialRewriteMode(boolean normalized) {
// de/activate listeners etc, prepare multiple replace
IRewriteTarget target = getAdapterFromPart(IRewriteTarget.class);
Expand Down Expand Up @@ -515,12 +511,12 @@ public boolean equals(Object obj) {
return this.hashCode() == other.hashCode();
}

@Nullable

public IWorkbenchPart getPart() {
return wPart;
}

@Nullable

public String getText() {
IDocument doc = getDocument();
return doc != null? doc.get() : null;
Expand Down
Loading