Skip to content

Commit afc239b

Browse files
alirana01alirana01
committed
fixes after merge
1 parent 0b29ef2 commit afc239b

File tree

3 files changed

+0
-65
lines changed

3 files changed

+0
-65
lines changed

‎bundles/com.espressif.idf.core/src/com/espressif/idf/core/IDFCorePreferenceConstants.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@ public class IDFCorePreferenceConstants
2929
public static final boolean CMAKE_CCACHE_DEFAULT_STATUS = true;
3030
public static final boolean AUTOMATE_BUILD_HINTS_DEFAULT_STATUS = true;
3131
public static final boolean HIDE_ERRORS_IDF_COMPONENTS_DEFAULT_STATUS = true;
32-
public static final String IDF_GITHUB_ASSETS = "IDF_GITHUB_ASSETS"; //$NON-NLS-1$
33-
public static final String IDF_GITHUB_ASSETS_DEFAULT_GLOBAL = "dl.espressif.com/github_assets"; //$NON-NLS-1$
34-
public static final String IDF_GITHUB_ASSETS_DEFAULT_CHINA = "dl.espressif.cn/github_assets"; //$NON-NLS-1$
35-
public static final String PIP_EXTRA_INDEX_URL = "PIP_EXTRA_INDEX_URL"; //$NON-NLS-1$
36-
public static final String PIP_EXTRA_INDEX_URL_DEFAULT_GLOBAL = "https://dl.espressif.com/pypi"; //$NON-NLS-1$
37-
public static final String PIP_EXTRA_INDEX_URL_DEFAULT_CHINA = "https://dl.espressif.cn/pypi"; //$NON-NLS-1$
38-
public static final String IDF_TOOLS_PATH = "IDF_TOOLS_PATH"; //$NON-NLS-1$
39-
public static final String IDF_TOOLS_PATH_DEFAULT = Platform.getOS().equals(Platform.OS_WIN32)
40-
? IDFUtil.resolveEnvVariable("%USERPROFILE%\\.espressif") //$NON-NLS-1$
41-
: IDFUtil.resolveEnvVariable("$HOME/.espressif"); //$NON-NLS-1$
4232

4333
/**
4434
* Returns the node in the preference in the given context.

‎bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/preferences/EspresssifPreferencesPage.java‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.espressif.idf.core.IDFCorePlugin;
2020
import com.espressif.idf.core.IDFCorePreferenceConstants;
2121
import com.espressif.idf.core.logging.Logger;
22-
import com.espressif.idf.core.util.StringUtil;
2322

2423
public class EspresssifPreferencesPage extends PreferencePage implements IWorkbenchPreferencePage
2524
{
@@ -76,8 +75,6 @@ protected Control createContents(Composite parent)
7675

7776
addBuildSettings(mainComposite);
7877

79-
addToolsInstallationSettings(mainComposite);
80-
8178
addClangdSettings(mainComposite);
8279
return mainComposite;
8380
}
@@ -96,42 +93,6 @@ private void addClangdSettings(Composite mainComposite)
9693
.setSelection(getPreferenceStore().getBoolean(IDFCorePreferenceConstants.AUTOMATE_CLANGD_FORMAT_FILE));
9794
}
9895

99-
private void addToolsInstallationSettings(Composite mainComposite)
100-
{
101-
Group toolsInstallationGroup = new Group(mainComposite, SWT.SHADOW_ETCHED_IN);
102-
toolsInstallationGroup.setText(Messages.EspressifPreferencesPage_ToolsInstallationGrpTxt);
103-
toolsInstallationGroup.setLayout(new GridLayout(3, false));
104-
105-
Label githubAssetsLabel = new Label(toolsInstallationGroup, SWT.NONE);
106-
githubAssetsLabel.setText(Messages.EspressifPreferencesPage_ToolsInstallationGitAssetUrlLabel);
107-
gitAssetsCombo = new Combo(toolsInstallationGroup, SWT.DROP_DOWN | SWT.BORDER);
108-
gitAssetsCombo.setItems(IDFCorePreferenceConstants.IDF_GITHUB_ASSETS_DEFAULT_GLOBAL,
109-
IDFCorePreferenceConstants.IDF_GITHUB_ASSETS_DEFAULT_CHINA);
110-
gitAssetsCombo.select(0);
111-
112-
Label pythonWheelsLabel = new Label(toolsInstallationGroup, SWT.NONE);
113-
pythonWheelsLabel.setText(Messages.EspressifPreferencesPage_ToolsInstallationPythonPyWheelUrlLabel);
114-
pythonWheelCombo = new Combo(toolsInstallationGroup, SWT.DROP_DOWN | SWT.BORDER);
115-
pythonWheelCombo.setItems(IDFCorePreferenceConstants.PIP_EXTRA_INDEX_URL_DEFAULT_GLOBAL,
116-
IDFCorePreferenceConstants.PIP_EXTRA_INDEX_URL_DEFAULT_CHINA);
117-
pythonWheelCombo.select(0);
118-
119-
GridData gitTextGridData = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
120-
gitTextGridData.widthHint = 200;
121-
GridData pythonTextGridData = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
122-
pythonTextGridData.widthHint = 200;
123-
gitAssetsCombo.setLayoutData(gitTextGridData);
124-
pythonWheelCombo.setLayoutData(pythonTextGridData);
125-
126-
String gitUrl = getPreferenceStore().getString(IDFCorePreferenceConstants.IDF_GITHUB_ASSETS);
127-
String pyWheelUrl = getPreferenceStore().getString(IDFCorePreferenceConstants.PIP_EXTRA_INDEX_URL);
128-
gitUrl = StringUtil.isEmpty(gitUrl) ? gitAssetsCombo.getItem(0) : gitUrl;
129-
pyWheelUrl = StringUtil.isEmpty(pyWheelUrl) ? pythonWheelCombo.getItem(0) : pyWheelUrl;
130-
131-
gitAssetsCombo.setText(gitUrl);
132-
pythonWheelCombo.setText(pyWheelUrl);
133-
}
134-
13596
private void addBuildSettings(Composite mainComposite)
13697
{
13798
Group buildGroup = new Group(mainComposite, SWT.SHADOW_ETCHED_IN);
@@ -232,10 +193,6 @@ public boolean performOk()
232193
IDFCorePlugin.ERROR_MARKER_LISTENER.initialMarkerCleanup();
233194
}
234195

235-
getPreferenceStore().setValue(IDFCorePreferenceConstants.IDF_GITHUB_ASSETS, gitAssetsCombo.getText());
236-
237-
getPreferenceStore().setValue(IDFCorePreferenceConstants.PIP_EXTRA_INDEX_URL, pythonWheelCombo.getText());
238-
239196
getPreferenceStore().setValue(IDFCorePreferenceConstants.AUTOMATE_CLANGD_FORMAT_FILE,
240197
automateClangdFormatCreationBtn.getSelection());
241198
}

‎bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/AbstractToolsHandler.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616
import org.eclipse.core.runtime.IProgressMonitor;
1717
import org.eclipse.core.runtime.IStatus;
1818
import org.eclipse.core.runtime.Path;
19-
import org.eclipse.core.runtime.Platform;
2019
import org.eclipse.core.runtime.Status;
2120
import org.eclipse.core.runtime.jobs.Job;
2221
import org.eclipse.jface.window.Window;
2322
import org.eclipse.swt.widgets.Display;
2423
import org.eclipse.ui.console.MessageConsoleStream;
2524

2625
import com.espressif.idf.core.IDFCorePlugin;
27-
import com.espressif.idf.core.IDFCorePreferenceConstants;
2826
import com.espressif.idf.core.IDFEnvironmentVariables;
2927
import com.espressif.idf.core.ProcessBuilderFactory;
3028
import com.espressif.idf.core.SystemExecutableFinder;
@@ -147,16 +145,6 @@ protected IStatus runCommand(List<String> arguments, MessageConsoleStream consol
147145
Logger.log(environment.toString());
148146
environment.put("PYTHONUNBUFFERED", "1"); //$NON-NLS-1$ //$NON-NLS-2$
149147

150-
environment.put("IDF_GITHUB_ASSETS", //$NON-NLS-1$
151-
Platform.getPreferencesService().getString(IDFCorePlugin.PLUGIN_ID,
152-
IDFCorePreferenceConstants.IDF_GITHUB_ASSETS,
153-
IDFCorePreferenceConstants.IDF_GITHUB_ASSETS_DEFAULT_GLOBAL, null));
154-
155-
environment.put("PIP_EXTRA_INDEX_URL", //$NON-NLS-1$
156-
Platform.getPreferencesService().getString(IDFCorePlugin.PLUGIN_ID,
157-
IDFCorePreferenceConstants.PIP_EXTRA_INDEX_URL,
158-
IDFCorePreferenceConstants.PIP_EXTRA_INDEX_URL_DEFAULT_GLOBAL, null));
159-
160148
if (gitExecutablePath != null)
161149
{
162150
addGitToEnvironment(environment, gitExecutablePath);

0 commit comments

Comments
 (0)