Fix tycho warnings.

Localization missing and encoding not explicit. Change-Id: I6fc5af51430631f13afc1b881180e40ecaba1b6d Signed-off-by: Alexander Kurtakov <[email protected]>
ruspl-afed · May 15, 2018 · 271bb35 · 271bb35
1 parent 0471b59
commit 271bb35
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 27 deletions.
diff --git a/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF b/org.eclipse.corrosion.tests/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests for Corrosion
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.corrosion.tests;singleton:=true
 Bundle-Version: 0.1.0.qualifier
-Bundle-Vendor: Red Hat Inc.
+Bundle-Vendor: %Bundle-Vendor
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.corrosion.tests
 Require-Bundle: org.eclipse.corrosion;bundle-version="0.1.0",

diff --git a/org.eclipse.corrosion.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.corrosion.tests/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.corrosion.tests
+Bundle-Vendor = Eclipse Corrosion
+Bundle-Name = Tests for Corrosion
diff --git a/org.eclipse.corrosion.tests/build.properties b/org.eclipse.corrosion.tests/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = target/classes/
 bin.includes = META-INF/,\
                projects/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
diff --git a/org.eclipse.corrosion/META-INF/MANIFEST.MF b/org.eclipse.corrosion/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Rust edition in Eclipse IDE
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.corrosion;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Automatic-Module-Name: org.eclipse.corrosion
 Bundle-Activator: org.eclipse.corrosion.CorrosionPlugin
-Bundle-Vendor: Red Hat Inc.
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.contenttype,
  org.eclipse.ui.genericeditor;bundle-version="1.0.1",
  org.eclipse.ui,

diff --git a/org.eclipse.corrosion/OSGI-INF/l10n/bundle.properties b/org.eclipse.corrosion/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,24 @@
+#Properties file for org.eclipse.corrosion
+Bundle-Vendor = Eclipse Corrosion
+Bundle-Name = Rust edition in Eclipse IDE
+content-type.name = Rust project file
+content-type.name.0 = Cargo manifest file
+page.name = Rust
+page.name.0 = Text Editor
+category.name = Rust
+wizard.name = Cargo project
+wizard.name.0 = Rust Crate Packager
+wizard.description = A wizard to assist with packaging Cargo based Rust projects into crates
+launchConfigurationType.name = Cargo Based Rust Project
+launchConfigurationType.name.0 = Cargo Based Rust Test
+launchConfigurationType.name.1 = Rust
+shortcut.label = Cargo Based Rust Project
+shortcut.label.0 = Cargo Based Rust Test
+shortcut.label.1 = Rust Project
+sourceLocator.name = Source Locator
+extension.name = Cargo Builder
+command.name = Add Cargo Builder
+command.name.0 = Remove Cargo Builder
+command.name.1 = Implementations
+perspective.name = Rust
+action.label = Toggle Breakpoint
diff --git a/org.eclipse.corrosion/build.properties b/org.eclipse.corrosion/build.properties
@@ -7,4 +7,6 @@ bin.includes = META-INF/,\
                icons/,\
                images/,\
                scripts/,\
-               snippets/
+               snippets/,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
diff --git a/org.eclipse.corrosion/plugin.xml b/org.eclipse.corrosion/plugin.xml
@@ -7,14 +7,14 @@
             base-type="org.eclipse.core.runtime.text"
             file-extensions="rs"
             id="org.eclipse.corrosion.rust"
-            name="Rust project file"
+            name="%content-type.name"
             priority="normal">
       </content-type>
       <content-type
             base-type="org.eclipse.core.runtime.text"
             file-names="Cargo.toml"
             id="org.eclipse.corrosion.manifest"
-            name="Cargo manifest file"
+            name="%content-type.name.0"
             priority="normal">
       </content-type>
    </extension>
@@ -87,13 +87,13 @@
       <page
             class="org.eclipse.corrosion.CorrosionPreferencePage"
             id="org.eclipse.corrosion.preferencePage"
-            name="Rust">
+            name="%page.name">
       </page>
       <page
             category="org.eclipse.corrosion.preferencePage"
             class="org.eclipse.corrosion.TextEditorPreferencePage"
             id="org.eclipse.corrosion.texteditor"
-            name="Text Editor">
+            name="%page.name.0">
       </page>
    </extension>
    <extension
@@ -115,26 +115,26 @@
          point="org.eclipse.ui.newWizards">
       <category
             id="org.eclipse.corrosion.rust"
-            name="Rust">
+            name="%category.name">
       </category>
       <wizard
             category="org.eclipse.corrosion.rust"
             class="org.eclipse.corrosion.wizards.newCargo.NewCargoProjectWizard"
             icon="icons/cargo.png"
             id="org.eclipse.corrosion.wizards.newCargo"
-            name="Cargo project"
+            name="%wizard.name"
             project="true">
       </wizard>
    </extension>
    <extension
          point="org.eclipse.ui.exportWizards">
       <wizard
             id="org.eclipse.corrosion.wizards.export"
-            name="Rust Crate Packager"
+            name="%wizard.name.0"
             class="org.eclipse.corrosion.wizards.export.CargoExportWizard"
             icon="icons/cargo.png">
          <description>
-            A wizard to assist with packaging Cargo based Rust projects into crates
+            %wizard.description
          </description>
          <selection class="org.eclipse.core.resources.IResource"/>
       </wizard>
@@ -147,19 +147,19 @@
             delegate="org.eclipse.corrosion.run.CargoRunDelegate"
             id="org.eclipse.corrosion.run.CargoRunDelegate"
             modes="run"
-            name="Cargo Based Rust Project">
+            name="%launchConfigurationType.name">
       </launchConfigurationType>
       <launchConfigurationType
             delegate="org.eclipse.corrosion.test.CargoTestDelegate"
             id="org.eclipse.corrosion.test.CargoTestDelegate"
             modes="run"
-            name="Cargo Based Rust Test">
+            name="%launchConfigurationType.name.0">
       </launchConfigurationType>
       <launchConfigurationType
             delegate="org.eclipse.corrosion.debug.RustDebugDelegate"
             id="org.eclipse.corrosion.debug.RustDebugDelegate"
             modes="debug"
-            name="Rust"
+            name="%launchConfigurationType.name.1"
             public="true"
             sourceLocatorId="com.eclipse.corrosion.debug.SourceLocator">
       </launchConfigurationType>
@@ -212,7 +212,7 @@
       <shortcut
             id="org.eclipse.corrosion.run.Shortcut"
             class="org.eclipse.corrosion.run.CargoRunDelegate"
-            label="Cargo Based Rust Project"
+            label="%shortcut.label"
             icon="icons/cargo.png"
             modes="run">
          <contextualLaunch>
@@ -224,7 +224,7 @@
       <shortcut
             id="org.eclipse.corrosion.test.Shortcut"
             class="org.eclipse.corrosion.test.CargoTestDelegate"
-            label="Cargo Based Rust Test"
+            label="%shortcut.label.0"
             icon="icons/cargo.png"
             modes="run">
          <contextualLaunch>
@@ -237,7 +237,7 @@
             class="org.eclipse.corrosion.debug.RustDebugDelegate"
             icon="icons/rust.png"
             id="org.eclipse.corrosion.debug.Shortcut"
-            label="Rust Project"
+            label="%shortcut.label.1"
             modes="debug">
          <contextualLaunch>
             <enablement>
@@ -251,14 +251,14 @@
       <sourceLocator
             class="org.eclipse.corrosion.debug.SourceLookupDirector"
             id="com.eclipse.corrosion.debug.SourceLocator"
-            name="Source Locator">
+            name="%sourceLocator.name">
       </sourceLocator>
    </extension>
 
 <!-- INCREMENTAL BUILD PROCESS -->
    <extension
          id="org.eclipse.corrosion.builder.IncrementalCargoBuilder"
-         name="Cargo Builder"
+         name="%extension.name"
          point="org.eclipse.core.resources.builders">
       <builder>
          <run class="org.eclipse.corrosion.builder.IncrementalCargoBuilder"/>
@@ -317,18 +317,18 @@
           point="org.eclipse.ui.commands">
       <command
             defaultHandler="org.eclipse.corrosion.builder.AddCargoBuilder"
-            name="Add Cargo Builder"
+            name="%command.name"
             id="org.eclipse.corrosion.builder.AddCargoBuilder">
       </command>
       <command
             defaultHandler="org.eclipse.corrosion.builder.RemoveCargoBuilder"
             id="org.eclipse.corrosion.builder.RemoveCargoBuilder"
-            name="Remove Cargo Builder">
+            name="%command.name.0">
       </command>
       <command
             categoryId="org.eclipse.lsp4e.category"
             id="org.eclipse.corrosion.commands.Implementations"
-            name="Implementations">
+            name="%command.name.1">
       </command>
    </extension>
    <extension
@@ -364,7 +364,7 @@
         point="org.eclipse.ui.perspectives">
         <perspective
             id="org.eclipse.corrosion.rustPerspective"
-            name="Rust"
+            name="%perspective.name"
             class="org.eclipse.corrosion.RustPerspective"
             icon="icons/rust.png">
         </perspective> 
@@ -386,7 +386,7 @@
                actionID="RulerDoubleClick"
                class="org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate"
                id="Editor.rulerDoubleClickAction"
-               label="Toggle Breakpoint">
+               label="%action.label">
          </action>
       </editorContribution>
    </extension>

diff --git a/pom.xml b/pom.xml
@@ -12,6 +12,7 @@
 		<tycho-version>1.1.0</tycho-version>
 		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<tycho.scmUrl>scm:git:https://github.com/eclipse/corrosion.git</tycho.scmUrl>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
 	<modules>