Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
appinventor-sources
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
appinventor-sources
Commits
fbe026a4
Unverified
Commit
fbe026a4
authored
Jul 28, 2016
by
Justus
Committed by
Jeffrey I. Schiller
Jul 27, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix loading of Projects with multiple Extensions
Change-Id: I142c4808c2bca82983cfa669b8864b49ce1ec670
parent
d37f1050
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
appinventor/appengine/src/com/google/appinventor/client/editor/youngandroid/YaProjectEditor.java
...pinventor/client/editor/youngandroid/YaProjectEditor.java
+5
-4
No files found.
appinventor/appengine/src/com/google/appinventor/client/editor/youngandroid/YaProjectEditor.java
View file @
fbe026a4
...
...
@@ -23,6 +23,7 @@ import com.google.appinventor.client.explorer.project.ProjectChangeListener;
import
com.google.appinventor.client.output.OdeLog
;
import
com.google.appinventor.client.properties.json.ClientJsonParser
;
import
com.google.appinventor.common.utils.StringUtils
;
import
com.google.appinventor.shared.properties.json.JSONObject
;
import
com.google.appinventor.shared.rpc.project.ChecksumedFileException
;
import
com.google.appinventor.shared.rpc.project.ChecksumedLoadFile
;
import
com.google.appinventor.shared.rpc.project.ProjectNode
;
...
...
@@ -474,11 +475,11 @@ public final class YaProjectEditor extends ProjectEditor implements ProjectChang
this
.
onFailure
(
e
);
return
;
}
JSONObject
componentJSONObject
=
new
ClientJsonParser
().
parse
(
jsonFileContent
).
asObject
();
COMPONENT_DATABASE
.
addComponentDatabaseListener
(
projectEditor
);
COMPONENT_DATABASE
.
addComponent
(
new
ClientJsonParser
().
parse
(
jsonFileContent
).
asObject
());
if
(!
externalComponents
.
contains
(
compNode
.
getName
()))
{
// In case of upgrade, we do not need to add entry
externalComponents
.
add
(
compNode
.
getName
());
COMPONENT_DATABASE
.
addComponent
(
componentJSONObject
);
if
(!
externalComponents
.
contains
(
componentJSONObject
.
get
(
"name"
).
toString
()))
{
// In case of upgrade, we do not need to add entry
externalComponents
.
add
(
componentJSONObject
.
get
(
"name"
).
toString
());
}
if
(
afterComponentAdded
!=
null
)
{
afterComponentAdded
.
execute
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment