Skip to content

Commit 944e719

Browse files
author
jantje
committed
#1347 do not try to show the label when project is not fully configured
1 parent 0fd4ef3 commit 944e719

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class SloeberProject extends Common {
6363
private Map<String, Map<String, String>> myEnvironmentVariables = new HashMap<>();
6464
private TxtFile myCfgFile = null;
6565
private IProject myProject = null;
66-
private boolean isInMemory = false;
66+
private boolean myIsInMemory = false;
6767
private boolean myIsDirty = false; // if anything has changed
6868
private boolean myNeedToPersist = false; // Do we need to write data to disk
6969
private boolean myNeedsClean = false; // is there old sloeber data that needs cleaning
@@ -121,7 +121,7 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
121121
sloeberProject.setOtherDescription(RELEASE, new OtherDescription());
122122
// we failed to read from disk so we set opourselfves some values
123123
// faking the stuf is in memory
124-
sloeberProject.isInMemory = true;
124+
sloeberProject.myIsInMemory = true;
125125
}
126126
String configName = sloeberProject.myBoardDescriptions.keySet().iterator().next();
127127
BoardDescription boardDescriptor = sloeberProject.getBoardDescription(configName, true);
@@ -403,7 +403,7 @@ public synchronized boolean configure(ICProjectDescription prjCDesc, boolean prj
403403
try {
404404
myIsConfiguring = true;
405405

406-
if (isInMemory) {
406+
if (myIsInMemory) {
407407
if (myIsDirty) {
408408
createSloeberConfigFiles(prjCDesc);
409409
setAllEnvironmentVars(prjCDesc);
@@ -605,7 +605,7 @@ private boolean readConfig(ICProjectDescription prjCDesc, boolean prjDescWritabl
605605
projDescNeedsWriting = true;
606606
}
607607
}
608-
isInMemory = true;
608+
myIsInMemory = true;
609609
return projDescNeedsWriting;
610610
}
611611

@@ -885,6 +885,10 @@ public OtherDescription getOtherDescription(String confDescName, boolean allowNu
885885
* @return
886886
*/
887887
public String getDecoratedText(String text) {
888+
String pleaseWait = "Please wait"; //$NON-NLS-1$
889+
if (!myIsInMemory || myIsConfiguring) {
890+
return pleaseWait;
891+
}
888892
ICProjectDescription prjDesc = CoreModel.getDefault().getProjectDescription(myProject);
889893
if (prjDesc != null) {
890894
ICConfigurationDescription confDesc = prjDesc.getActiveConfiguration();
@@ -995,7 +999,7 @@ public void sloeberCfgChanged() {
995999
CCorePlugin cCorePlugin = CCorePlugin.getDefault();
9961000
ICProjectDescription projDesc = cCorePlugin.getProjectDescription(myProject);
9971001
ICConfigurationDescription activeConfig = projDesc.getActiveConfiguration();
998-
isInMemory = false;
1002+
myIsInMemory = false;
9991003
boolean projDescNeedsSaving = configure(projDesc, true);
10001004
Helpers.deleteBuildFolder(myProject, activeConfig.getName());
10011005
projDescNeedsSaving = projDescNeedsSaving || setActiveConfig(activeConfig);
@@ -1058,7 +1062,7 @@ private static String getConfigKey(ICConfigurationDescription configDesc) {
10581062
* @return true if the data is available and up to date
10591063
*/
10601064
private boolean needsconfiguring() {
1061-
return myIsDirty || !isInMemory;
1065+
return myIsDirty || !myIsInMemory;
10621066
}
10631067

10641068
public Map<String, String> getEnvironmentVariables(String configKey) {

0 commit comments

Comments
 (0)