Patch-A

dim-s · dim-s · commit a4ee330fc4b8 · 2016-04-17T10:58:41.000+03:00
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
-def javaVersion    = '1.7';
+def javaVersion    = '1.8';
 def projectVersion = '0.9.0';
-def jphpVersion    = projectVersion + "-SNAPSHOT";
+def jphpVersion    = "0.9.0-SNAPSHOT";
 
 rootProject.ext.jphpVersion = jphpVersion;
 
@@ -102,8 +102,8 @@ configure([
 
 project(':jphp-gui-ext') {
     dependencies {
-        compile "org.develnext:jphp-runtime:$jphpVersion"
-        compile "org.develnext:jphp-xml-ext:$jphpVersion"
+        compile "org.develnext.jphp:jphp-runtime:$jphpVersion"
+        compile "org.develnext.jphp:jphp-xml-ext:$jphpVersion"
     }
 }
 
@@ -112,27 +112,27 @@ project(':jphp-game-ext') {
         compile 'org.dyn4j:dyn4j:3.2.1'
 
         compile project(':jphp-gui-ext')
-        compile "org.develnext:jphp-runtime:$jphpVersion"
+        compile "org.develnext.jphp:jphp-runtime:$jphpVersion"
     }
 }
 
 project(':jphp-desktop-ext') {
     dependencies {
         compile project(':jphp-gui-ext')
-        compile "org.develnext:jphp-runtime:$jphpVersion"
+        compile "org.develnext.jphp:jphp-runtime:$jphpVersion"
     }
 }
 
 project(':jphp-parser') {
     dependencies {
-        compile "org.develnext:jphp-core:$jphpVersion"
+        compile "org.develnext.jphp:jphp-core:$jphpVersion"
     }
 }
 
 project(':jphp-app-framework') {
     dependencies {
         compile project(':jphp-gui-ext')
-        compile "org.develnext:jphp-core:$jphpVersion"
+        compile "org.develnext.jphp:jphp-core:$jphpVersion"
     }
 }
 
@@ -155,14 +155,14 @@ project(':develnext') {
         compile project(':develnext-bundles/dn-jsoup-bundle')
         compile project(':develnext-bundles/dn-mail-bundle')
 
-        compile "org.develnext:jphp-xml-ext:$jphpVersion"
-        compile "org.develnext:jphp-json-ext:$jphpVersion"
-        compile "org.develnext:jphp-jsoup-ext:$jphpVersion"
-        compile "org.develnext:jphp-zend-ext:$jphpVersion"
-        compile "org.develnext:jphp-sql-ext:$jphpVersion"
-        compile "org.develnext:jphp-compress-ext:$jphpVersion"
-        compile "org.develnext:jphp-compress-ext:$jphpVersion"
-        compile "org.develnext:jphp-debugger:$jphpVersion"
+        compile "org.develnext.jphp:jphp-xml-ext:$jphpVersion"
+        compile "org.develnext.jphp:jphp-json-ext:$jphpVersion"
+        compile "org.develnext.jphp:jphp-jsoup-ext:$jphpVersion"
+        compile "org.develnext.jphp:jphp-zend-ext:$jphpVersion"
+        compile "org.develnext.jphp:jphp-sql-ext:$jphpVersion"
+        compile "org.develnext.jphp:jphp-compress-ext:$jphpVersion"
+        compile "org.develnext.jphp:jphp-compress-ext:$jphpVersion"
+        compile "org.develnext.jphp:jphp-debugger:$jphpVersion"
     }
 }
 
diff --git a/develnext-bundles/dn-jsoup-bundle/build.gradle b/develnext-bundles/dn-jsoup-bundle/build.gradle
@@ -12,5 +12,5 @@ sourceSets {
 }
 
 dependencies {
-    compile "org.develnext:jphp-jsoup-ext:$rootProject.ext.jphpVersion"
+    compile "org.develnext.jphp:jphp-jsoup-ext:$rootProject.ext.jphpVersion"
 }
diff --git a/develnext-bundles/dn-mail-bundle/build.gradle b/develnext-bundles/dn-mail-bundle/build.gradle
@@ -12,5 +12,5 @@ sourceSets {
 }
 
 dependencies {
-    compile "org.develnext:jphp-mail-ext:$rootProject.ext.jphpVersion"
+    compile "org.develnext.jphp:jphp-mail-ext:$rootProject.ext.jphpVersion"
 }
diff --git a/develnext-bundles/dn-orientdb-bundle/build.gradle b/develnext-bundles/dn-orientdb-bundle/build.gradle
@@ -12,5 +12,5 @@ sourceSets {
 }
 
 dependencies {
-    compile "org.develnext:jphp-orientdb-ext:$rootProject.ext.jphpVersion"
+    compile "org.develnext.jphp:jphp-orientdb-ext:$rootProject.ext.jphpVersion"
 }
diff --git a/develnext/misc/history.txt b/develnext/misc/history.txt
@@ -1,6 +1,9 @@
 Patch-A
 ------------
 - Исправлен баг события клавиатура, под-событие "любая буква" не работало.
+- Исправлен баг открытия форм и модулей из вкладки проекта, в редакторах пропадала вкладка "Исходный проект".
+- Исправлен баг с эффектом "Светотень", после переоткрытия редактора с этим эффектом, он пропадал.
+- Исправлен баг при удалении основного цвета у плоской кнопки.
 
 Beta-1
 ------------
diff --git a/develnext/src/ide/Ide.php b/develnext/src/ide/Ide.php
@@ -1127,7 +1127,6 @@ public function shutdown()
         $this->mainForm->hide();
 
         if ($project) {
-            $project->save();
             ProjectSystem::close();
         }
 
diff --git a/develnext/src/ide/formats/form/elements/FlatButtonFormElement.php b/develnext/src/ide/formats/form/elements/FlatButtonFormElement.php
@@ -52,6 +52,10 @@ public function createElement()
         $button = new UXFlatButton($this->getName());
         $button->textAlignment = 'CENTER';
         $button->alignment = 'CENTER';
+        $button->color = '#6680e6';
+        $button->hoverColor = '#4d66cc';
+        $button->textColor = 'white';
+
         return $button;
     }
 
diff --git a/develnext/src/ide/formats/form/elements/GamePaneFormElement.php b/develnext/src/ide/formats/form/elements/GamePaneFormElement.php
@@ -67,6 +67,8 @@ public function canBePrototype()
     public function createElement()
     {
         $button = new UXGamePane();
+        $button->backgroundColor = 'white';
+
         return $button;
     }
 
diff --git a/develnext/src/ide/formats/form/elements/GamePaneFormElement.xml b/develnext/src/ide/formats/form/elements/GamePaneFormElement.xml
@@ -1,11 +1,8 @@
-<element extends="NodeFormElement">
+<element extends="PanelFormElement">
     <!--<properties group="bindings" title="Функционал" sort="500">
         <property code="modules" name="Модули" editor="moduleList" virtual="1" tooltip="Подключенные модули к панели" formConfig="1" />
     </properties>-->
 
     <properties>
-        <property code="areaBackgroundColor" name="Цвет фона" editor="color" tooltip="Фоновый цвет игровой комнаты" />
-        <property code="areaSize" name="Размеры комнаты" editor="doubleArray" tooltip="Высота и ширина комнаты" />
-        <property code="autoSize" name="Авторазмер" editor="boolean" tooltip="Подгонять размер игровой комнаты под размер панели" />
     </properties>
 </element>
diff --git a/develnext/src/ide/formats/form/elements/PanelFormElement.php b/develnext/src/ide/formats/form/elements/PanelFormElement.php
@@ -85,6 +85,6 @@ public function getDefaultSize()
 
     public function isOrigin($any)
     {
-        return $any instanceof UXPanel;
+        return get_class($any) == UXPanel::class;
     }
 }
diff --git a/develnext/src/ide/formats/form/tags/FlatButtonFormElementTag.php b/develnext/src/ide/formats/form/tags/FlatButtonFormElementTag.php
@@ -22,7 +22,9 @@ public function writeAttributes($node, DomElement $element)
     {
         /** @var UXFlatButton $node */
 
-        $element->setAttribute('color', $node->color->getWebValue());
+        if ($node->color) {
+            $element->setAttribute('color', $node->color);
+        }
 
         if ($node->clickColor) {
             $element->setAttribute('clickColor', $node->clickColor->getWebValue());
diff --git a/develnext/src/ide/systems/FileSystem.php b/develnext/src/ide/systems/FileSystem.php
@@ -284,6 +284,10 @@ static function open($path, $switchToTab = true, $param = null)
             $path = $path->getFile();
         }
 
+        if (Ide::project() && fs::exists($path)) {
+            $path = Ide::project()->getAbsoluteFile($path);
+        }
+
         $hash = FileUtils::hashName($path);
 
         $editor = static::$openedEditors[$hash];
diff --git a/develnext/src/ide/utils/FileUtils.php b/develnext/src/ide/utils/FileUtils.php
@@ -1,6 +1,7 @@
 <?php
 namespace ide\utils;
 
+use ide\Logger;
 use php\gui\UXDialog;
 use php\io\File;
 use php\io\FileStream;
@@ -182,9 +183,22 @@ public static function deleteDirectory($directory)
 
     public static function put($filename, $content, $encoding = 'UTF-8')
     {
-        fs::ensureParent($filename);
+        //Logger::debug("Write to file $filename");
 
-        Stream::putContents($filename, Str::encode($content, $encoding));
+        if (!fs::ensureParent($filename)) {
+            Logger::error("Unable to write $filename, cannot create parent directory");
+            return false;
+        }
+
+        $encodeStr = Str::encode($content, $encoding);
+
+        if ($encodeStr !== false) {
+            Stream::putContents($filename, $encodeStr);
+            return true;
+        } else {
+            Logger::error("Unable to write $filename, cannot encode string to $encoding");
+            return false;
+        }
     }
 
     public static function get($filename, $encoding = 'UTF-8')
diff --git a/jphp-app-framework/src/php/gui/framework/AbstractFactory.php b/jphp-app-framework/src/php/gui/framework/AbstractFactory.php
@@ -2,6 +2,7 @@
 namespace php\gui\framework;
 
 use behaviour\SetTextBehaviour;
+use php\format\ProcessorException;
 use php\game\UXSpriteView;
 use php\gui\framework\behaviour\custom\BehaviourLoader;
 use php\gui\framework\behaviour\custom\BehaviourManager;
@@ -251,6 +252,8 @@ protected function loadPrototypes($path = null)
                     }
                 }
 
+            } catch (ProcessorException $e) {
+                throw new IOException("Unable to load {$stream->getPath()}, {$e->getMessage()}");
             } catch (IOException $e) {
                 throw new IOException("Unable to load {$stream->getPath()}, {$e->getMessage()}");
             }
diff --git a/jphp-game-ext/src/main/java/org/develnext/jphp/ext/game/support/GamePane.java b/jphp-game-ext/src/main/java/org/develnext/jphp/ext/game/support/GamePane.java
@@ -17,10 +17,11 @@
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
+import org.develnext.jphp.ext.javafx.support.control.Panel;
 import php.runtime.annotation.Reflection;
 import php.runtime.annotation.Reflection.Getter;
 
-public class GamePane extends AnchorPane {
+public class GamePane extends Panel {
     protected GameScene2D scene = null;
     protected AnchorPane area;
 
diff --git a/jphp-gui-ext/src/main/java/org/develnext/jphp/ext/javafx/support/control/FlatButton.java b/jphp-gui-ext/src/main/java/org/develnext/jphp/ext/javafx/support/control/FlatButton.java
@@ -34,9 +34,10 @@ public FlatButton(String text, Node graphic) {
         super(text, graphic);
 
         getStyleClass().setAll(DEFAULT_STYLE_CLASS);
-        setTextFill(Color.WHITE);
-        setColor(Color.valueOf("#6680e6"));
-        setHoverColor(Color.valueOf("#4d66cc"));
+        setTextFill(Color.BLACK);
+        setColor(null);
+        setHoverColor(null);
+        setClickColor(null);
 
         addEventFilter(MouseEvent.MOUSE_ENTERED, new EventHandler<MouseEvent>() {
             @Override
diff --git a/jphp-gui-richtext-ext/build.gradle b/jphp-gui-richtext-ext/build.gradle
@@ -2,7 +2,7 @@
 project.version = '1.0'
 
 dependencies {
-    compile "org.develnext:jphp-runtime:$rootProject.ext.jphpVersion"
+    compile "org.develnext.jphp:jphp-runtime:$rootProject.ext.jphpVersion"
     compile project(':jphp-gui-ext')
 
     compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.6.10'
diff --git a/jphp-parser/src/main/java/org/develnext/jphp/parser/classes/SourceFile.java b/jphp-parser/src/main/java/org/develnext/jphp/parser/classes/SourceFile.java
@@ -13,7 +13,7 @@
 import php.runtime.ext.core.classes.stream.Stream;
 import php.runtime.ext.core.classes.stream.WrapIOException;
 import php.runtime.lang.BaseObject;
-import php.runtime.lang.exception.BaseParseException;
+import php.runtime.lang.exception.BaseParseError;
 import php.runtime.reflection.ClassEntity;
 
 import java.io.File;
@@ -96,7 +96,7 @@ public Memory update(Environment env, Memory... args) {
             for (ConstStmtToken token : analyzer.getConstants()) {
                 moduleRecord.synchronize(env, token, tokenizer);
             }
-        } catch (BaseParseException | IOException e) {
+        } catch (BaseParseError | IOException e) {
         }
 
         return Memory.NULL;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-def javaVersion = '1.7';`
	`1`	`+def javaVersion = '1.8';`
`2`	`2`	`def projectVersion = '0.9.0';`
`3`		`-def jphpVersion = projectVersion + "-SNAPSHOT";`
	`3`	`+def jphpVersion = "0.9.0-SNAPSHOT";`
`4`	`4`
`5`	`5`	`rootProject.ext.jphpVersion = jphpVersion;`
`6`	`6`
`@@ -102,8 +102,8 @@ configure([`
`102`	`102`
`103`	`103`	`project(':jphp-gui-ext') {`
`104`	`104`	`dependencies {`
`105`		`- compile "org.develnext:jphp-runtime:$jphpVersion"`
`106`		`- compile "org.develnext:jphp-xml-ext:$jphpVersion"`
	`105`	`+ compile "org.develnext.jphp:jphp-runtime:$jphpVersion"`
	`106`	`+ compile "org.develnext.jphp:jphp-xml-ext:$jphpVersion"`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`@@ -112,27 +112,27 @@ project(':jphp-game-ext') {`
`112`	`112`	`compile 'org.dyn4j:dyn4j:3.2.1'`
`113`	`113`
`114`	`114`	`compile project(':jphp-gui-ext')`
`115`		`- compile "org.develnext:jphp-runtime:$jphpVersion"`
	`115`	`+ compile "org.develnext.jphp:jphp-runtime:$jphpVersion"`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`project(':jphp-desktop-ext') {`
`120`	`120`	`dependencies {`
`121`	`121`	`compile project(':jphp-gui-ext')`
`122`		`- compile "org.develnext:jphp-runtime:$jphpVersion"`
	`122`	`+ compile "org.develnext.jphp:jphp-runtime:$jphpVersion"`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`project(':jphp-parser') {`
`127`	`127`	`dependencies {`
`128`		`- compile "org.develnext:jphp-core:$jphpVersion"`
	`128`	`+ compile "org.develnext.jphp:jphp-core:$jphpVersion"`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`project(':jphp-app-framework') {`
`133`	`133`	`dependencies {`
`134`	`134`	`compile project(':jphp-gui-ext')`
`135`		`- compile "org.develnext:jphp-core:$jphpVersion"`
	`135`	`+ compile "org.develnext.jphp:jphp-core:$jphpVersion"`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`@@ -155,14 +155,14 @@ project(':develnext') {`
`155`	`155`	`compile project(':develnext-bundles/dn-jsoup-bundle')`
`156`	`156`	`compile project(':develnext-bundles/dn-mail-bundle')`
`157`	`157`
`158`		`- compile "org.develnext:jphp-xml-ext:$jphpVersion"`
`159`		`- compile "org.develnext:jphp-json-ext:$jphpVersion"`
`160`		`- compile "org.develnext:jphp-jsoup-ext:$jphpVersion"`
`161`		`- compile "org.develnext:jphp-zend-ext:$jphpVersion"`
`162`		`- compile "org.develnext:jphp-sql-ext:$jphpVersion"`
`163`		`- compile "org.develnext:jphp-compress-ext:$jphpVersion"`
`164`		`- compile "org.develnext:jphp-compress-ext:$jphpVersion"`
`165`		`- compile "org.develnext:jphp-debugger:$jphpVersion"`
	`158`	`+ compile "org.develnext.jphp:jphp-xml-ext:$jphpVersion"`
	`159`	`+ compile "org.develnext.jphp:jphp-json-ext:$jphpVersion"`
	`160`	`+ compile "org.develnext.jphp:jphp-jsoup-ext:$jphpVersion"`
	`161`	`+ compile "org.develnext.jphp:jphp-zend-ext:$jphpVersion"`
	`162`	`+ compile "org.develnext.jphp:jphp-sql-ext:$jphpVersion"`
	`163`	`+ compile "org.develnext.jphp:jphp-compress-ext:$jphpVersion"`
	`164`	`+ compile "org.develnext.jphp:jphp-compress-ext:$jphpVersion"`
	`165`	`+ compile "org.develnext.jphp:jphp-debugger:$jphpVersion"`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@ sourceSets {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`		`- compile "org.develnext:jphp-jsoup-ext:$rootProject.ext.jphpVersion"`
	`15`	`+ compile "org.develnext.jphp:jphp-jsoup-ext:$rootProject.ext.jphpVersion"`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,6 @@ public function shutdown()`
`1127`	`1127`	`$this->mainForm->hide();`
`1128`	`1128`
`1129`	`1129`	`if ($project) {`
`1130`		`- $project->save();`
`1131`	`1130`	`ProjectSystem::close();`
`1132`	`1131`	`}`
`1133`	`1132`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ public function canBePrototype()`
`67`	`67`	`public function createElement()`
`68`	`68`	`{`
`69`	`69`	`$button = new UXGamePane();`
	`70`	`+ $button->backgroundColor = 'white';`
	`71`	`+`
`70`	`72`	`return $button;`
`71`	`73`	`}`
`72`	`74`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,6 @@ public function getDefaultSize()`
`85`	`85`
`86`	`86`	`public function isOrigin($any)`
`87`	`87`	`{`
`88`		`- return $any instanceof UXPanel;`
	`88`	`+ return get_class($any) == UXPanel::class;`
`89`	`89`	`}`
`90`	`90`	`}`