SDK:
- update settings import for new base platform git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10667 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67
parent
71d30aa37b
commit
f38285442d
@ -63,7 +63,6 @@ import javax.swing.KeyStroke;
|
||||
import org.netbeans.util.Util;
|
||||
import org.openide.util.NbBundle;
|
||||
import org.openide.util.Utilities;
|
||||
|
||||
/**
|
||||
* Displays LicensePanel to user. User must accept license to continue.
|
||||
* if user does not accept license UserCancelException is thrown.
|
||||
|
||||
@ -49,7 +49,6 @@ import java.net.URL;
|
||||
import java.util.Arrays;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
import javax.swing.JDialog;
|
||||
import javax.swing.JOptionPane;
|
||||
@ -61,7 +60,6 @@ import org.openide.filesystems.LocalFileSystem;
|
||||
import org.openide.filesystems.MultiFileSystem;
|
||||
import org.openide.filesystems.XMLFileSystem;
|
||||
import org.openide.modules.InstalledFileLocator;
|
||||
import org.openide.util.Exceptions;
|
||||
import org.openide.util.NbBundle;
|
||||
import org.openide.util.Utilities;
|
||||
import org.xml.sax.SAXException;
|
||||
@ -114,14 +112,13 @@ public final class AutoUpgrade {
|
||||
|
||||
// the order of VERSION_TO_CHECK here defines the precedence of imports
|
||||
// the first one will be choosen for import
|
||||
//normen
|
||||
final static private List<String> VERSION_TO_CHECK =
|
||||
Arrays.asList (new String[] {".jmonkeyplatform/3.0Beta", ".jmonkeyplatform/3.0RC2" });//".netbeans/7.1.2", ".netbeans/7.1.1", ".netbeans/7.1", ".netbeans/7.0", ".netbeans/6.9" });//NOI18N
|
||||
Arrays.asList (new String[] {".jmonkeyplatform/3.0Beta", ".jmonkeyplatform/3.0RC2", ".jmonkeyplatform/3.0RC3" });//".netbeans/7.1.2", ".netbeans/7.1.1", ".netbeans/7.1", ".netbeans/7.0", ".netbeans/6.9" });//NOI18N
|
||||
// Arrays.asList (new String[] {"build/3.0RC2", ".netbeans/7.1.1", ".netbeans/7.1", ".netbeans/7.0", ".netbeans/6.9" });//NOI18N
|
||||
|
||||
// userdir on OS specific root of userdir (see issue 196075)
|
||||
static final List<String> NEWER_VERSION_TO_CHECK =
|
||||
Arrays.asList ("3.0RC2", "3.0Beta"/*7.2, ..."*/); //NOI18N
|
||||
Arrays.asList ("3.0RC3", "3.0RC2", "3.0Beta"/*7.2, ..."*/); //NOI18N
|
||||
|
||||
|
||||
private static File checkPreviousOnOsSpecificPlace (final List<String> versionsToCheck) {
|
||||
@ -140,7 +137,6 @@ public final class AutoUpgrade {
|
||||
File userHomeFile = new File (defaultUserdirRoot);
|
||||
for (String ver : versionsToCheck) {
|
||||
sourceFolder = new File (userHomeFile.getAbsolutePath (), ver);
|
||||
LOGGER.log(Level.INFO, "Look for {0} ", userHomeFile);
|
||||
if (sourceFolder.exists () && sourceFolder.isDirectory ()) {
|
||||
return sourceFolder;
|
||||
}
|
||||
@ -160,7 +156,7 @@ public final class AutoUpgrade {
|
||||
while (it.hasNext () && sourceFolder == null) {
|
||||
ver = it.next ();
|
||||
sourceFolder = new File (userHomeFile.getAbsolutePath (), ver);
|
||||
LOGGER.log(Level.INFO, "Look for previous {0} ", userHomeFile);
|
||||
|
||||
if (sourceFolder.isDirectory ()) {
|
||||
break;
|
||||
}
|
||||
@ -307,6 +303,7 @@ public final class AutoUpgrade {
|
||||
private static void copyToUserdir(File source) throws IOException, PropertyVetoException {
|
||||
File userdir = new File(System.getProperty("netbeans.user", "")); // NOI18N
|
||||
File netBeansDir = InstalledFileLocator.getDefault().locate("modules", null, false).getParentFile().getParentFile(); //NOI18N
|
||||
//normen
|
||||
File importFile = new File(netBeansDir, "etc/jmonkeyplatform.import"); //NOI18N
|
||||
LOGGER.fine("Import file: " + importFile);
|
||||
LOGGER.info("Importing from " + source + " to " + userdir); // NOI18N
|
||||
|
||||
@ -67,6 +67,12 @@ import org.openide.util.EditableProperties;
|
||||
* @author Jiri Skrivanek
|
||||
*/
|
||||
final class CopyFiles extends Object {
|
||||
|
||||
//>>> hack for http://netbeans.org/bugzilla/show_bug.cgi?id=218976
|
||||
private static final String CSSSP = "config/Editors/text/";
|
||||
private static final String ORIG_CSSSP = CSSSP + "x-css";
|
||||
private static final String TARG_CSSSP = CSSSP + "css";
|
||||
//<<<eof
|
||||
|
||||
private File sourceRoot;
|
||||
private File targetRoot;
|
||||
@ -186,6 +192,10 @@ final class CopyFiles extends Object {
|
||||
// nothing matches
|
||||
return;
|
||||
}
|
||||
|
||||
//>>> hack for http://netbeans.org/bugzilla/show_bug.cgi?id=218976
|
||||
if(relativePath.startsWith(ORIG_CSSSP)) { relativePath = TARG_CSSSP + relativePath.substring(ORIG_CSSSP.length()); }
|
||||
//<<<
|
||||
|
||||
File targetFile = new File(targetRoot, relativePath);
|
||||
LOGGER.log(Level.FINE, "Path: {0}", relativePath); //NOI18N
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
#org.apache.tools.ant.module OptionsExport/Advanced/AntShortcuts
|
||||
include config/(Actions/Build/.*[.]xml|(Menu|Toolbars|Shortcuts)/.*[.]shadow)
|
||||
#org.netbeans.modules.db OptionsExport/Advanced/Databases
|
||||
include config/Databases/.*
|
||||
#org.netbeans.api.debugger OptionsExport/Advanced/Debugger
|
||||
@ -10,8 +8,6 @@ include config/Services/DiffProviders/.*
|
||||
include config/Favorites/.*
|
||||
#org.netbeans.core.ui OptionsExport/Advanced/Files
|
||||
include config/Preferences/org/netbeans/core[.]properties|config/Services/MIMEResolver/.*
|
||||
#org.netbeans.modules.form OptionsExport/Advanced/Form
|
||||
include config/FormDesignerPalette/.*|config/Services/formsettings[.]settings
|
||||
#org.netbeans.modules.html OptionsExport/Advanced/HTMLPalette
|
||||
include config/HTMLPalette/.*
|
||||
#org.netbeans.modules.j2eeserver OptionsExport/Advanced/J2EE
|
||||
@ -20,8 +16,6 @@ include config/(J2EE|GlassFish|GlassFishEE6|GlassFishEE6WC)/.*
|
||||
include config/JSPPalette/.*
|
||||
#org.netbeans.modules.java.platform OptionsExport/Advanced/JavaPlatform
|
||||
include config/Services/Platforms/org-netbeans-api-java-Platform/.*\.xml
|
||||
#org.netbeans.modules.maven OptionsExport/Advanced/Maven
|
||||
include config/(Preferences/org/netbeans/modules/maven([.]properties|/(?!externalOwners[.]properties).*)|Projects/org-netbeans-modules-maven/nbactions[.]xml)
|
||||
#org.netbeans.modules.project.libraries OptionsExport/Advanced/ProjectLibraries
|
||||
exclude build[.]properties#nbplatform[.]default[.]netbeans[.]dest[.]dir
|
||||
include config/org-netbeans-api-project-libraries/Libraries/.*\.xml|build[.]properties#nbplatform[.].+[.].+|var[.].*
|
||||
@ -30,6 +24,8 @@ exclude config/Toolbars/Progress/.*
|
||||
include config/Toolbars/.*
|
||||
#org.netbeans.modules.versioning.ui OptionsExport/Advanced/VersioningHistory
|
||||
include var/filehistory/.*|config/Preferences/org/netbeans/modules/versioning/ui/history[.]properties
|
||||
#org.netbeans.core.output2 OptionsExport/Advanced/outputOptions
|
||||
include config/Preferences/org/netbeans/core/output2.properties
|
||||
#org.netbeans.modules.cnd.editor OptionsExport/CND/BuildTools
|
||||
include config/Preferences/org/netbeans/modules/cnd\.properties|config/Preferences/org/netbeans/modules/cnd/toolchain\.properties
|
||||
#org.netbeans.modules.cnd.editor OptionsExport/CND/CodeAssistance
|
||||
@ -58,6 +54,10 @@ include config/Editors/(?!.*(Macros|CodeTemplates|FontsColors)).+|config/.nbattr
|
||||
include config/Editors/AnnotationTypes/.*
|
||||
#org.netbeans.modules.options.editor OptionsExport/FontsAndColors/FontsAndColors
|
||||
include config/Editors.*/FontsColors/([^/]*)/.*|config/.nbattrs
|
||||
#org.netbeans.modules.options.editor OptionsExport/Formatting/Indentation
|
||||
include config/Editors/Preferences/org-netbeans-modules-editor-settings-CustomPreferences.xml
|
||||
#org.netbeans.modules.java.source OptionsExport/Formatting/Java
|
||||
include config/Editors/text/x-java/Preferences/org-netbeans-modules-editor-settings-CustomPreferences.xml
|
||||
#org.netbeans.core.ui OptionsExport/General/General
|
||||
include config/Preferences/org/netbeans/core[.]properties|config/Services/Browsers/.*
|
||||
#org.netbeans.core.ui OptionsExport/General/Other
|
||||
@ -65,6 +65,12 @@ include config/Preferences/.*
|
||||
#org.netbeans.modules.welcome OptionsExport/General/Welcome
|
||||
exclude config/Preferences/org/netbeans/modules/welcome[.]properties!feedback.*
|
||||
include config/Preferences/org/netbeans/modules/welcome[.]properties
|
||||
#org.apache.tools.ant.module OptionsExport/Java/AntShortcuts
|
||||
include config/(Actions/Build/.*[.]xml|(Menu|Toolbars|Shortcuts)/.*[.]shadow)
|
||||
#org.netbeans.modules.form OptionsExport/Java/Form
|
||||
include config/FormDesignerPalette/.*|config/Services/formsettings[.]settings
|
||||
#org.netbeans.modules.maven OptionsExport/Java/Maven
|
||||
include config/(Preferences/org/netbeans/modules/maven([.]properties|/(?!externalOwners[.]properties).*)|Projects/org-netbeans-modules-maven/nbactions[.]xml)
|
||||
#org.netbeans.modules.options.keymap OptionsExport/Keymaps/Profiles
|
||||
include config/Keymaps/([^/]*)/.*|config/Shortcuts/.*|config/Editors/Keybindings/.*|config/.nbattrs
|
||||
#org.netbeans.modules.keyring OptionsExport/Keyring/Passwords
|
||||
@ -73,6 +79,8 @@ include config/Preferences/org/netbeans/modules/keyring.*
|
||||
include config/Preferences/org/netbeans/modules/php/project/annotations.properties
|
||||
#org.netbeans.modules.php.apigen OptionsExport/PHP/ApiGen
|
||||
include config/Preferences/org/netbeans/modules/php/apigen/apigen.properties
|
||||
#org.netbeans.modules.php.composer OptionsExport/PHP/Composer
|
||||
include config/Preferences/org/netbeans/modules/php/composer/composer.properties
|
||||
#org.netbeans.modules.php.doctrine2 OptionsExport/PHP/Doctrine2
|
||||
include config/Preferences/org/netbeans/modules/php/doctrine2/doctrine2.properties
|
||||
#org.netbeans.modules.php.project OptionsExport/PHP/General
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user