6
--- a/main.js
+++ b/main.js
@@ -81,6 +81,7 @@ define(function(require, exports, module) {
addIcon('c', 'icon-c', '#a8b9cc', 13);
addIcon('cpp', 'icon-c', '#ffd232', 13);
addIcon('cs', 'icon-c', '#5bb552', 13);
+ addIcon('swift', 'icon-c', '#f16830', 13);
// Ruby
addIcon('rb', 'ion-heart', '#9b111e');
@@ -160,6 +161,7 @@ define(function(require, exports, module) {
addIcon('log', 'ion-clipboard', '#225dc9');
addIcon('npmignore', 'ion-minus-circled', '#cb3837', 14);
addIcon('yml', 'ion-navicon', '#008000');
+ addIcon('sqf', 'ion-wand', '#b9e11f');
var ExtensionUtils = brackets.getModule("utils/ExtensionUtils");
17
--- a/config/renderer.js
+++ b/config/renderer.js
@@ -1,5 +1,3 @@
-var logger = require("commonlog-bunyan").logger;
-
/**
* Returns JSON response on behalf of routes that return `response.jsonApiResponse`
*
@@ -36,7 +34,7 @@ function errorRenderer (error, request, response, next) {
response.status(500).send(message);
- logger.error({error: error, stack: error.stack});
+ console.log(error);
}
/**
11
--- a/src/main/io/display.c
+++ b/src/main/io/display.c
@@ -41,8 +41,10 @@
#include "sensors/sensors.h"
#include "sensors/compass.h"
+#ifdef GPS
#include "io/gps.h"
#include "flight/navigation.h"
+#endif
#include "rx/rx.h"
#include "io/rc_controls.h"
@@ -76,11 +78,12 @@ const char* pageTitles[] = {
"BATTERY",
"SENSORS",
"RX",
- "PROFILE",
- "GPS"
+ "PROFILE"
+#ifdef GPS
+ ,"GPS"
+#endif
#ifdef ENABLE_DEBUG_OLED_PAGE
- ,
- "DEBUG"
+ ,"DEBUG"
#endif
};
@@ -88,13 +91,14 @@ const char* pageTitles[] = {
const uint8_t cyclePageIds[] = {
PAGE_PROFILE,
+#ifdef GPS
PAGE_GPS,
+#endif
PAGE_RX,
PAGE_BATTERY,
PAGE_SENSORS
#ifdef ENABLE_DEBUG_OLED_PAGE
- ,
- PAGE_DEBUG,
+ ,PAGE_DEBUG,
#endif
};
@@ -279,6 +283,7 @@ void showProfilePage(void)
}
+#ifdef GPS
void showGpsPage() {
uint8_t rowIndex = PAGE_TITLE_LINE_COUNT;
@@ -327,6 +332,7 @@ void showGpsPage() {
i2c_OLED_send_string(lineBuffer);
#endif
}
+#endif
void showBatteryPage(void)
{
@@ -461,9 +467,15 @@ void updateDisplay(void)
case PAGE_PROFILE:
showProfilePage();
break;
+#ifdef GPS
case PAGE_GPS:
- showGpsPage();
+ if (feature(FEATURE_GPS)) {
+ showGpsPage();
+ } else {
+ pageState.pageFlags |= PAGE_STATE_FLAG_FORCE_PAGE_CHANGE;
+ }
break;
+#endif
#ifdef ENABLE_DEBUG_OLED_PAGE
case PAGE_DEBUG:
showDebugPage();
24
--- a/test/DynamicJsonBuffer_Basic_Tests.cpp
+++ b/test/DynamicJsonBuffer_Basic_Tests.cpp
@@ -20,16 +20,35 @@ TEST_F(DynamicJsonBuffer_Basic_Tests, InitialSizeIsZero) {
ASSERT_EQ(0, buffer.size());
}
-TEST_F(DynamicJsonBuffer_Basic_Tests, GrowsAfterAlloc) {
+TEST_F(DynamicJsonBuffer_Basic_Tests, InitialBlockCountIsOne) {
+ ASSERT_EQ(1, buffer.blockCount());
+}
+
+TEST_F(DynamicJsonBuffer_Basic_Tests, SizeIncreasesAfterAlloc) {
buffer.alloc(1);
ASSERT_EQ(1, buffer.size());
buffer.alloc(1);
ASSERT_EQ(2, buffer.size());
+ buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
+ ASSERT_EQ(2 + DynamicJsonBuffer::BLOCK_CAPACITY, buffer.size());
+}
+
+TEST_F(DynamicJsonBuffer_Basic_Tests, BlockCountDoesntChangeWhenNotFull) {
+ buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
+ ASSERT_EQ(1, buffer.blockCount());
+}
+
+TEST_F(DynamicJsonBuffer_Basic_Tests, BlockCountChangesWhenFull) {
+ buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
+ buffer.alloc(1);
+ ASSERT_EQ(2, buffer.blockCount());
}
TEST_F(DynamicJsonBuffer_Basic_Tests, CanAllocLessThanBlockCapacity) {
- void* p = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
- ASSERT_TRUE(p);
+ void* p1 = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
+ ASSERT_TRUE(p1);
+ void* p2 = buffer.alloc(DynamicJsonBuffer::BLOCK_CAPACITY);
+ ASSERT_TRUE(p2);
}
TEST_F(DynamicJsonBuffer_Basic_Tests, CantAllocMoreThanBlockCapacity) {
3
index 0000000..6a8740a
--- /dev/null
+++ b/research/sr_unittest/src/main/java/com/github/hubin0011/springresearch/unittest/entity/User.java
@@ -0,0 +1,18 @@
+package com.github.hubin0011.springresearch.unittest.entity;
+
+/**
+ * Created by howard.hb on 2014/12/13.
+ */
+
+public class User {
+
+ private String id;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+}
35
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -49,13 +49,16 @@
<div class="feature-section col three-col">
<div class="col-1">
- <p><?php echo ( 'Our 2015 default theme is blog-focused and designed for clarity. Twenty Fifteen᾿s straightforward typography is readable on any screen size.' ); ?></p>
+ <p><?php _e( 'Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.' ); ?></p>
</div>
<div class="col-2">
- <p><?php _e( 'Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.' ); ?></p>
+ <p>
+ <?php printf( __( 'Twenty Fifteen has flawless language support, with help from <a href="%s">Google’s Noto font family</a>.' ), 'https://www.google.com/get/noto/' ); ?>
+ <?php _e( 'The straightforward typography is readable on any screen size.' ); ?>
+ </p>
</div>
<div class="col-3 last-feature">
- <p><?php printf( ( 'Twenty Fifteen has great language support, with help from <a href="%s">Google’s Noto font family</a>.' ), 'https://www.google.com/get/noto/' ); ?></p>
+ <p><?php _e( 'Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.' ); ?></p>
</div>
</div>
@@ -66,7 +69,7 @@
<div class="changelog">
<h2 class="about-headline-callout"><?php _e( 'Distraction-free writing' ); ?></h2>
<div class="feature-section">
- <p><?php echo ( '<em>Just write.</em> Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on <strong>writing mode</strong>. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.' ); ?></p>
+ <p><em><?php _e( 'Just write.' ); ?></em> <?php _e( 'Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on <strong>distraction-free writing mode</strong>. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.' ); ?></p>
</div>
</div>
763
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -49,13 +49,16 @@
<div class="feature-section col three-col">
<div class="col-1">
- <p><?php echo ( 'Our 2015 default theme is blog-focused and designed for clarity. Twenty Fifteen᾿s straightforward typography is readable on any screen size.' ); ?></p>
+ <p><?php _e( 'Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.' ); ?></p>
</div>
<div class="col-2">
- <p><?php _e( 'Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.' ); ?></p>
+ <p>
+ <?php printf( __( 'Twenty Fifteen has flawless language support, with help from <a href="%s">Google’s Noto font family</a>.' ), 'https://www.google.com/get/noto/' ); ?>
+ <?php _e( 'The straightforward typography is readable on any screen size.' ); ?>
+ </p>
</div>
<div class="col-3 last-feature">
- <p><?php printf( ( 'Twenty Fifteen has great language support, with help from <a href="%s">Google’s Noto font family</a>.' ), 'https://www.google.com/get/noto/' ); ?></p>
+ <p><?php _e( 'Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.' ); ?></p>
</div>
</div>
@@ -66,7 +69,7 @@
<div class="changelog">
<h2 class="about-headline-callout"><?php _e( 'Distraction-free writing' ); ?></h2>
<div class="feature-section">
- <p><?php echo ( '<em>Just write.</em> Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on <strong>writing mode</strong>. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.' ); ?></p>
+ <p><em><?php _e( 'Just write.' ); ?></em> <?php _e( 'Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on <strong>distraction-free writing mode</strong>. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.' ); ?></p>
</div>
</div>
3
--- a/test/basic.js
+++ b/test/basic.js
@@ -81,7 +81,7 @@ tap.test('Walk', function(t) {
return node.path.match(/walk.js$/);
});
- t.equal(paths.length, 15, 'There should be 15 children in lib/');
+ t.equal(paths.length, 16, 'There should be 16 children in lib/');
t.ok(walk_js_present, 'One of the paths should end with "walk.js".');
t.end();
});
40
--- a/src/listconf.c
+++ b/src/listconf.c
@@ -552,11 +552,15 @@ void listconf_parse_late(void)
ntests--;
}
/*
- * attributes should be printed in the same sequence
- * as with format-details, but human-readable
+ * According to doc/OPTIONS, attributes should be printed in
+ * the same sequence as with format-details, but human-readable.
*/
printf("Format label %s\n", format->params.label);
- printf("Disabled in configuration file %s\n",
+ /*
+ * Indented (similar to the flags), because this information is not printed
+ * for --list=format-details
+ */
+ printf(" Disabled in configuration file %s\n",
cfg_get_bool(SECTION_DISABLED,
SUBSECTION_FORMATS,
format->params.label, 0)
3
--- a/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java
+++ b/src/test/java/org/seasar/doma/internal/jdbc/sql/SqlParserTest.java
@@ -280,6 +280,18 @@ public void testExpand() throws Exception {
assertEquals("select bbb, ccc from aaa", sql.getFormattedSql());
}
+ public void testExpand_withSpace() throws Exception {
+ ExpressionEvaluator evaluator = new ExpressionEvaluator();
+ String testSql = "select /*%expand */* from aaa";
+ SqlParser parser = new SqlParser(testSql);
+ SqlNode sqlNode = parser.parse();
+ PreparedSql sql = new NodePreparedSqlBuilder(config, SqlKind.SELECT,
+ "dummyPath", evaluator, SqlLogType.FORMATTED,
+ node -> Arrays.asList("bbb", "ccc")).build(sqlNode);
+ assertEquals("select bbb, ccc from aaa", sql.getRawSql());
+ assertEquals("select bbb, ccc from aaa", sql.getFormattedSql());
+ }
+
public void testExpand_alias() throws Exception {
ExpressionEvaluator evaluator = new ExpressionEvaluator();
String testSql = "select /*%expand \"a\"*/* from aaa a";
43
--- a/moses/FF/DistortionScoreProducer.h
+++ b/moses/FF/DistortionScoreProducer.h
@@ -16,7 +16,14 @@ class WordsRange;
*/
class DistortionScoreProducer : public StatefulFeatureFunction
{
+protected:
+ static std::vector<const DistortionScoreProducer*> s_staticColl;
+
public:
+ static const std::vector<const DistortionScoreProducer*>& GetDistortionFeatureFunctions() {
+ return s_staticColl;
+ }
+
DistortionScoreProducer(const std::string &line);
bool IsUseable(const FactorMask &mask) const {
3
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -2267,12 +2267,6 @@ bool platform_check_codec_backend_cfg(struct audio_device* adev,
*new_bit_width = best_bw;
*new_sample_rate = best_sr;
- // 24 bit playback on speakers is only allowed at 48KHz
- if ((24 == *new_bit_width) &&
- (usecase->stream.out->devices & AUDIO_DEVICE_OUT_SPEAKER)) {
- *new_sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
- }
-
// Force routing if the expected bitwdith or samplerate
// is not same as current backend comfiguration
if ((*new_bit_width != adev->cur_codec_backend_bit_width) ||
54
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -180,8 +180,17 @@ public BungeeCord() throws IOException
bundle = ResourceBundle.getBundle( "messages", Locale.ENGLISH );
}
- Log.setOutput( new PrintStream( ByteStreams.nullOutputStream() ) ); // TODO: Bug JLine
-
+ // This is a workaround for quite possibly the weirdest bug I have ever encountered in my life!
+ // When jansi attempts to extract its natives, by default it tries to extract a specific version,
+ // using the loading class's implementation version. Normally this works completely fine,
+ // however when on Windows certain characters such as - and : can trigger special behaviour.
+ // Furthermore this behaviour only occurs in specific combinations due to the parsing done by jansi.
+ // For example test-test works fine, but test-test-test does not! In order to avoid this all together but
+ // still keep our versions the same as they were, we set the override property to the essentially garbage version
+ // BungeeCord. This version is only used when extracting the libraries to their temp folder.
+ System.setProperty( "library.jansi.version", "BungeeCord" );
+
+ AnsiConsole.systemInstall();
consoleReader = new ConsoleReader();
consoleReader.setExpandEvents( false );
@@ -189,12 +198,6 @@ public BungeeCord() throws IOException
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
- if ( consoleReader.getTerminal() instanceof UnsupportedTerminal )
- {
- logger.info( "Unable to initialize fancy terminal. To fix this on Windows, install the correct Microsoft Visual C++ 2008 Runtime" );
- logger.info( "NOTE: This error is non crucial, and BungeeCord will still function correctly! Do not bug the author about it unless you are still unable to get it working" );
- }
-
if ( NativeCipher.load() )
{
logger.info( "Using OpenSSL based native cipher." );
3
--- a/RE-Chess-AI/src/chess/Space.java
+++ b/RE-Chess-AI/src/chess/Space.java
@@ -2,6 +2,7 @@
*
*/
package chess;
+import chess.Piece;
/**
* Class to create a space on a chess board.
@@ -9,7 +10,7 @@
*/
public class Space {
- char piece;
+ Piece piece;
int whiteDefenseValue, blackDefenseValue;
/**
116
--- a/lib/recipes.js
+++ b/lib/recipes.js
@@ -202,7 +202,7 @@ module.exports = function recipes(proto) {
function normalizeTimemarks(next) {
config.timemarks = config.timemarks.map(function(mark) {
return utils.timemarkToSeconds(mark);
- }).sort();
+ }).sort(function(a, b) { return a - b; });
next();
},
49
--- a/src/ProxyManager/Configuration.php
+++ b/src/ProxyManager/Configuration.php
@@ -83,25 +83,6 @@ class Configuration
protected $classSignatureGenerator;
/**
- * @deprecated deprecated since version 0.5
- * @codeCoverageIgnore
- */
- public function setAutoGenerateProxies()
- {
- }
-
- /**
- * @return bool
- *
- * @deprecated deprecated since version 0.5
- * @codeCoverageIgnore
- */
- public function doesAutoGenerateProxies()
- {
- return true;
- }
-
- /**
* @param AutoloaderInterface $proxyAutoloader
*/
public function setProxyAutoloader(AutoloaderInterface $proxyAutoloader)
299
--- a/src/features/move-columns/js/column-movable.js
+++ b/src/features/move-columns/js/column-movable.js
@@ -117,7 +117,7 @@
var findPositionForRenderIndex = function (index) {
var position = index;
for (var i = 0; i <= position; i++) {
- if (angular.isDefined(columns[i]) && angular.isDefined(columns[i].colDef.visible) && columns[i].colDef.visible === false) {
+ if (angular.isDefined(columns[i]) && ((angular.isDefined(columns[i].colDef.visible) && columns[i].colDef.visible === false) || columns[i].isRowHeader === true)) {
position++;
}
}
@@ -255,7 +255,7 @@
//Cloning header cell and appending to current header cell.
movingElm = $elm.clone();
- $elm.append(movingElm);
+ $elm.parent().append(movingElm);
//Left of cloned element should be aligned to original header cell.
movingElm.addClass('movingColumn');
@@ -269,9 +269,6 @@
movingElementStyles.width = reducedWidth + 'px';
}
movingElm.css(movingElementStyles);
-
- //Binding the mouseup event handler
- $document.on('mouseup', mouseUpHandler);
};
var moveElement = function(changeValue) {
@@ -295,8 +292,8 @@
movingElm.css({visibility: 'visible', 'left': newElementLeft + 'px'});
}
else {
- changeValue *= 5;
- uiGridCtrl.fireScrollingEvent({ x: { pixels: changeValue * 2.5} });
+ changeValue *= 6;
+ uiGridCtrl.fireScrollingEvent({ x: { pixels: changeValue * 4} });
}
totalMouseMovement += changeValue;
@@ -319,11 +316,14 @@
}
};
- // On scope destroy, remove the mouse event handlers from the document body
+/*
+//Commenting these lines as they are creating trouble with column moving when grid has huge scroll
+ // On scope destroy, remove the mouse event handlers from the document body
$scope.$on('$destroy', function () {
$document.off('mousemove', mouseMoveHandler);
$document.off('mouseup', mouseUpHandler);
});
+*/
$document.on('mousemove', mouseMoveHandler);
var mouseUpHandler = function (evt) {
@@ -415,6 +415,8 @@
});
};
+ //Binding the mouseup event handler
+ $document.on('mouseup', mouseUpHandler);
}
};
$elm.on('mousedown', mouseDownHandler);
3
--- a/lib/ship.js
+++ b/lib/ship.js
@@ -27,12 +27,24 @@
};
Ship.prototype.fireBullet = function() {
- var posx = this.pos[0] + this.radius;
- var posy = this.pos[1] + this.radius;
- var velx = this.vel[0] + 1;
- var vely = this.vel[1] + 1;
- var bullet = new Asteroids.Bullet([posx, posy], [velx, vely], this.game);
+ var posx = this.pos[0] + 10;
+ var posy = this.pos[1] + 10;
+ var bullet = new Asteroids.Bullet([posx, posy], this.findBulletVel(), this.game);
this.game.bullets.push(bullet);
}
+
+ Ship.prototype.findBulletVel = function() {
+ var newVel = [0,0]
+
+ var norm = Math.sqrt(Math.pow(this.vel[0], 2) + Math.pow(this.vel[1], 2))
+ newVel[0] = this.vel[0]/norm+this.vel[0]
+ newVel[1] = this.vel[1]/norm+this.vel[1]
+
+ if(this.vel[0] === 0 && this.vel[1] === 0){
+ newVel = [0, 1.4]
+ }
+ return newVel
+ }
+
})();
\ No newline at end of file
19
--- a/options.c
+++ b/options.c
@@ -249,8 +249,8 @@ static optionDescription LongOptionDescription [] = {
{1," Guess the language of input file more eagerly: "},
{1," (but taking longer time for guessing)"},
{1," o shebang even the input file is not executable,"},
- {1," o emacs mode specificatoin at the beginning and end of input file, and"},
- {1," o vim syntax specificatoin at the end of input file."},
+ {1," o emacs mode specification at the beginning and end of input file, and"},
+ {1," o vim syntax specification at the end of input file."},
{0," --format=level"},
#if DEFAULT_FILE_FORMAT == 1
{0," Force output of specified tag file format [1]."},
5
--- a/plink_common.h
+++ b/plink_common.h
@@ -15,7 +15,7 @@
// Uncomment this to prevent all unstable features from being accessible from
// the command line.
-#define STABLE_BUILD
+// #define STABLE_BUILD
#define PROG_NAME_STR "plink"
#define PROG_NAME_CAPS "PLINK"