diff --git a/.project b/.project index 4fde434..e3aec00 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - redOx + corrosion diff --git a/.travis.yml b/.travis.yml index 12a8860..9d582b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,4 @@ script: else mvn clean verify; fi -after_failure: "cat /home/travis/build/LucasBullen/redOx/org.eclipse.redox.tests/target/work/data/.metadata/.log" \ No newline at end of file +after_failure: "cat /home/travis/build/LucasBullen/corrosion/org.eclipse.corrosion.tests/target/work/data/.metadata/.log" \ No newline at end of file diff --git a/README.md b/README.md index 1ed1289..21985ad 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,14 @@ -# RedOx +# Corrosion + +> Corrosion was formerly called RedOx, but required a name change due to naming overlap with another project ([See issue #24](https://github.com/LucasBullen/redOx/issues/24)) + Support for Rust editing in Eclipse IDE. -RedOx (short for reduction–oxidation, the reaction that causes rust), is a Rust development plugin for the Eclipse IDE. Both [issue reports](https://github.com/LucasBullen/redOx/issues) and [pull requests](https://github.com/LucasBullen/redOx/pulls) are greatly appreciated. +Corrosion is a Rust development plugin for the Eclipse IDE. Both [issue reports](https://github.com/LucasBullen/corrosion/issues) and [pull requests](https://github.com/LucasBullen/corrosion/pulls) are greatly appreciated. -[![Build Status](https://travis-ci.org/LucasBullen/redOx.svg?branch=master)](https://travis-ci.org/LucasBullen/redOx) +[![Build Status](https://travis-ci.org/LucasBullen/corrosion.svg?branch=master)](https://travis-ci.org/LucasBullen/corrosion) -![Screenshot](images/editorOverview.png "Screenshot of RedOx editor") +![Screenshot](images/editorOverview.png "Screenshot of Corrosion editor") ## Installation Refer to our [Installation Guide](documentation/Installation.md) @@ -15,14 +18,14 @@ Refer to our [Installation Guide](documentation/Installation.md) The Rustup and Cargo commands are required for accessing the language server and performing most tasks. Go into the Rust preferences and either install the commands or input their paths if not automatically found. ## Contributing -[Issue reports](https://github.com/LucasBullen/redOx/issues) and [pull requests](https://github.com/LucasBullen/redOx/pulls) are always appreciated. +[Issue reports](https://github.com/LucasBullen/corrosion/issues) and [pull requests](https://github.com/LucasBullen/corrosion/pulls) are always appreciated. -For setting up RedOx for testing and development follow the [Using Github Installation Instructions](documentation/Installation.md#using-github) +For setting up Corrosion for testing and development follow the [Using Github Installation Instructions](documentation/Installation.md#using-github) -The p2 repository is not kept up to date with the master branch. Releases to the p2 repository will be made in more controlled released after the initial release of RedOx v1. +The p2 repository is not kept up to date with the master branch. Releases to the p2 repository will be made in more controlled released after the initial release of Corrosion v1. ## Concept -RedOx uses the [lsp4e](https://projects.eclipse.org/projects/technology.lsp4e) project to integrate with the [Rust Language Server](https://github.com/rust-lang-nursery/rls) and [TM4E](https://projects.eclipse.org/projects/technology.tm4e) project to provide syntax highlighting in order to provide a rich Rust editor in the Eclipse IDE. +Corrosion uses the [lsp4e](https://projects.eclipse.org/projects/technology.lsp4e) project to integrate with the [Rust Language Server](https://github.com/rust-lang-nursery/rls) and [TM4E](https://projects.eclipse.org/projects/technology.tm4e) project to provide syntax highlighting in order to provide a rich Rust editor in the Eclipse IDE. The Rust and Cargo logos are owned by Mozilla and distributed under the terms of the [Creative Commons Attribution license (CC-BY)](https://creativecommons.org/licenses/by/4.0/). [More Info](https://www.rust-lang.org/en-US/legal.html) diff --git a/documentation/Installation.md b/documentation/Installation.md index 7d20fb2..bd39973 100644 --- a/documentation/Installation.md +++ b/documentation/Installation.md @@ -1,15 +1,15 @@ -## Installing RedOx +## Installing Corrosion ### Using Eclipse Marketplace -Download [RedOx from the Eclipse Marketplace](https://marketplace.eclipse.org/content/redox-rust-edition-eclipse-ide) +Download [Corrosion from the Eclipse Marketplace](https://marketplace.eclipse.org/content/corrosion-rust-edition-eclipse-ide) For further instructions on how to install using Eclipse Marketplace, see [their tutorial](https://marketplace.eclipse.org/marketplace-client-intro?mpc_install=3835145) ### Using p2 repository -The p2 site: https://lucasbullen.github.io/redOx/site/ +The p2 site: https://lucasbullen.github.io/corrosion/site/ - Open Eclipse IDE - Open the Install New Software Wizard (Under the Help menu) - - Enter https://lucasbullen.github.io/redOx/site/ in the site field - - Select RedOx - Rust in Eclipse IDE and click Next + - Enter https://lucasbullen.github.io/corrosion/site/ in the site field + - Select Corrosion - Rust in Eclipse IDE and click Next - Wait for the dependencies to load - Press Next again - Accept the license and press Finish @@ -18,15 +18,15 @@ The p2 site: https://lucasbullen.github.io/redOx/site/ ### Using Github ##### For contributors and testers, This will allow running the plugin within a child Eclipse to test and develop new features - Download [Eclipse for Eclipse Contributors](https://www.eclipse.org/downloads/packages/eclipse-ide-eclipse-committers/oxygen2) or any version of Eclipse with the `Eclipse Plug-in Development Environment` package - - Clone the repo: https://github.com/LucasBullen/redOx + - Clone the repo: https://github.com/LucasBullen/corrosion - In the root of the repository, run `mvn clean verify` (You will need [Maven](http://maven.apache.org/)) - Open the following projects in Eclipse: - - org.eclipse.redox + - org.eclipse.corrosion - target-platform - - org.eclipse.redox.tests (If you intend on contributing) + - org.eclipse.corrosion.tests (If you intend on contributing) - Set the Target Platform - Preferences > Plug-in Development > Target Platform - - Select the `redOx` target defininition - - Run the `org.eclipse.redox` project as an `Eclipse Application` + - Select the `corrosion` target defininition + - Run the `org.eclipse.corrosion` project as an `Eclipse Application` diff --git a/images/redOx.png b/images/redOx.png deleted file mode 100644 index d25b54c..0000000 Binary files a/images/redOx.png and /dev/null differ diff --git a/org.eclipse.redox.feature/.project b/org.eclipse.corrosion.feature/.project similarity index 88% rename from org.eclipse.redox.feature/.project rename to org.eclipse.corrosion.feature/.project index f44f581..b3b4521 100644 --- a/org.eclipse.redox.feature/.project +++ b/org.eclipse.corrosion.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.redox.feature + org.eclipse.corrosion.feature diff --git a/org.eclipse.redox.feature/build.properties b/org.eclipse.corrosion.feature/build.properties similarity index 100% rename from org.eclipse.redox.feature/build.properties rename to org.eclipse.corrosion.feature/build.properties diff --git a/org.eclipse.corrosion.feature/category.xml b/org.eclipse.corrosion.feature/category.xml new file mode 100644 index 0000000..6a53fd9 --- /dev/null +++ b/org.eclipse.corrosion.feature/category.xml @@ -0,0 +1,11 @@ + + + + + + + + Corrosion enables Rust application development in the Eclipse IDE. + + + diff --git a/org.eclipse.redox.feature/feature.properties b/org.eclipse.corrosion.feature/feature.properties similarity index 88% rename from org.eclipse.redox.feature/feature.properties rename to org.eclipse.corrosion.feature/feature.properties index 5158786..1b6c91a 100644 --- a/org.eclipse.redox.feature/feature.properties +++ b/org.eclipse.corrosion.feature/feature.properties @@ -1,4 +1,4 @@ -name=RedOx: Rust edition in Eclipse IDE +name=Corrosion: Rust edition in Eclipse IDE description=Rust editor in Eclipse IDE. Relies on the Rust Language Server (RLS). copyright=Copyright (c) 2017 Red Hat Inc. and others.\ \ diff --git a/org.eclipse.redox.feature/feature.xml b/org.eclipse.corrosion.feature/feature.xml similarity index 98% rename from org.eclipse.redox.feature/feature.xml rename to org.eclipse.corrosion.feature/feature.xml index 17a4110..0d75f37 100644 --- a/org.eclipse.redox.feature/feature.xml +++ b/org.eclipse.corrosion.feature/feature.xml @@ -1,6 +1,6 @@ 4.0.0 - org.eclipse.redox.feature + org.eclipse.corrosion.feature - org.eclipse.redox + org.eclipse.corrosion parent 0.1.0-SNAPSHOT diff --git a/org.eclipse.redox.tests/.classpath b/org.eclipse.corrosion.tests/.classpath similarity index 100% rename from org.eclipse.redox.tests/.classpath rename to org.eclipse.corrosion.tests/.classpath diff --git a/org.eclipse.redox.tests/.gitignore b/org.eclipse.corrosion.tests/.gitignore similarity index 100% rename from org.eclipse.redox.tests/.gitignore rename to org.eclipse.corrosion.tests/.gitignore diff --git a/org.eclipse.redox.tests/.project b/org.eclipse.corrosion.tests/.project similarity index 93% rename from org.eclipse.redox.tests/.project rename to org.eclipse.corrosion.tests/.project index d60cba5..1742448 100644 --- a/org.eclipse.redox.tests/.project +++ b/org.eclipse.corrosion.tests/.project @@ -1,6 +1,6 @@ - org.eclipse.redox.tests + org.eclipse.corrosion.tests diff --git a/org.eclipse.redox.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.corrosion.tests/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.redox.tests/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.corrosion.tests/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.redox.tests/META-INF/MANIFEST.MF b/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF similarity index 79% rename from org.eclipse.redox.tests/META-INF/MANIFEST.MF rename to org.eclipse.corrosion.tests/META-INF/MANIFEST.MF index aea4313..a4673d0 100644 --- a/org.eclipse.redox.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Tests for RedOx -Bundle-SymbolicName: org.eclipse.redox.tests;singleton:=true +Bundle-Name: Tests for Corrosion +Bundle-SymbolicName: org.eclipse.corrosion.tests;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-Vendor: Red Hat Inc. Eclipse-BundleShape: dir -Automatic-Module-Name: org.eclipse.redox.tests -Require-Bundle: org.eclipse.redox;bundle-version="0.1.0", +Automatic-Module-Name: org.eclipse.corrosion.tests +Require-Bundle: org.eclipse.corrosion;bundle-version="0.1.0", org.junit;bundle-version="4.11.0", org.eclipse.core.runtime;bundle-version="3.13.0", org.eclipse.core.resources;bundle-version="3.12.0", diff --git a/org.eclipse.redox.tests/build.properties b/org.eclipse.corrosion.tests/build.properties similarity index 100% rename from org.eclipse.redox.tests/build.properties rename to org.eclipse.corrosion.tests/build.properties diff --git a/org.eclipse.redox.tests/pom.xml b/org.eclipse.corrosion.tests/pom.xml similarity index 83% rename from org.eclipse.redox.tests/pom.xml rename to org.eclipse.corrosion.tests/pom.xml index 1b2e013..6320e88 100644 --- a/org.eclipse.redox.tests/pom.xml +++ b/org.eclipse.corrosion.tests/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.eclipse.redox.tests + org.eclipse.corrosion.tests - org.eclipse.redox + org.eclipse.corrosion parent 0.1.0-SNAPSHOT @@ -10,7 +10,7 @@ ${project.artifactId} - org.eclipse.redox.tests.AllTests + org.eclipse.corrosion.tests.AllTests diff --git a/org.eclipse.redox.tests/projects/basic/Cargo.toml b/org.eclipse.corrosion.tests/projects/basic/Cargo.toml similarity index 100% rename from org.eclipse.redox.tests/projects/basic/Cargo.toml rename to org.eclipse.corrosion.tests/projects/basic/Cargo.toml diff --git a/org.eclipse.redox.tests/projects/basic/src/main.rs b/org.eclipse.corrosion.tests/projects/basic/src/main.rs similarity index 100% rename from org.eclipse.redox.tests/projects/basic/src/main.rs rename to org.eclipse.corrosion.tests/projects/basic/src/main.rs diff --git a/org.eclipse.redox.tests/projects/basic_errors/Cargo.toml b/org.eclipse.corrosion.tests/projects/basic_errors/Cargo.toml similarity index 100% rename from org.eclipse.redox.tests/projects/basic_errors/Cargo.toml rename to org.eclipse.corrosion.tests/projects/basic_errors/Cargo.toml diff --git a/org.eclipse.redox.tests/projects/basic_errors/src/main.rs b/org.eclipse.corrosion.tests/projects/basic_errors/src/main.rs similarity index 100% rename from org.eclipse.redox.tests/projects/basic_errors/src/main.rs rename to org.eclipse.corrosion.tests/projects/basic_errors/src/main.rs diff --git a/org.eclipse.redox.tests/projects/not_cargo/src/main.rs b/org.eclipse.corrosion.tests/projects/not_cargo/src/main.rs similarity index 100% rename from org.eclipse.redox.tests/projects/not_cargo/src/main.rs rename to org.eclipse.corrosion.tests/projects/not_cargo/src/main.rs diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/AbstractRedoxTest.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/AbstractCorrosionTest.java similarity index 95% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/AbstractRedoxTest.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/AbstractCorrosionTest.java index 4d35c4d..99340b8 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/AbstractRedoxTest.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/AbstractCorrosionTest.java @@ -11,7 +11,7 @@ * Mickael Istria (Red Hat Inc.) - Source Reference * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import java.io.File; import java.io.IOException; @@ -39,7 +39,7 @@ * Takes care of creating a temporary project and resource before test and to * clean it up after. */ -public class AbstractRedoxTest { +public class AbstractCorrosionTest { private Map provisionedProjects; @@ -58,7 +58,7 @@ public void setUp() throws Exception { * @throws CoreException */ protected IProject provisionProject(String projectName) throws IOException, CoreException { - URL url = FileLocator.find(Platform.getBundle("org.eclipse.redox.tests"), + URL url = FileLocator.find(Platform.getBundle("org.eclipse.corrosion.tests"), Path.fromPortableString("projects/" + projectName), Collections.emptyMap()); url = FileLocator.toFileURL(url); File folder = new File(url.getFile()); diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/AllTests.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/AllTests.java similarity index 96% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/AllTests.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/AllTests.java index 773dc75..6c075a5 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/AllTests.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/AllTests.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestBuilder.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestBuilder.java similarity index 89% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestBuilder.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestBuilder.java index f71f875..83499a1 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestBuilder.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -27,16 +27,16 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.redox.builder.AddCargoBuilder; -import org.eclipse.redox.builder.RemoveCargoBuilder; -import org.eclipse.redox.builder.TestCargoBuilderEnabled; +import org.eclipse.corrosion.builder.AddCargoBuilder; +import org.eclipse.corrosion.builder.RemoveCargoBuilder; +import org.eclipse.corrosion.builder.TestCargoBuilderEnabled; import org.eclipse.ui.ISources; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; import org.eclipse.ui.tests.harness.util.DisplayHelper; import org.junit.Test; -public class TestBuilder extends AbstractRedoxTest { +public class TestBuilder extends AbstractCorrosionTest { @Test public void testBuild() throws Exception { @@ -60,9 +60,9 @@ protected boolean condition() { } private static final ICommandService COMMAND_SERVICE = PlatformUI.getWorkbench().getService(ICommandService.class); - private static final Command ADD_COMMAND = COMMAND_SERVICE.getCommand("org.eclipse.redox.builder.AddCargoBuilder"); + private static final Command ADD_COMMAND = COMMAND_SERVICE.getCommand("org.eclipse.corrosion.builder.AddCargoBuilder"); private static final Command REMOVE_COMMAND = COMMAND_SERVICE - .getCommand("org.eclipse.redox.builder.RemoveCargoBuilder"); + .getCommand("org.eclipse.corrosion.builder.RemoveCargoBuilder"); private void addBuilder(IProject project) throws Exception { IEvaluationContext evaluationContext = new EvaluationContext(null, project); diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestExportCargoProjectWizard.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestExportCargoProjectWizard.java similarity index 94% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestExportCargoProjectWizard.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestExportCargoProjectWizard.java index b622d1c..13424bf 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestExportCargoProjectWizard.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestExportCargoProjectWizard.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -20,8 +20,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.redox.wizards.export.CargoExportWizard; -import org.eclipse.redox.wizards.export.CargoExportWizardPage; +import org.eclipse.corrosion.wizards.export.CargoExportWizard; +import org.eclipse.corrosion.wizards.export.CargoExportWizardPage; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; @@ -29,7 +29,7 @@ import org.eclipse.ui.tests.harness.util.DisplayHelper; import org.junit.Test; -public class TestExportCargoProjectWizard extends AbstractRedoxTest { +public class TestExportCargoProjectWizard extends AbstractCorrosionTest { private WizardDialog dialog; private CargoExportWizard wizard; diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestIDEIntegration.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestIDEIntegration.java similarity index 94% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestIDEIntegration.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestIDEIntegration.java index e7948e7..39dc371 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestIDEIntegration.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestIDEIntegration.java @@ -11,7 +11,7 @@ * Mickael Istria (Red Hat Inc.) - Source Reference * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import java.io.IOException; @@ -24,7 +24,7 @@ import org.junit.Assert; import org.junit.Test; -public class TestIDEIntegration extends AbstractRedoxTest { +public class TestIDEIntegration extends AbstractCorrosionTest { @Test public void testRustEditorAssociation() throws IOException, CoreException { diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestLSPExtensions.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPExtensions.java similarity index 94% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestLSPExtensions.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPExtensions.java index 14ac516..31caed8 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestLSPExtensions.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPExtensions.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.IJobManager; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.redox.RLSClientImplementation; +import org.eclipse.corrosion.RLSClientImplementation; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.tests.harness.util.DisplayHelper; import org.junit.Test; diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestLSPIntegration.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPIntegration.java similarity index 96% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestLSPIntegration.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPIntegration.java index 67d8b59..0a14724 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestLSPIntegration.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPIntegration.java @@ -11,7 +11,7 @@ * Mickael Istria (Red Hat Inc.) - Source Reference * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -40,7 +40,7 @@ import org.junit.Assert; import org.junit.Test; -public class TestLSPIntegration extends AbstractRedoxTest { +public class TestLSPIntegration extends AbstractCorrosionTest { @Test public void testLSFound() throws Exception { diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestNewCargoProjectWizard.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestNewCargoProjectWizard.java similarity index 92% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestNewCargoProjectWizard.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestNewCargoProjectWizard.java index e6e77ea..1f80f3d 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestNewCargoProjectWizard.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestNewCargoProjectWizard.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -22,14 +22,14 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.redox.wizards.newCargo.NewCargoProjectWizard; -import org.eclipse.redox.wizards.newCargo.NewCargoProjectWizardPage; +import org.eclipse.corrosion.wizards.newCargo.NewCargoProjectWizard; +import org.eclipse.corrosion.wizards.newCargo.NewCargoProjectWizardPage; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.tests.harness.util.DisplayHelper; import org.junit.Test; -public class TestNewCargoProjectWizard extends AbstractRedoxTest { +public class TestNewCargoProjectWizard extends AbstractCorrosionTest { @Test public void testNewProjectPage() throws Exception { diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestPerspective.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestPerspective.java similarity index 95% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestPerspective.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestPerspective.java index e82da39..aaf65fd 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestPerspective.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestPerspective.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -18,8 +18,8 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.redox.RustPerspective; -import org.eclipse.redox.wizards.newCargo.NewCargoProjectWizard; +import org.eclipse.corrosion.RustPerspective; +import org.eclipse.corrosion.wizards.newCargo.NewCargoProjectWizard; import org.eclipse.search.ui.NewSearchUI; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveDescriptor; diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestRunConfiguration.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestRunConfiguration.java similarity index 96% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestRunConfiguration.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestRunConfiguration.java index cf77eaf..3a5069f 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestRunConfiguration.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestRunConfiguration.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -31,7 +31,7 @@ import org.eclipse.ui.tests.harness.util.DisplayHelper; import org.junit.Test; -public class TestRunConfiguration extends AbstractRedoxTest { +public class TestRunConfiguration extends AbstractCorrosionTest { @Test public void testBasicRun() throws Exception { @@ -103,7 +103,7 @@ private ILaunchConfigurationWorkingCopy createLaunchConfiguration(IProject proje throws CoreException { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType configType = launchManager - .getLaunchConfigurationType("org.eclipse.redox.run.CargoRunDelegate"); + .getLaunchConfigurationType("org.eclipse.corrosion.run.CargoRunDelegate"); ILaunchConfigurationWorkingCopy wc = configType.newInstance(project, name); wc.setAttribute("PROJECT", project.getName()); return wc; diff --git a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestSyntaxHighlighting.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestSyntaxHighlighting.java similarity index 95% rename from org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestSyntaxHighlighting.java rename to org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestSyntaxHighlighting.java index a5edd4c..8e06226 100644 --- a/org.eclipse.redox.tests/src/org/eclipse/redox/tests/TestSyntaxHighlighting.java +++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestSyntaxHighlighting.java @@ -11,7 +11,7 @@ * Mickael Istria (Red Hat Inc.) - Source Reference * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.tests; +package org.eclipse.corrosion.tests; import java.io.IOException; @@ -26,7 +26,7 @@ import org.junit.Assert; import org.junit.Test; -public class TestSyntaxHighlighting extends AbstractRedoxTest { +public class TestSyntaxHighlighting extends AbstractCorrosionTest { @Test public void testRustSyntaxHighlighting() throws CoreException, IOException { diff --git a/org.eclipse.redox/.classpath b/org.eclipse.corrosion/.classpath similarity index 100% rename from org.eclipse.redox/.classpath rename to org.eclipse.corrosion/.classpath diff --git a/org.eclipse.redox/.gitignore b/org.eclipse.corrosion/.gitignore similarity index 100% rename from org.eclipse.redox/.gitignore rename to org.eclipse.corrosion/.gitignore diff --git a/org.eclipse.redox/.project b/org.eclipse.corrosion/.project similarity index 94% rename from org.eclipse.redox/.project rename to org.eclipse.corrosion/.project index c3180a5..fb473d2 100644 --- a/org.eclipse.redox/.project +++ b/org.eclipse.corrosion/.project @@ -1,6 +1,6 @@ - org.eclipse.redox + org.eclipse.corrosion diff --git a/org.eclipse.redox/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.corrosion/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from org.eclipse.redox/.settings/org.eclipse.jdt.core.prefs rename to org.eclipse.corrosion/.settings/org.eclipse.jdt.core.prefs diff --git a/org.eclipse.redox/META-INF/MANIFEST.MF b/org.eclipse.corrosion/META-INF/MANIFEST.MF similarity index 65% rename from org.eclipse.redox/META-INF/MANIFEST.MF rename to org.eclipse.corrosion/META-INF/MANIFEST.MF index c74a4a8..6507e14 100644 --- a/org.eclipse.redox/META-INF/MANIFEST.MF +++ b/org.eclipse.corrosion/META-INF/MANIFEST.MF @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Rust edition in Eclipse IDE -Bundle-SymbolicName: org.eclipse.redox;singleton:=true +Bundle-SymbolicName: org.eclipse.corrosion;singleton:=true Bundle-Version: 0.1.0.qualifier -Automatic-Module-Name: org.eclipse.redox -Bundle-Activator: org.eclipse.redox.RedoxPlugin +Automatic-Module-Name: org.eclipse.corrosion +Bundle-Activator: org.eclipse.corrosion.CorrosionPlugin Bundle-Vendor: Red Hat Inc. Require-Bundle: org.eclipse.core.contenttype, org.eclipse.ui.genericeditor;bundle-version="1.0.1", @@ -36,8 +36,8 @@ Require-Bundle: org.eclipse.core.contenttype, org.eclipse.cdt.dsf.gdb.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.redox;x-friends:="org.eclipse.redox.tests", - org.eclipse.redox.builder;x-friends:="org.eclipse.redox.tests", - org.eclipse.redox.extensions;x-friends:="org.eclipse.redox.tests", - org.eclipse.redox.wizards.export;x-friends:="org.eclipse.redox.tests", - org.eclipse.redox.wizards.newCargo;x-friends:="org.eclipse.redox.tests" +Export-Package: org.eclipse.corrosion;x-friends:="org.eclipse.corrosion.tests", + org.eclipse.corrosion.builder;x-friends:="org.eclipse.corrosion.tests", + org.eclipse.corrosion.extensions;x-friends:="org.eclipse.corrosion.tests", + org.eclipse.corrosion.wizards.export;x-friends:="org.eclipse.corrosion.tests", + org.eclipse.corrosion.wizards.newCargo;x-friends:="org.eclipse.corrosion.tests" diff --git a/org.eclipse.redox/build.properties b/org.eclipse.corrosion/build.properties similarity index 100% rename from org.eclipse.redox/build.properties rename to org.eclipse.corrosion/build.properties diff --git a/org.eclipse.redox/grammar/Rust.tmLanguage b/org.eclipse.corrosion/grammar/Rust.tmLanguage similarity index 100% rename from org.eclipse.redox/grammar/Rust.tmLanguage rename to org.eclipse.corrosion/grammar/Rust.tmLanguage diff --git a/org.eclipse.redox/grammar/TOML.tmLanguage b/org.eclipse.corrosion/grammar/TOML.tmLanguage similarity index 100% rename from org.eclipse.redox/grammar/TOML.tmLanguage rename to org.eclipse.corrosion/grammar/TOML.tmLanguage diff --git a/org.eclipse.redox/icons/cargo.png b/org.eclipse.corrosion/icons/cargo.png similarity index 100% rename from org.eclipse.redox/icons/cargo.png rename to org.eclipse.corrosion/icons/cargo.png diff --git a/org.eclipse.redox/icons/cargo@2x.png b/org.eclipse.corrosion/icons/cargo@2x.png similarity index 100% rename from org.eclipse.redox/icons/cargo@2x.png rename to org.eclipse.corrosion/icons/cargo@2x.png diff --git a/org.eclipse.redox/icons/link_obj.png b/org.eclipse.corrosion/icons/link_obj.png similarity index 100% rename from org.eclipse.redox/icons/link_obj.png rename to org.eclipse.corrosion/icons/link_obj.png diff --git a/org.eclipse.redox/icons/rust.png b/org.eclipse.corrosion/icons/rust.png similarity index 100% rename from org.eclipse.redox/icons/rust.png rename to org.eclipse.corrosion/icons/rust.png diff --git a/org.eclipse.redox/icons/rust@x2.png b/org.eclipse.corrosion/icons/rust@x2.png similarity index 100% rename from org.eclipse.redox/icons/rust@x2.png rename to org.eclipse.corrosion/icons/rust@x2.png diff --git a/org.eclipse.redox/images/cargo.png b/org.eclipse.corrosion/images/cargo.png similarity index 100% rename from org.eclipse.redox/images/cargo.png rename to org.eclipse.corrosion/images/cargo.png diff --git a/org.eclipse.redox/plugin.xml b/org.eclipse.corrosion/plugin.xml similarity index 63% rename from org.eclipse.redox/plugin.xml rename to org.eclipse.corrosion/plugin.xml index 88ba5f8..a3f1fdd 100644 --- a/org.eclipse.redox/plugin.xml +++ b/org.eclipse.corrosion/plugin.xml @@ -6,14 +6,14 @@ @@ -21,26 +21,26 @@ + class="org.eclipse.corrosion.RLSStreamConnectionProvider" + id="org.eclipse.corrosion.rls" + label="org.eclipse.corrosion.RLS" + clientImpl="org.eclipse.corrosion.RLSClientImplementation" + serverInterface="org.eclipse.corrosion.RLSServerInterface"> + contentType="org.eclipse.corrosion.rust" + id="org.eclipse.corrosion.rls"> @@ -66,38 +66,38 @@ point="org.eclipse.ui.genericeditor.presentationReconcilers"> + contentType="org.eclipse.corrosion.rust"> + class="org.eclipse.corrosion.snippet.SnippetContentAssistProcessor" + contentType="org.eclipse.corrosion.rust"> + class="org.eclipse.corrosion.CorrosionPreferenceInitializer"> - + - @@ -108,14 +108,14 @@ @@ -123,9 +123,9 @@ A wizard to assist with packaging Cargo based Rust projects into crates @@ -138,76 +138,76 @@ + sourceLocatorId="com.eclipse.corrosion.debug.SourceLocator"> + class="org.eclipse.corrosion.run.CargoRunTabGroup" + id="org.eclipse.corrosion.run.CargoRunTabGroup" + type="org.eclipse.corrosion.run.CargoRunDelegate"> + class="org.eclipse.corrosion.debug.RustDebugTabGroup" + id="org.eclipse.corrosion.debug.RustDebugTabGroup" + type="org.eclipse.corrosion.debug.RustDebugDelegate"> + class="org.eclipse.corrosion.CargoProjectTester"> - + - + @@ -215,19 +215,19 @@ - + - + + property="org.eclipse.corrosion.builder.isCargoBuilderEnabled"> @@ -254,16 +254,16 @@ - + + property="org.eclipse.corrosion.builder.isCargoBuilderEnabled"> @@ -274,7 +274,7 @@ allPopups="true" locationURI="popup:#TextEditorContext?after=additions"> @@ -282,26 +282,26 @@ + id="org.eclipse.corrosion.builder.AddCargoBuilder"> + class="org.eclipse.corrosion.extensions.Implementations" + commandId="org.eclipse.corrosion.commands.Implementations"> @@ -329,17 +329,17 @@ + class="org.eclipse.corrosion.debug.ToggleBreakpointsTargetFactory" + id="com.eclipse.corrosion.debug.ToggleBreakpointsTargetFactory"> diff --git a/org.eclipse.redox/pom.xml b/org.eclipse.corrosion/pom.xml similarity index 93% rename from org.eclipse.redox/pom.xml rename to org.eclipse.corrosion/pom.xml index cfdfccf..e42ff51 100644 --- a/org.eclipse.redox/pom.xml +++ b/org.eclipse.corrosion/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - org.eclipse.redox + org.eclipse.corrosion - org.eclipse.redox + org.eclipse.corrosion parent 0.1.0-SNAPSHOT diff --git a/org.eclipse.redox/scripts/rustup.sh b/org.eclipse.corrosion/scripts/rustup.sh similarity index 100% rename from org.eclipse.redox/scripts/rustup.sh rename to org.eclipse.corrosion/scripts/rustup.sh diff --git a/org.eclipse.redox/snippets/rust.json b/org.eclipse.corrosion/snippets/rust.json similarity index 100% rename from org.eclipse.redox/snippets/rust.json rename to org.eclipse.corrosion/snippets/rust.json diff --git a/org.eclipse.redox/src/org/eclipse/redox/CargoProjectTester.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/CargoProjectTester.java similarity index 97% rename from org.eclipse.redox/src/org/eclipse/redox/CargoProjectTester.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/CargoProjectTester.java index 990e918..3034819 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/CargoProjectTester.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/CargoProjectTester.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox; +package org.eclipse.corrosion; import org.eclipse.core.expressions.PropertyTester; import org.eclipse.core.resources.IProject; diff --git a/org.eclipse.redox/src/org/eclipse/redox/RedoxPlugin.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/CorrosionPlugin.java similarity index 81% rename from org.eclipse.redox/src/org/eclipse/redox/RedoxPlugin.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/CorrosionPlugin.java index b42f862..22309b6 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/RedoxPlugin.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/CorrosionPlugin.java @@ -10,25 +10,25 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox; +package org.eclipse.corrosion; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; -public class RedoxPlugin extends AbstractUIPlugin { +public class CorrosionPlugin extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.redox"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.eclipse.corrosion"; //$NON-NLS-1$ // The shared instance - private static RedoxPlugin plugin; + private static CorrosionPlugin plugin; /** * The constructor */ - public RedoxPlugin() { + public CorrosionPlugin() { } @Override @@ -48,7 +48,7 @@ public void stop(BundleContext context) throws Exception { * * @return the shared instance */ - public static RedoxPlugin getDefault() { + public static CorrosionPlugin getDefault() { return plugin; } diff --git a/org.eclipse.redox/src/org/eclipse/redox/RedoxPreferenceInitializer.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/CorrosionPreferenceInitializer.java similarity index 83% rename from org.eclipse.redox/src/org/eclipse/redox/RedoxPreferenceInitializer.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/CorrosionPreferenceInitializer.java index a9da6b9..6554e72 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/RedoxPreferenceInitializer.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/CorrosionPreferenceInitializer.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox; +package org.eclipse.corrosion; import java.io.BufferedReader; import java.io.File; @@ -20,20 +20,20 @@ import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.jface.preference.IPreferenceStore; -public class RedoxPreferenceInitializer extends AbstractPreferenceInitializer { +public class CorrosionPreferenceInitializer extends AbstractPreferenceInitializer { - private static final IPreferenceStore STORE = RedoxPlugin.getDefault().getPreferenceStore(); + private static final IPreferenceStore STORE = CorrosionPlugin.getDefault().getPreferenceStore(); - public static String rustSourcePreference = "redox.rustSource"; + public static String rustSourcePreference = "corrosion.rustSource"; - public static String defaultPathsPreference = "redox.rustup_defaultPaths"; - public static String rustupPathPreference = "redox.rustup_rustupPath"; - public static String cargoPathPreference = "redox.rustup_cargoPath"; - public static String toolchainIdPreference = "redox.rustup_toolchain_Id"; - public static String toolchainTypePreference = "redox.rustup_toolchain_type"; + public static String defaultPathsPreference = "corrosion.rustup_defaultPaths"; + public static String rustupPathPreference = "corrosion.rustup_rustupPath"; + public static String cargoPathPreference = "corrosion.rustup_cargoPath"; + public static String toolchainIdPreference = "corrosion.rustup_toolchain_Id"; + public static String toolchainTypePreference = "corrosion.rustup_toolchain_type"; - public static String rlsPathPreference = "redox.rslPath"; - public static String sysrootPathPreference = "redox.sysrootPath"; + public static String rlsPathPreference = "corrosion.rslPath"; + public static String sysrootPathPreference = "corrosion.sysrootPath"; @Override public void initializeDefaultPreferences() { @@ -100,7 +100,7 @@ private void setToolchainBestGuesses() { STORE.setDefault(toolchainIdPreference, toolchain); STORE.setDefault(toolchainTypePreference, "Nightly"); } else { - for (String option : RedoxPreferencePage.RUSTUP_TOOLCHAIN_OPTIONS) { + for (String option : CorrosionPreferencePage.RUSTUP_TOOLCHAIN_OPTIONS) { if (option.toLowerCase().equals(type)) { STORE.setDefault(toolchainIdPreference, type); STORE.setDefault(toolchainTypePreference, option); diff --git a/org.eclipse.redox/src/org/eclipse/redox/RedoxPreferencePage.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/CorrosionPreferencePage.java similarity index 84% rename from org.eclipse.redox/src/org/eclipse/redox/RedoxPreferencePage.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/CorrosionPreferencePage.java index 6b1db87..360e2ea 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/RedoxPreferencePage.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/CorrosionPreferencePage.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox; +package org.eclipse.corrosion; import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter; @@ -45,8 +45,8 @@ import org.eclipse.ui.IWorkbenchPreferencePage; import org.osgi.framework.Bundle; -public class RedoxPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - public static final String PAGE_ID = "org.eclipse.redox.preferencePage"; +public class CorrosionPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { + public static final String PAGE_ID = "org.eclipse.corrosion.preferencePage"; public static final List RUST_SOURCE_OPTIONS = Arrays.asList("rustup", "other", "disabled"); public static final List RUSTUP_TOOLCHAIN_OPTIONS = Arrays.asList("Stable", "Beta", "Nightly", "Other"); @@ -101,11 +101,11 @@ protected Control createContents(Composite parent) { } private void initializeContent() { - int sourceIndex = RUST_SOURCE_OPTIONS.indexOf(store.getString(RedoxPreferenceInitializer.rustSourcePreference)); + int sourceIndex = RUST_SOURCE_OPTIONS.indexOf(store.getString(CorrosionPreferenceInitializer.rustSourcePreference)); setRadioSelection(sourceIndex); int toolchainIndex = RUSTUP_TOOLCHAIN_OPTIONS - .indexOf(store.getString(RedoxPreferenceInitializer.toolchainTypePreference)); - String toolchainId = store.getString(RedoxPreferenceInitializer.toolchainIdPreference); + .indexOf(store.getString(CorrosionPreferenceInitializer.toolchainTypePreference)); + String toolchainId = store.getString(CorrosionPreferenceInitializer.toolchainIdPreference); otherIdText.setText(toolchainId); for (int i = 0; i < RUSTUP_TOOLCHAIN_OPTIONS.size(); i++) { if (RUSTUP_TOOLCHAIN_OPTIONS.get(i).toLowerCase().equals(toolchainId.toLowerCase())) { @@ -114,16 +114,16 @@ private void initializeContent() { } } setToolchainSelection(toolchainIndex); - rustupPathText.setText(store.getString(RedoxPreferenceInitializer.rustupPathPreference)); - cargoPathText.setText(store.getString(RedoxPreferenceInitializer.cargoPathPreference)); - setDefaultPathsSelection(store.getBoolean(RedoxPreferenceInitializer.defaultPathsPreference)); - rlsPathText.setText(store.getString(RedoxPreferenceInitializer.rlsPathPreference)); - sysrootPathText.setText(store.getString(RedoxPreferenceInitializer.sysrootPathPreference)); + rustupPathText.setText(store.getString(CorrosionPreferenceInitializer.rustupPathPreference)); + cargoPathText.setText(store.getString(CorrosionPreferenceInitializer.cargoPathPreference)); + setDefaultPathsSelection(store.getBoolean(CorrosionPreferenceInitializer.defaultPathsPreference)); + rlsPathText.setText(store.getString(CorrosionPreferenceInitializer.rlsPathPreference)); + sysrootPathText.setText(store.getString(CorrosionPreferenceInitializer.sysrootPathPreference)); } @Override protected IPreferenceStore doGetPreferenceStore() { - return RedoxPlugin.getDefault().getPreferenceStore(); + return CorrosionPlugin.getDefault().getPreferenceStore(); } private boolean isPageValid() { @@ -205,11 +205,11 @@ private boolean isOtherInstallSectionValid() { @Override protected void performDefaults() { int sourceIndex = RUST_SOURCE_OPTIONS - .indexOf(store.getDefaultString(RedoxPreferenceInitializer.rustSourcePreference)); + .indexOf(store.getDefaultString(CorrosionPreferenceInitializer.rustSourcePreference)); setRadioSelection(sourceIndex); int toolchainIndex = RUSTUP_TOOLCHAIN_OPTIONS - .indexOf(store.getDefaultString(RedoxPreferenceInitializer.toolchainTypePreference)); - String toolchainId = store.getDefaultString(RedoxPreferenceInitializer.toolchainIdPreference); + .indexOf(store.getDefaultString(CorrosionPreferenceInitializer.toolchainTypePreference)); + String toolchainId = store.getDefaultString(CorrosionPreferenceInitializer.toolchainIdPreference); otherIdText.setText(toolchainId); for (int i = 0; i < RUSTUP_TOOLCHAIN_OPTIONS.size(); i++) { if (RUSTUP_TOOLCHAIN_OPTIONS.get(i).toLowerCase().equals(toolchainId.toLowerCase())) { @@ -218,19 +218,19 @@ protected void performDefaults() { } } setToolchainSelection(toolchainIndex); - setDefaultPathsSelection(store.getDefaultBoolean(RedoxPreferenceInitializer.defaultPathsPreference)); - rustupPathText.setText(store.getDefaultString(RedoxPreferenceInitializer.rustupPathPreference)); - cargoPathText.setText(store.getDefaultString(RedoxPreferenceInitializer.cargoPathPreference)); - rlsPathText.setText(store.getDefaultString(RedoxPreferenceInitializer.rlsPathPreference)); - sysrootPathText.setText(store.getDefaultString(RedoxPreferenceInitializer.sysrootPathPreference)); + setDefaultPathsSelection(store.getDefaultBoolean(CorrosionPreferenceInitializer.defaultPathsPreference)); + rustupPathText.setText(store.getDefaultString(CorrosionPreferenceInitializer.rustupPathPreference)); + cargoPathText.setText(store.getDefaultString(CorrosionPreferenceInitializer.cargoPathPreference)); + rlsPathText.setText(store.getDefaultString(CorrosionPreferenceInitializer.rlsPathPreference)); + sysrootPathText.setText(store.getDefaultString(CorrosionPreferenceInitializer.sysrootPathPreference)); super.performDefaults(); } private void setDefaultPathsSelection(boolean selection) { useDefaultPathsCheckbox.setSelection(selection); if (selection) { - rustupPathText.setText(store.getDefaultString(RedoxPreferenceInitializer.rustupPathPreference)); - cargoPathText.setText(store.getDefaultString(RedoxPreferenceInitializer.cargoPathPreference)); + rustupPathText.setText(store.getDefaultString(CorrosionPreferenceInitializer.rustupPathPreference)); + cargoPathText.setText(store.getDefaultString(CorrosionPreferenceInitializer.cargoPathPreference)); } setDefaultPathsEnabled(!selection); } @@ -276,18 +276,18 @@ private void setRadioSelection(int selection) { @Override public boolean performOk() { int source = getRadioSelection(); - store.setValue(RedoxPreferenceInitializer.rustSourcePreference, RUST_SOURCE_OPTIONS.get(source)); + store.setValue(CorrosionPreferenceInitializer.rustSourcePreference, RUST_SOURCE_OPTIONS.get(source)); if (source == 0) { String id = getToolchainId(); - store.setValue(RedoxPreferenceInitializer.toolchainTypePreference, rustupToolchainCombo.getText()); - store.setValue(RedoxPreferenceInitializer.toolchainIdPreference, id); - store.setValue(RedoxPreferenceInitializer.defaultPathsPreference, useDefaultPathsCheckbox.getSelection()); - store.setValue(RedoxPreferenceInitializer.rustupPathPreference, rustupPathText.getText()); - store.setValue(RedoxPreferenceInitializer.cargoPathPreference, cargoPathText.getText()); + store.setValue(CorrosionPreferenceInitializer.toolchainTypePreference, rustupToolchainCombo.getText()); + store.setValue(CorrosionPreferenceInitializer.toolchainIdPreference, id); + store.setValue(CorrosionPreferenceInitializer.defaultPathsPreference, useDefaultPathsCheckbox.getSelection()); + store.setValue(CorrosionPreferenceInitializer.rustupPathPreference, rustupPathText.getText()); + store.setValue(CorrosionPreferenceInitializer.cargoPathPreference, cargoPathText.getText()); RustManager.setDefaultToolchain(id); } else if (source == 1) { - store.setValue(RedoxPreferenceInitializer.rlsPathPreference, rlsPathText.getText()); - store.setValue(RedoxPreferenceInitializer.sysrootPathPreference, sysrootPathText.getText()); + store.setValue(CorrosionPreferenceInitializer.rlsPathPreference, rlsPathText.getText()); + store.setValue(CorrosionPreferenceInitializer.sysrootPathPreference, sysrootPathText.getText()); } return true; } @@ -329,8 +329,8 @@ private void createCommandPathsPart(Composite container) { useDefaultPathsCheckbox.addSelectionListener(widgetSelectedAdapter(e -> { setDefaultPathsEnabled(!useDefaultPathsCheckbox.getSelection()); if (useDefaultPathsCheckbox.getSelection()) { - rustupPathText.setText(store.getDefaultString(RedoxPreferenceInitializer.rustupPathPreference)); - cargoPathText.setText(store.getDefaultString(RedoxPreferenceInitializer.cargoPathPreference)); + rustupPathText.setText(store.getDefaultString(CorrosionPreferenceInitializer.rustupPathPreference)); + cargoPathText.setText(store.getDefaultString(CorrosionPreferenceInitializer.cargoPathPreference)); } setValid(isPageValid()); })); @@ -392,14 +392,14 @@ private void installCommands() { installButton.setEnabled(false); Job.create("Installing Rustup and Cargo", (ICoreRunnable) monitor -> { try { - Bundle bundle = Platform.getBundle("org.eclipse.redox"); + Bundle bundle = Platform.getBundle("org.eclipse.corrosion"); URL fileURL = FileLocator.toFileURL(bundle.getEntry("scripts/rustup.sh")); File file = new File(new URI(fileURL.getProtocol(), fileURL.getPath(), null)); String[] command = new String[] { "/bin/bash", "-c", file.getAbsolutePath() }; ProcessBuilder builder = new ProcessBuilder(command); Process process = builder.start(); if (process.waitFor() == 0) { - RedoxPreferenceInitializer initializer = new RedoxPreferenceInitializer(); + CorrosionPreferenceInitializer initializer = new CorrosionPreferenceInitializer(); initializer.initializeDefaultPreferences(); Display.getDefault().asyncExec(() -> { setInstallRequired(false); diff --git a/org.eclipse.redox/src/org/eclipse/redox/RLSClientImplementation.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/RLSClientImplementation.java similarity index 95% rename from org.eclipse.redox/src/org/eclipse/redox/RLSClientImplementation.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/RLSClientImplementation.java index 4522241..9d2f75d 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/RLSClientImplementation.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/RLSClientImplementation.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox; +package org.eclipse.corrosion; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -42,7 +42,7 @@ public void diagnosticsBegin() { public void diagnosticsEnd() { status = null; if (diagnosticsJob != null) { - diagnosticsJob.done(new Status(IStatus.OK, RedoxPlugin.PLUGIN_ID, null)); + diagnosticsJob.done(new Status(IStatus.OK, CorrosionPlugin.PLUGIN_ID, null)); diagnosticsJob = null; } } diff --git a/org.eclipse.redox/src/org/eclipse/redox/RLSServerInterface.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/RLSServerInterface.java similarity index 96% rename from org.eclipse.redox/src/org/eclipse/redox/RLSServerInterface.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/RLSServerInterface.java index 768b021..58031f0 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/RLSServerInterface.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/RLSServerInterface.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox; +package org.eclipse.corrosion; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/org.eclipse.redox/src/org/eclipse/redox/RLSStreamConnectionProvider.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/RLSStreamConnectionProvider.java similarity index 82% rename from org.eclipse.redox/src/org/eclipse/redox/RLSStreamConnectionProvider.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/RLSStreamConnectionProvider.java index 5e8983e..1910781 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/RLSStreamConnectionProvider.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/RLSStreamConnectionProvider.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox; +package org.eclipse.corrosion; import java.io.BufferedReader; import java.io.FilterInputStream; @@ -54,16 +54,16 @@ public void start() throws IOException { } private boolean setSystemProperties() { - RedoxPlugin plugin = RedoxPlugin.getDefault(); + CorrosionPlugin plugin = CorrosionPlugin.getDefault(); IPreferenceStore preferenceStore = plugin.getPreferenceStore(); - int rustSourceIndex = RedoxPreferencePage.RUST_SOURCE_OPTIONS - .indexOf(preferenceStore.getString(RedoxPreferenceInitializer.rustSourcePreference)); + int rustSourceIndex = CorrosionPreferencePage.RUST_SOURCE_OPTIONS + .indexOf(preferenceStore.getString(CorrosionPreferenceInitializer.rustSourcePreference)); String sysrootPath = ""; if (rustSourceIndex == 0) { - String rustup = preferenceStore.getString(RedoxPreferenceInitializer.rustupPathPreference); - String toolchain = preferenceStore.getString(RedoxPreferenceInitializer.toolchainIdPreference); + String rustup = preferenceStore.getString(CorrosionPreferenceInitializer.rustupPathPreference); + String toolchain = preferenceStore.getString(CorrosionPreferenceInitializer.toolchainIdPreference); if (!(rustup.isEmpty() || toolchain.isEmpty())) { String[] command = new String[] { rustup, "run", toolchain, "rustc", "--print", "sysroot" }; try { @@ -76,7 +76,7 @@ private boolean setSystemProperties() { } } } else if (rustSourceIndex == 1) { - sysrootPath = preferenceStore.getString(RedoxPreferenceInitializer.sysrootPathPreference); + sysrootPath = preferenceStore.getString(CorrosionPreferenceInitializer.sysrootPathPreference); } if (!sysrootPath.isEmpty()) { @@ -88,33 +88,33 @@ private boolean setSystemProperties() { return true; } } - RedoxPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, - RedoxPlugin.getDefault().getBundle().getSymbolicName(), + CorrosionPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, + CorrosionPlugin.getDefault().getBundle().getSymbolicName(), "Was unable to set the `SYS_ROOT` and `LD_LIBRARY_PATH` environment variables. Please do so manually.")); return false; } private String getRLS() { - RedoxPlugin plugin = RedoxPlugin.getDefault(); + CorrosionPlugin plugin = CorrosionPlugin.getDefault(); IPreferenceStore preferenceStore = plugin.getPreferenceStore(); - int rustSourceIndex = RedoxPreferencePage.RUST_SOURCE_OPTIONS - .indexOf(preferenceStore.getString(RedoxPreferenceInitializer.rustSourcePreference)); + int rustSourceIndex = CorrosionPreferencePage.RUST_SOURCE_OPTIONS + .indexOf(preferenceStore.getString(CorrosionPreferenceInitializer.rustSourcePreference)); if (rustSourceIndex == 0) { - String rustup = preferenceStore.getString(RedoxPreferenceInitializer.rustupPathPreference); - String toolchain = preferenceStore.getString(RedoxPreferenceInitializer.toolchainIdPreference); + String rustup = preferenceStore.getString(CorrosionPreferenceInitializer.rustupPathPreference); + String toolchain = preferenceStore.getString(CorrosionPreferenceInitializer.toolchainIdPreference); if (!(rustup.isEmpty() || toolchain.isEmpty())) { return rustup + " run " + toolchain + " rls"; } } else if (rustSourceIndex == 1) { - String rls = preferenceStore.getString(RedoxPreferenceInitializer.rlsPathPreference); + String rls = preferenceStore.getString(CorrosionPreferenceInitializer.rlsPathPreference); if (!rls.isEmpty()) { return rls; } } - RedoxPlugin.getDefault().getLog() - .log(new Status(IStatus.ERROR, RedoxPlugin.getDefault().getBundle().getSymbolicName(), + CorrosionPlugin.getDefault().getLog() + .log(new Status(IStatus.ERROR, CorrosionPlugin.getDefault().getBundle().getSymbolicName(), "Rust Language Server not found. Update in Rust preferences.")); return ""; } @@ -129,7 +129,7 @@ private void showSetupRustNotification() { SWT.NONE, "Open Preferences", "Cancel"); if (dialogResponse == 0) { PreferenceDialog preferenceDialog = PreferencesUtil.createPreferenceDialogOn(shell, - RedoxPreferencePage.PAGE_ID, new String[] { RedoxPreferencePage.PAGE_ID }, null); + CorrosionPreferencePage.PAGE_ID, new String[] { CorrosionPreferencePage.PAGE_ID }, null); preferenceDialog.setBlockOnOpen(true); preferenceDialog.open(); } else { diff --git a/org.eclipse.redox/src/org/eclipse/redox/RustManager.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/RustManager.java similarity index 95% rename from org.eclipse.redox/src/org/eclipse/redox/RustManager.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/RustManager.java index b254bec..3aef716 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/RustManager.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/RustManager.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox; +package org.eclipse.corrosion; import java.io.BufferedReader; import java.io.IOException; @@ -41,10 +41,10 @@ //TODO: investigate solution not requiring breaking restrictions @SuppressWarnings("restriction") public class RustManager { - private static final IPreferenceStore STORE = RedoxPlugin.getDefault().getPreferenceStore(); + private static final IPreferenceStore STORE = CorrosionPlugin.getDefault().getPreferenceStore(); public static String getDefaultToolchain() { - String rustup = STORE.getString(RedoxPreferenceInitializer.rustupPathPreference); + String rustup = STORE.getString(CorrosionPreferenceInitializer.rustupPathPreference); if (!rustup.isEmpty()) { try { ProcessBuilder builder = new ProcessBuilder(new String[] { rustup, "show" }); @@ -174,7 +174,7 @@ private static void showToolchainSelectionError(String message) { } private static boolean runRustupCommand(SubMonitor monitor, String... arguments) { - String rustup = STORE.getString(RedoxPreferenceInitializer.rustupPathPreference); + String rustup = STORE.getString(CorrosionPreferenceInitializer.rustupPathPreference); if (rustup.isEmpty()) { return false; } @@ -201,7 +201,7 @@ private static boolean runRustupCommand(SubMonitor monitor, String... arguments) public static List getToolchains() { List toolchainsList = new ArrayList<>(); - String rustup = STORE.getString(RedoxPreferenceInitializer.rustupPathPreference); + String rustup = STORE.getString(CorrosionPreferenceInitializer.rustupPathPreference); if (!rustup.isEmpty()) { try { ProcessBuilder builder = new ProcessBuilder(new String[] { rustup, "show" }); diff --git a/org.eclipse.redox/src/org/eclipse/redox/RustPerspective.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/RustPerspective.java similarity index 94% rename from org.eclipse.redox/src/org/eclipse/redox/RustPerspective.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/RustPerspective.java index 3469bae..a8f06e1 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/RustPerspective.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/RustPerspective.java @@ -10,10 +10,10 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox; +package org.eclipse.corrosion; import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.redox.wizards.newCargo.NewCargoProjectWizard; +import org.eclipse.corrosion.wizards.newCargo.NewCargoProjectWizard; import org.eclipse.search.ui.NewSearchUI; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; @@ -23,7 +23,7 @@ import org.eclipse.ui.wizards.newresource.BasicNewFolderResourceWizard; public class RustPerspective implements IPerspectiveFactory { - public static final String ID = "org.eclipse.redox.rustPerspective"; + public static final String ID = "org.eclipse.corrosion.rustPerspective"; @Override public void createInitialLayout(IPageLayout layout) { diff --git a/org.eclipse.redox/src/org/eclipse/redox/builder/AddCargoBuilder.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/builder/AddCargoBuilder.java similarity index 98% rename from org.eclipse.redox/src/org/eclipse/redox/builder/AddCargoBuilder.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/builder/AddCargoBuilder.java index ee77ef2..934f4ea 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/builder/AddCargoBuilder.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/builder/AddCargoBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.builder; +package org.eclipse.corrosion.builder; import java.util.ArrayList; import java.util.Arrays; diff --git a/org.eclipse.redox/src/org/eclipse/redox/builder/IncrementalCargoBuilder.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/builder/IncrementalCargoBuilder.java similarity index 86% rename from org.eclipse.redox/src/org/eclipse/redox/builder/IncrementalCargoBuilder.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/builder/IncrementalCargoBuilder.java index f8491cd..dc69613 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/builder/IncrementalCargoBuilder.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/builder/IncrementalCargoBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.builder; +package org.eclipse.corrosion.builder; import java.util.Map; @@ -26,12 +26,12 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.redox.RedoxPlugin; -import org.eclipse.redox.RedoxPreferenceInitializer; +import org.eclipse.corrosion.CorrosionPlugin; +import org.eclipse.corrosion.CorrosionPreferenceInitializer; public class IncrementalCargoBuilder extends IncrementalProjectBuilder { - public static final String BUILDER_ID = "org.eclipse.redox.builder.IncrementalCargoBuilder"; + public static final String BUILDER_ID = "org.eclipse.corrosion.builder.IncrementalCargoBuilder"; private static Job buildJob; private static boolean wasCausedByRefresh = false; @@ -53,8 +53,8 @@ protected IProject[] build(int kind, Map args, IProgressMonitor SubMonitor subMonitor = SubMonitor.convert(buildMonitor, 2); subMonitor.worked(1); try { - IPreferenceStore store = RedoxPlugin.getDefault().getPreferenceStore(); - String cargo = store.getString(RedoxPreferenceInitializer.cargoPathPreference); + IPreferenceStore store = CorrosionPlugin.getDefault().getPreferenceStore(); + String cargo = store.getString(CorrosionPreferenceInitializer.cargoPathPreference); String[] commandList = { cargo, "build", "--manifest-path", manifest.toString() }; Process buildProcess = DebugPlugin.exec(commandList, project.getLocation().makeAbsolute().toFile()); while (buildProcess.isAlive() && !subMonitor.isCanceled()) { diff --git a/org.eclipse.redox/src/org/eclipse/redox/builder/RemoveCargoBuilder.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/builder/RemoveCargoBuilder.java similarity index 97% rename from org.eclipse.redox/src/org/eclipse/redox/builder/RemoveCargoBuilder.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/builder/RemoveCargoBuilder.java index eb82daf..fee63b0 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/builder/RemoveCargoBuilder.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/builder/RemoveCargoBuilder.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.builder; +package org.eclipse.corrosion.builder; import java.util.ArrayList; import java.util.Arrays; diff --git a/org.eclipse.redox/src/org/eclipse/redox/builder/TestCargoBuilderEnabled.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/builder/TestCargoBuilderEnabled.java similarity index 96% rename from org.eclipse.redox/src/org/eclipse/redox/builder/TestCargoBuilderEnabled.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/builder/TestCargoBuilderEnabled.java index ad20ec9..b6244bb 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/builder/TestCargoBuilderEnabled.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/builder/TestCargoBuilderEnabled.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.builder; +package org.eclipse.corrosion.builder; import org.eclipse.core.expressions.PropertyTester; import org.eclipse.core.resources.IProject; diff --git a/org.eclipse.redox/src/org/eclipse/redox/debug/RustDebugDelegate.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/RustDebugDelegate.java similarity index 93% rename from org.eclipse.redox/src/org/eclipse/redox/debug/RustDebugDelegate.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/debug/RustDebugDelegate.java index b506073..b9c5236 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/debug/RustDebugDelegate.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/RustDebugDelegate.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.debug; +package org.eclipse.corrosion.debug; import java.io.File; import java.util.ArrayList; @@ -46,21 +46,21 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.redox.RedoxPlugin; -import org.eclipse.redox.RedoxPreferenceInitializer; +import org.eclipse.corrosion.CorrosionPlugin; +import org.eclipse.corrosion.CorrosionPreferenceInitializer; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PlatformUI; public class RustDebugDelegate extends GdbLaunchDelegate implements ILaunchShortcut { - public static final String BUILD_COMMAND_ATTRIBUTE = RedoxPlugin.PLUGIN_ID + "BUILD_COMMAND"; + public static final String BUILD_COMMAND_ATTRIBUTE = CorrosionPlugin.PLUGIN_ID + "BUILD_COMMAND"; @Override public void launch(ILaunchConfiguration config, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { - IPreferenceStore store = RedoxPlugin.getDefault().getPreferenceStore(); - String cargo = store.getString(RedoxPreferenceInitializer.cargoPathPreference); + IPreferenceStore store = CorrosionPlugin.getDefault().getPreferenceStore(); + String cargo = store.getString(CorrosionPreferenceInitializer.cargoPathPreference); String buildCommand = config.getAttribute(BUILD_COMMAND_ATTRIBUTE, ""); File projectLocation = new File( config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, "")); @@ -114,7 +114,7 @@ public void launch(ISelection selection, String mode) { launchConfig.launch(mode, new NullProgressMonitor()); } } catch (CoreException e) { - RedoxPlugin.logError(e); + CorrosionPlugin.logError(e); } return; } @@ -137,7 +137,7 @@ public void launch(IEditorPart editor, String mode) { launchConfig.launch(mode, new NullProgressMonitor()); } } catch (CoreException e) { - RedoxPlugin.logError(e); + CorrosionPlugin.logError(e); } } @@ -181,7 +181,7 @@ protected IPath checkBinaryDetails(ILaunchConfiguration config) throws CoreExcep private ILaunchConfiguration getLaunchConfiguration(String mode, IResource resource) { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType configType = launchManager - .getLaunchConfigurationType("org.eclipse.redox.debug.RustDebugDelegate"); + .getLaunchConfigurationType("org.eclipse.corrosion.debug.RustDebugDelegate"); try { ILaunchConfiguration[] launchConfigurations = launchManager.getLaunchConfigurations(configType); final IProject project = resource.getProject(); @@ -203,7 +203,7 @@ private ILaunchConfiguration getLaunchConfiguration(String mode, IResource resou wc.doSave(); return wc; } catch (CoreException e) { - RedoxPlugin.logError(e); + CorrosionPlugin.logError(e); } return null; } diff --git a/org.eclipse.redox/src/org/eclipse/redox/debug/RustDebugTab.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/RustDebugTab.java similarity index 99% rename from org.eclipse.redox/src/org/eclipse/redox/debug/RustDebugTab.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/debug/RustDebugTab.java index e854a57..5d81c3c 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/debug/RustDebugTab.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/RustDebugTab.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.debug; +package org.eclipse.corrosion.debug; import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter; @@ -25,7 +25,7 @@ import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; import org.eclipse.debug.ui.StringVariableSelectionDialog; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.redox.CargoProjectTester; +import org.eclipse.corrosion.CargoProjectTester; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; diff --git a/org.eclipse.redox/src/org/eclipse/redox/debug/RustDebugTabGroup.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/RustDebugTabGroup.java similarity index 97% rename from org.eclipse.redox/src/org/eclipse/redox/debug/RustDebugTabGroup.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/debug/RustDebugTabGroup.java index 78c2ce8..37fb4f4 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/debug/RustDebugTabGroup.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/RustDebugTabGroup.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.debug; +package org.eclipse.corrosion.debug; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.dsf.gdb.internal.ui.launching.LocalApplicationCDebuggerTab; diff --git a/org.eclipse.redox/src/org/eclipse/redox/debug/SourceLookupDirector.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/SourceLookupDirector.java similarity index 92% rename from org.eclipse.redox/src/org/eclipse/redox/debug/SourceLookupDirector.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/debug/SourceLookupDirector.java index cff6824..d84ee66 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/debug/SourceLookupDirector.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/SourceLookupDirector.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.debug; +package org.eclipse.corrosion.debug; import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector; import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourcePathComputerDelegate; @@ -19,7 +19,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.sourcelookup.ISourceContainer; import org.eclipse.debug.core.sourcelookup.ISourcePathComputer; -import org.eclipse.redox.RedoxPlugin; +import org.eclipse.corrosion.CorrosionPlugin; public class SourceLookupDirector extends CSourceLookupDirector { @Override @@ -40,7 +40,7 @@ public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configura @Override public String getId() { - return RedoxPlugin.PLUGIN_ID + ".SourceLocator"; + return CorrosionPlugin.PLUGIN_ID + ".SourceLocator"; } }; } diff --git a/org.eclipse.redox/src/org/eclipse/redox/debug/ToggleBreakpointAdapter.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/ToggleBreakpointAdapter.java similarity index 99% rename from org.eclipse.redox/src/org/eclipse/redox/debug/ToggleBreakpointAdapter.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/debug/ToggleBreakpointAdapter.java index 9d2b614..cc82052 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/debug/ToggleBreakpointAdapter.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/ToggleBreakpointAdapter.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.debug; +package org.eclipse.corrosion.debug; import java.math.BigInteger; import java.util.HashMap; diff --git a/org.eclipse.redox/src/org/eclipse/redox/debug/ToggleBreakpointsTargetFactory.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/ToggleBreakpointsTargetFactory.java similarity index 92% rename from org.eclipse.redox/src/org/eclipse/redox/debug/ToggleBreakpointsTargetFactory.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/debug/ToggleBreakpointsTargetFactory.java index 23e9d37..4973958 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/debug/ToggleBreakpointsTargetFactory.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/debug/ToggleBreakpointsTargetFactory.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.debug; +package org.eclipse.corrosion.debug; import java.util.Collections; import java.util.Set; @@ -18,14 +18,14 @@ import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget; import org.eclipse.debug.ui.actions.IToggleBreakpointsTargetFactory; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.redox.RedoxPlugin; +import org.eclipse.corrosion.CorrosionPlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.ITextEditor; public class ToggleBreakpointsTargetFactory implements IToggleBreakpointsTargetFactory { - public static final String FACTORY_ID = RedoxPlugin.PLUGIN_ID + "BreakpointFactory"; + public static final String FACTORY_ID = CorrosionPlugin.PLUGIN_ID + "BreakpointFactory"; public ToggleBreakpointsTargetFactory() { } diff --git a/org.eclipse.redox/src/org/eclipse/redox/extensions/Implementations.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/extensions/Implementations.java similarity index 98% rename from org.eclipse.redox/src/org/eclipse/redox/extensions/Implementations.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/extensions/Implementations.java index 1e7aece..08abc4d 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/extensions/Implementations.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/extensions/Implementations.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.extensions; +package org.eclipse.corrosion.extensions; import java.util.Collection; diff --git a/org.eclipse.redox/src/org/eclipse/redox/extensions/ImplementationsSearchQuery.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/extensions/ImplementationsSearchQuery.java similarity index 98% rename from org.eclipse.redox/src/org/eclipse/redox/extensions/ImplementationsSearchQuery.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/extensions/ImplementationsSearchQuery.java index 4558f7e..83a1b5e 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/extensions/ImplementationsSearchQuery.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/extensions/ImplementationsSearchQuery.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.extensions; +package org.eclipse.corrosion.extensions; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -33,7 +33,7 @@ import org.eclipse.lsp4j.ReferenceParams; import org.eclipse.lsp4j.TextDocumentIdentifier; import org.eclipse.osgi.util.NLS; -import org.eclipse.redox.RLSServerInterface; +import org.eclipse.corrosion.RLSServerInterface; import org.eclipse.search.internal.ui.text.FileMatch; import org.eclipse.search.internal.ui.text.FileSearchQuery; import org.eclipse.search.internal.ui.text.FileSearchResult; diff --git a/org.eclipse.redox/src/org/eclipse/redox/run/CargoRunDelegate.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/run/CargoRunDelegate.java similarity index 93% rename from org.eclipse.redox/src/org/eclipse/redox/run/CargoRunDelegate.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/run/CargoRunDelegate.java index 602034a..3ab43ee 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/run/CargoRunDelegate.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/run/CargoRunDelegate.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.run; +package org.eclipse.corrosion.run; import java.util.ArrayList; import java.util.Arrays; @@ -41,8 +41,8 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.redox.RedoxPlugin; -import org.eclipse.redox.RedoxPreferenceInitializer; +import org.eclipse.corrosion.CorrosionPlugin; +import org.eclipse.corrosion.CorrosionPreferenceInitializer; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; @@ -74,7 +74,7 @@ public void launch(ISelection selection, String mode) { launchConfig.launch(mode, new NullProgressMonitor()); } } catch (CoreException e) { - RedoxPlugin.logError(e); + CorrosionPlugin.logError(e); } return; } @@ -97,7 +97,7 @@ public void launch(IEditorPart editor, String mode) { launchConfig.launch(mode, new NullProgressMonitor()); } } catch (CoreException e) { - RedoxPlugin.logError(e); + CorrosionPlugin.logError(e); } } @@ -105,8 +105,8 @@ public void launch(IEditorPart editor, String mode) { public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { List cargoRunCommand = new ArrayList<>(); - IPreferenceStore store = RedoxPlugin.getDefault().getPreferenceStore(); - String cargo = store.getString(RedoxPreferenceInitializer.cargoPathPreference); + IPreferenceStore store = CorrosionPlugin.getDefault().getPreferenceStore(); + String cargo = store.getString(CorrosionPreferenceInitializer.cargoPathPreference); cargoRunCommand.add(cargo); String projectName = configuration.getAttribute(PROJECT_ATTRIBUTE, ""); String runCommand = configuration.getAttribute(RUN_COMMAND_ATTRIBUTE, ""); @@ -160,7 +160,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun private ILaunchConfiguration getLaunchConfiguration(String mode, IResource resource) { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType configType = launchManager - .getLaunchConfigurationType("org.eclipse.redox.run.CargoRunDelegate"); + .getLaunchConfigurationType("org.eclipse.corrosion.run.CargoRunDelegate"); try { ILaunchConfiguration[] launchConfigurations = launchManager.getLaunchConfigurations(configType); final String projectName = resource.getProject().getName(); @@ -175,7 +175,7 @@ private ILaunchConfiguration getLaunchConfiguration(String mode, IResource resou wc.setAttribute("PROJECT", projectName); return wc; } catch (CoreException e) { - RedoxPlugin.logError(e); + CorrosionPlugin.logError(e); } return null; } diff --git a/org.eclipse.redox/src/org/eclipse/redox/run/CargoRunTab.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/run/CargoRunTab.java similarity index 98% rename from org.eclipse.redox/src/org/eclipse/redox/run/CargoRunTab.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/run/CargoRunTab.java index 0544259..c87d702 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/run/CargoRunTab.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/run/CargoRunTab.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.run; +package org.eclipse.corrosion.run; import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter; @@ -22,7 +22,7 @@ import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; import org.eclipse.debug.ui.StringVariableSelectionDialog; import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.redox.CargoProjectTester; +import org.eclipse.corrosion.CargoProjectTester; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; diff --git a/org.eclipse.redox/src/org/eclipse/redox/run/CargoRunTabGroup.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/run/CargoRunTabGroup.java similarity index 96% rename from org.eclipse.redox/src/org/eclipse/redox/run/CargoRunTabGroup.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/run/CargoRunTabGroup.java index ef4eda2..2e08e4e 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/run/CargoRunTabGroup.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/run/CargoRunTabGroup.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.run; +package org.eclipse.corrosion.run; import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup; import org.eclipse.debug.ui.CommonTab; diff --git a/org.eclipse.redox/src/org/eclipse/redox/snippet/Snippet.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/snippet/Snippet.java similarity index 98% rename from org.eclipse.redox/src/org/eclipse/redox/snippet/Snippet.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/snippet/Snippet.java index ad81034..99ce896 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/snippet/Snippet.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/snippet/Snippet.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.snippet; +package org.eclipse.corrosion.snippet; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.contentassist.ICompletionProposal; diff --git a/org.eclipse.redox/src/org/eclipse/redox/snippet/SnippetContentAssistProcessor.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/snippet/SnippetContentAssistProcessor.java similarity index 98% rename from org.eclipse.redox/src/org/eclipse/redox/snippet/SnippetContentAssistProcessor.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/snippet/SnippetContentAssistProcessor.java index 22900fe..68fb6c2 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/snippet/SnippetContentAssistProcessor.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/snippet/SnippetContentAssistProcessor.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.snippet; +package org.eclipse.corrosion.snippet; import java.io.File; import java.io.IOException; @@ -51,7 +51,7 @@ public class SnippetContentAssistProcessor implements IContentAssistProcessor { JsonArray snippetArray = null; JsonParser parser = new JsonParser(); try { - URL url = FileLocator.toFileURL(FileLocator.find(Platform.getBundle("org.eclipse.redox"), + URL url = FileLocator.toFileURL(FileLocator.find(Platform.getBundle("org.eclipse.corrosion"), Path.fromPortableString("snippets/rust.json"), Collections.emptyMap())); StringBuilder snippetsBuilder = new StringBuilder(); Files.readAllLines(new File(url.getFile()).toPath()).forEach(line -> snippetsBuilder.append(line)); diff --git a/org.eclipse.redox/src/org/eclipse/redox/wizards/export/CargoExportWizard.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/export/CargoExportWizard.java similarity index 93% rename from org.eclipse.redox/src/org/eclipse/redox/wizards/export/CargoExportWizard.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/export/CargoExportWizard.java index 3212b7a..5dbc3d2 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/wizards/export/CargoExportWizard.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/export/CargoExportWizard.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.wizards.export; +package org.eclipse.corrosion.wizards.export; import java.io.BufferedReader; import java.io.IOException; @@ -32,8 +32,8 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.redox.RedoxPlugin; -import org.eclipse.redox.RedoxPreferenceInitializer; +import org.eclipse.corrosion.CorrosionPlugin; +import org.eclipse.corrosion.CorrosionPreferenceInitializer; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IExportWizard; import org.eclipse.ui.IWorkbench; @@ -75,8 +75,8 @@ public boolean performFinish() { Boolean noMetadata = wizardPage.noMetadata(); Boolean allowDirty = wizardPage.allowDirty(); - IPreferenceStore store = RedoxPlugin.getDefault().getPreferenceStore(); - String cargo = store.getString(RedoxPreferenceInitializer.cargoPathPreference); + IPreferenceStore store = CorrosionPlugin.getDefault().getPreferenceStore(); + String cargo = store.getString(CorrosionPreferenceInitializer.cargoPathPreference); List exportCommandList = new ArrayList<>(); exportCommandList.add(cargo); diff --git a/org.eclipse.redox/src/org/eclipse/redox/wizards/export/CargoExportWizardPage.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/export/CargoExportWizardPage.java similarity index 94% rename from org.eclipse.redox/src/org/eclipse/redox/wizards/export/CargoExportWizardPage.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/export/CargoExportWizardPage.java index 38f1012..923f131 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/wizards/export/CargoExportWizardPage.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/export/CargoExportWizardPage.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.wizards.export; +package org.eclipse.corrosion.wizards.export; import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter; @@ -25,10 +25,10 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.redox.CargoProjectTester; -import org.eclipse.redox.RedoxPlugin; -import org.eclipse.redox.RedoxPreferenceInitializer; -import org.eclipse.redox.RustManager; +import org.eclipse.corrosion.CargoProjectTester; +import org.eclipse.corrosion.CorrosionPlugin; +import org.eclipse.corrosion.CorrosionPreferenceInitializer; +import org.eclipse.corrosion.RustManager; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; @@ -174,12 +174,12 @@ public void createControl(Composite parent) { setPageComplete(isPageComplete()); } - private IPreferenceStore store = RedoxPlugin.getDefault().getPreferenceStore(); + private IPreferenceStore store = CorrosionPlugin.getDefault().getPreferenceStore(); private static CargoProjectTester tester = new CargoProjectTester(); @Override public boolean isPageComplete() { - File cargo = new File(store.getString(RedoxPreferenceInitializer.cargoPathPreference)); + File cargo = new File(store.getString(CorrosionPreferenceInitializer.cargoPathPreference)); if (!(cargo.exists() && cargo.isFile() && cargo.canExecute())) { setErrorMessage("Cargo command not found. Fix path in the Rust Preferences Page."); return false; diff --git a/org.eclipse.redox/src/org/eclipse/redox/wizards/newCargo/NewCargoProjectWizard.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/newCargo/NewCargoProjectWizard.java similarity index 95% rename from org.eclipse.redox/src/org/eclipse/redox/wizards/newCargo/NewCargoProjectWizard.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/newCargo/NewCargoProjectWizard.java index db5e7c0..c96551c 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/wizards/newCargo/NewCargoProjectWizard.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/newCargo/NewCargoProjectWizard.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.wizards.newCargo; +package org.eclipse.corrosion.wizards.newCargo; import java.io.BufferedReader; import java.io.File; @@ -43,9 +43,9 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.redox.RedoxPlugin; -import org.eclipse.redox.RedoxPreferenceInitializer; -import org.eclipse.redox.builder.IncrementalCargoBuilder; +import org.eclipse.corrosion.CorrosionPlugin; +import org.eclipse.corrosion.CorrosionPreferenceInitializer; +import org.eclipse.corrosion.builder.IncrementalCargoBuilder; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; @@ -57,7 +57,7 @@ public class NewCargoProjectWizard extends Wizard implements INewWizard { private NewCargoProjectWizardPage wizardPage; - public static final String ID = "org.eclipse.redox.wizards.newCargo"; + public static final String ID = "org.eclipse.corrosion.wizards.newCargo"; public NewCargoProjectWizard() { super(); @@ -111,8 +111,8 @@ public boolean performFinish() { Boolean isBin = wizardPage.isBinaryTemplate(); String vcs = wizardPage.getVCS(); - IPreferenceStore store = RedoxPlugin.getDefault().getPreferenceStore(); - String cargo = store.getString(RedoxPreferenceInitializer.cargoPathPreference); + IPreferenceStore store = CorrosionPlugin.getDefault().getPreferenceStore(); + String cargo = store.getString(CorrosionPreferenceInitializer.cargoPathPreference); Boolean makeLocation = !location.exists(); if (makeLocation) { diff --git a/org.eclipse.redox/src/org/eclipse/redox/wizards/newCargo/NewCargoProjectWizardPage.java b/org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/newCargo/NewCargoProjectWizardPage.java similarity index 97% rename from org.eclipse.redox/src/org/eclipse/redox/wizards/newCargo/NewCargoProjectWizardPage.java rename to org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/newCargo/NewCargoProjectWizardPage.java index 87b8126..6057d85 100644 --- a/org.eclipse.redox/src/org/eclipse/redox/wizards/newCargo/NewCargoProjectWizardPage.java +++ b/org.eclipse.corrosion/src/org/eclipse/corrosion/wizards/newCargo/NewCargoProjectWizardPage.java @@ -10,7 +10,7 @@ * Contributors: * Lucas Bullen (Red Hat Inc.) - Initial implementation *******************************************************************************/ -package org.eclipse.redox.wizards.newCargo; +package org.eclipse.corrosion.wizards.newCargo; import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter; @@ -32,8 +32,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.redox.RedoxPlugin; -import org.eclipse.redox.RedoxPreferenceInitializer; +import org.eclipse.corrosion.CorrosionPlugin; +import org.eclipse.corrosion.CorrosionPreferenceInitializer; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; @@ -129,7 +129,7 @@ public void createControl(Composite parent) { } } - private IPreferenceStore store = RedoxPlugin.getDefault().getPreferenceStore(); + private IPreferenceStore store = CorrosionPlugin.getDefault().getPreferenceStore(); @Override public boolean isPageComplete() { @@ -137,7 +137,7 @@ public boolean isPageComplete() { String projectNameError = ""; String cargoError = ""; - File cargo = new File(store.getString(RedoxPreferenceInitializer.cargoPathPreference)); + File cargo = new File(store.getString(CorrosionPreferenceInitializer.cargoPathPreference)); if (!(cargo.exists() && cargo.isFile() && cargo.canExecute())) { cargoError = "Cargo command not found. Fix path in the Rust Preferences Page."; } else if (directory == null || directory.getPath().isEmpty()) { @@ -258,7 +258,7 @@ private void createLocationPart(Composite container) { linkImage = new Image(linkButton.getDisplay(), iconStream); linkButton.setImage(linkImage); } catch (IOException e) { - RedoxPlugin.logError(e); + CorrosionPlugin.logError(e); } linkButton.addSelectionListener(widgetSelectedAdapter(s -> { isDirectoryAndProjectLinked = linkButton.getSelection(); diff --git a/org.eclipse.redox.feature/category.xml b/org.eclipse.redox.feature/category.xml deleted file mode 100644 index 83c2f88..0000000 --- a/org.eclipse.redox.feature/category.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - RedOx enables Rust application development in the Eclipse IDE. - - - diff --git a/pom.xml b/pom.xml index fb04af1..751d187 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - org.eclipse.redox + org.eclipse.corrosion parent 0.1.0-SNAPSHOT pom @@ -11,13 +11,13 @@ 1.0.0 ${tycho-version} - scm:git:https://github.com/lucasbullen/redox.git + scm:git:https://github.com/lucasbullen/corrosion.git target-platform - org.eclipse.redox - org.eclipse.redox.tests + org.eclipse.corrosion + org.eclipse.corrosion.tests @@ -85,7 +85,7 @@ true ${sonar.jacoco.reportPath} - org.eclipse.redox* + org.eclipse.corrosion* diff --git a/site/artifacts.jar b/site/artifacts.jar index 1dac632..95b6870 100644 Binary files a/site/artifacts.jar and b/site/artifacts.jar differ diff --git a/site/content.jar b/site/content.jar index 2610f00..2864538 100644 Binary files a/site/content.jar and b/site/content.jar differ diff --git a/site/features/org.eclipse.redox.feature_0.1.0.201801301640.jar b/site/features/org.eclipse.corrosion.feature_0.1.0.201802080934.jar similarity index 65% rename from site/features/org.eclipse.redox.feature_0.1.0.201801301640.jar rename to site/features/org.eclipse.corrosion.feature_0.1.0.201802080934.jar index 0438137..ccdf935 100644 Binary files a/site/features/org.eclipse.redox.feature_0.1.0.201801301640.jar and b/site/features/org.eclipse.corrosion.feature_0.1.0.201802080934.jar differ diff --git a/site/images/installSoftwareWizard.png b/site/images/installSoftwareWizard.png index 0e67cfa..d5354b4 100644 Binary files a/site/images/installSoftwareWizard.png and b/site/images/installSoftwareWizard.png differ diff --git a/site/index.html b/site/index.html index d8c4c4b..6d52783 100644 --- a/site/index.html +++ b/site/index.html @@ -1,6 +1,6 @@ -

How to install RedOx

+

How to install Eclipse Corrosion

Rust IDE built in Eclipse