Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/angelozerr/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
demonfiddler committed Nov 3, 2015
2 parents f35bc48 + 8332458 commit 4505fc3
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 40 deletions.
2 changes: 1 addition & 1 deletion core/ternjs/node_modules/tern-tabris/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions core/ternjs/node_modules/tern-tabris/tabris.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eclipse/tern.eclipse.ide.server.nodejs.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
point="org.eclipse.ui.preferencePages">
<!-- Tern Global preferences page -->
<page
category="tern.eclipse.ide.preferences"
category="tern.eclipse.ide.ui.preferences.server"
class="tern.eclipse.ide.server.nodejs.internal.ui.preferences.TernNodejsPreferencesPage"
id="tern.eclipse.ide.server.nodejs.preferences"
name="%TernNodejsPreferencesPage.name"/>
Expand Down
1 change: 1 addition & 0 deletions eclipse/tern.eclipse.ide.ui/plugin.properties
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ TernModulesPropertyPage.name=Modules
TernScriptPathsPropertyPage.name=Script Paths
TernDevelopmentPropertyPage.name=Development
TernRepositoryPropertyPage.name=Repository
TernServerPropertyPage.name=Server
TernValidationPropertyPage.name=Validation

# Extension points
Expand Down
4 changes: 4 additions & 0 deletions eclipse/tern.eclipse.ide.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@
category="tern.eclipse.ide.ui.preferences.development"
class="tern.eclipse.ide.internal.ui.preferences.TernRepositoryPreferencesPage"
id="tern.eclipse.ide.ui.preferences.repository" />
<page name="%TernServerPropertyPage.name"
category="tern.eclipse.ide.preferences"
class="tern.eclipse.ide.internal.ui.preferences.TernServerPreferencesPage"
id="tern.eclipse.ide.ui.preferences.server" />
<page name="%TernValidationPropertyPage.name"
category="tern.eclipse.ide.preferences"
class="tern.eclipse.ide.internal.ui.preferences.TernValidationPreferencesPage"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ public final class TernUIMessages extends NLS {
public static String TernGlobalPreferencesPage_desc;

public static String TernGlobalPreferencesPage_disable_async_reqs;
public static String TernGlobalPreferencesPage_serverType;

public static String TernServerPreferencesPage_desc;
public static String TernServerPreferencesPage_serverType;

// Commons Property preferences
public static String EnableProjectSettings;
Expand Down Expand Up @@ -148,6 +150,7 @@ public final class TernUIMessages extends NLS {
public static String refreshOutline;
public static String TernOutline_computing;


private TernUIMessages() {
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ PropertyPreferencePage_02=Select the project to configure:

TernGlobalPreferencesPage_desc=General Settings for using Tern.
TernGlobalPreferencesPage_disable_async_reqs=Disable asynchronous requests to Tern Server?
TernGlobalPreferencesPage_serverType=Tern server type:

TernServerPreferencesPage_desc=Choose your tern server type.
TernServerPreferencesPage_serverType=Tern server type:

############ Properties page

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,12 @@
import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.ComboFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.preferences.ScopedPreferenceStore;

import tern.eclipse.ide.core.ITernServerType;
import tern.eclipse.ide.core.TernCorePlugin;
import tern.eclipse.ide.core.preferences.TernCorePreferenceConstants;
import tern.eclipse.ide.internal.ui.TernUIMessages;
Expand All @@ -31,41 +28,19 @@
* Tern Global preferences page.
*
*/
public class TernGlobalPreferencesPage extends FieldEditorPreferencePage
implements IWorkbenchPreferencePage {
public class TernGlobalPreferencesPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {

public TernGlobalPreferencesPage() {
super(GRID);
setDescription(TernUIMessages.TernGlobalPreferencesPage_desc);
setImageDescriptor(ImageResource
.getImageDescriptor(ImageResource.IMG_LOGO));
setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_LOGO));
}

@Override
protected void createFieldEditors() {

// Tern Server type combo
ITernServerType[] serverTypes = TernCorePlugin
.getTernServerTypeManager().getTernServerTypes();
String[][] types = new String[serverTypes.length + 1][2];
types[0][0] = " -- Choose your server type --"; //$NON-NLS-1$
types[0][1] = ""; //$NON-NLS-1$

for (int i = 0; i < serverTypes.length; i++) {
types[i + 1][0] = serverTypes[i].getName();
types[i + 1][1] = serverTypes[i].getId();
}

ComboFieldEditor ternServerEditor = new ComboFieldEditor(
TernCorePreferenceConstants.TERN_SERVER_TYPE,
TernUIMessages.TernGlobalPreferencesPage_serverType, types,
getFieldEditorParent());
addField(ternServerEditor);

BooleanFieldEditor asyncRequestsEditor = new BooleanFieldEditor(
TernCorePreferenceConstants.DISABLE_ASYNC_REQUESTS,
TernUIMessages.TernGlobalPreferencesPage_disable_async_reqs,
getFieldEditorParent());
TernUIMessages.TernGlobalPreferencesPage_disable_async_reqs, getFieldEditorParent());
addField(asyncRequestsEditor);
}

Expand Down Expand Up @@ -95,10 +70,4 @@ protected IPreferenceStore doGetPreferenceStore() {

}

@Override
public void propertyChange(PropertyChangeEvent event) {
super.propertyChange(event);
TernCorePlugin.getTernServerTypeManager().refresh();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/**
* Copyright (c) 2013-2015 Angelo ZERR.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Angelo Zerr <angelo.zerr@gmail.com> - initial API and implementation
*/
package tern.eclipse.ide.internal.ui.preferences;

import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.preference.ComboFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.preferences.ScopedPreferenceStore;

import tern.eclipse.ide.core.ITernServerType;
import tern.eclipse.ide.core.TernCorePlugin;
import tern.eclipse.ide.core.preferences.TernCorePreferenceConstants;
import tern.eclipse.ide.internal.ui.TernUIMessages;
import tern.eclipse.ide.ui.ImageResource;

/**
* Tern Server preferences page.
*
*/
public class TernServerPreferencesPage extends FieldEditorPreferencePage
implements IWorkbenchPreferencePage {

public TernServerPreferencesPage() {
super(GRID);
setDescription(TernUIMessages.TernServerPreferencesPage_desc);
setImageDescriptor(ImageResource
.getImageDescriptor(ImageResource.IMG_LOGO));
}

@Override
protected void createFieldEditors() {

// Tern Server type combo
ITernServerType[] serverTypes = TernCorePlugin
.getTernServerTypeManager().getTernServerTypes();
String[][] types = new String[serverTypes.length + 1][2];
types[0][0] = " -- Choose your server type --"; //$NON-NLS-1$
types[0][1] = ""; //$NON-NLS-1$

for (int i = 0; i < serverTypes.length; i++) {
types[i + 1][0] = serverTypes[i].getName();
types[i + 1][1] = serverTypes[i].getId();
}

ComboFieldEditor ternServerEditor = new ComboFieldEditor(
TernCorePreferenceConstants.TERN_SERVER_TYPE,
TernUIMessages.TernServerPreferencesPage_serverType, types,
getFieldEditorParent());
addField(ternServerEditor);
}

@Override
public void init(IWorkbench workbench) {

}

@Override
protected IPreferenceStore doGetPreferenceStore() {
// IProject project = getProject();
// ScopedPreferenceStore store;
// if (project == null) {
// // workspace settings
// IScopeContext scope = new InstanceScope();
// return new ScopedPreferenceStore(scope, TernCorePlugin.PLUGIN_ID);
// } else {
// // project settings
// IScopeContext projectScope = new ProjectScope(project);
// preferences = projectScope.getNode(TernCorePlugin.PLUGIN_ID);
// store = new ScopedPreferenceStore(projectScope,
// TernCorePlugin.PLUGIN_ID);
// }
// return store;
IScopeContext scope = new InstanceScope();
return new ScopedPreferenceStore(scope, TernCorePlugin.PLUGIN_ID);

}

@Override
public void propertyChange(PropertyChangeEvent event) {
super.propertyChange(event);
TernCorePlugin.getTernServerTypeManager().refresh();
}

}

0 comments on commit 4505fc3

Please sign in to comment.