<nb> public class GraphRuntimeConfigurator {

 SINGLE
 if ( periodicUpdater . size ( ) == NUMBER0 ) {
 + periodicUpdater . stop ( ) ;
 graph . putService ( PeriodicTimerGraphUpdater . class , null ) ;
 }
 }


<nb> public class PropertiesUtil {
 }

 @ notnull
 - public static List < Property > findAllProperties ( Project project , ResourceBundle resourceBundle , String key ) {
 + public static List < Property > findAllProperties ( Project project , @ notnull ResourceBundle resourceBundle , String key ) {
 List < Property > result = new SmartList < Property > ( ) ;
 List < PropertiesFile > propertiesFiles = resourceBundle . getPropertiesFiles ( project ) ;
 for ( PropertiesFile propertiesFile : propertiesFiles ) {


<nb>
 COMMENT
 package NAMESPACE ;

 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> import static NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - public final class KafkaCollector implements CollectorComponent , Closeable {
 + public final class KafkaCollector implements CollectorComponent {

 public static Builder builder ( ) {
 return new Builder ( ) ;
 <nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> import static NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - public final class ScribeCollector implements CollectorComponent , Closeable {
 + public final class ScribeCollector implements CollectorComponent {

 public static Builder builder ( ) {
 return new Builder ( ) ;

Removes redundant implementation of Closeable


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class TabbedFolderPageProperties extends TabbedFolderPage implements ILaz
 if ( input . getDatabaseObject ( ) != null ) {
 DBUtils . getRegistry ( ( DBSObject ) curPropertySource . getEditableValue ( ) ) . addDataSourceListener ( this ) ;
 }
 + propertyTree . getControl ( ) . addDisposeListener ( new DisposeListener ( ) {
 + @ override
 + public void widgetDisposed ( DisposeEvent e ) {
 + dispose ( ) ;
 + }
 + } ) ;
 }

 @ override


<nb> public class MessageListFragment extends SherlockFragment implements OnItemClick
 private static final String ARG_IS_THREAD_DISPLAY = STRING0 ;

 private static final String STATE_SELECTED_MESSAGES = STRING1 ;
 + private static final String STATE_REMOTE_SEARCH_PERFORMED = STRING2 ;

 COMMENT
 COMMENT
 <nb> public class MessageListFragment extends SherlockFragment implements OnItemClick
 super . onSaveInstanceState ( outState ) ;

 saveSelectedMessages ( outState ) ;
 +
 + outState . putBoolean ( STATE_REMOTE_SEARCH_PERFORMED , mRemoteSearchPerformed ) ;
 }

 COMMENT
 <nb> public class MessageListFragment extends SherlockFragment implements OnItemClick
 }

 restoreSelectedMessages ( savedInstanceState ) ;
 +
 + mRemoteSearchPerformed = savedInstanceState . getBoolean ( STATE_REMOTE_SEARCH_PERFORMED ) ;
 }

 COMMENT

Remember across activity restarts whether remote search was performed


<nb> public class System {
 ] - * / ;

 public static native Map < String , String > getenv ( ) COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 COMMENT ;

 COMMENT

Updated System getenv to use NSProcessInfo


<nb> public class GeoBoundingBoxQueryParser implements QueryParser {
 throw new QueryParsingException ( parseContext , STRING0 , NAME , GeoPointFieldMapper . CONTENT_TYPE , fieldName ) ;
 }
 if ( ! ( fieldType instanceof GeoPointFieldMapper . GeoPointFieldType ) ) {
 - throw new QueryParsingException ( parseContext , STRING1 , NAME , fieldName , GeoPointFieldMapper . CONTENT_TYPE , fieldType . names ( ) . shortName ( ) ) ;
 + throw new QueryParsingException ( parseContext , STRING1 , NAME , fieldName , GeoPointFieldMapper . CONTENT_TYPE , fieldType . typeName ( ) ) ;
 }
 GeoPointFieldMapper . GeoPointFieldType geoFieldType = ( ( GeoPointFieldMapper . GeoPointFieldType ) fieldType ) ;


<nb> public class RippleDrawable extends LayerDrawable {
 final ChildDrawable [ ] array = mLayerState . mChildren ;
 final int count = mLayerState . mNum ;

 - SINGLE
 - SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 boolean needsLayer = false ;
 - if ( ( mExitingRipplesCount > NUMBER0 || mBackground != null ) && mMask == null ) {
 + if ( ( mExitingRipplesCount > NUMBER0 || ( mBackground != null && mBackground . shouldDraw ( ) ) )
 + && mMask == null ) {
 for ( int i = NUMBER0 ; i < count ; i ++ ) {
 if ( array [ i ] . mId != R . id . mask
 && array [ i ] . mDrawable . getOpacity ( ) != PixelFormat . OPAQUE ) {

Avoid saveLayer in RippleDrawable if the background won t draw


<nb> public class RecyclerView extends ViewGroup implements ScrollingView , NestedScro

 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public class RecyclerView extends ViewGroup implements ScrollingView , NestedScro
 }

 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT

Fix two grammar errors in RecyclerView documentation


<nb> public class GrammaticalStructureTest extends TestCase {
 SINGLE
 String [ ] testAnswers = new String [ ] {
 STRING0 ,
 - STRING1
 + STRING2
 } ;

 SINGLE
 String [ ] testAnswersCollapsed = new String [ ] {
 STRING0 ,
 - STRING3
 + STRING4

 } ;

 SINGLE
 String [ ] testAnswersCCProcessed = new String [ ] {
 STRING0 ,
 - STRING3
 + STRING4
 } ;

 for ( int i = NUMBER0 ; i < testTrees . length ; i ++ ) {

Fix up another unittest for dependencies now that rel is gone


<nb> public class OreDictionary
 new ItemStack ( Blocks . jungle_stairs ) ,
 new ItemStack ( Blocks . acacia_stairs ) ,
 new ItemStack ( Blocks . dark_oak_stairs ) ,
 - new ItemStack ( Blocks . glass_pane ) ,
 - new ItemStack ( Blocks . stained_glass )
 + new ItemStack ( Blocks . glass_pane )
 } ;

 List < IRecipe > recipes = CraftingManager . getInstance ( ) . getRecipeList ( ) ;

Removed exclusion of white stained glass recipes in ore dictionary


<nb>
 package NAMESPACE ;

 import static NAMESPACE ;
 -
 - import NAMESPACE ;
 - import NAMESPACE ;
 -
 import NAMESPACE ;
 import NAMESPACE ;

 - import NAMESPACE ;
 -
 - @ runwith ( RobolectricTestRunner . class )
 + SINGLE
 public class ResActivityTest {

 private ResActivity_ activity ;

 - @ before
 + SINGLE
 public void setup ( ) {
 activity = new ResActivity_ ( ) ;
 activity . onCreate ( null ) ;
 <nb> public class ResActivityTest {
 COMMENT
 COMMENT
 COMMENT
 - SINGLE
 + SINGLE
 public void animNotNull ( ) {
 assertThat ( activity . fadein ) . isNotNull ( ) ;
 }

Disabled failing test waiting for more shadow classes in robolectric


<nb> import NAMESPACE
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 -
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> import NAMESPACE
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 -
 import NAMESPACE ;
 import NAMESPACE ;


<nb> public class Mesh {
 COMMENT
 public Mesh ( VertexDataType type , boolean isStatic , int maxVertices ,
 int maxIndices , VertexAttribute . . . attributes ) {
 + if ( type == VertexDataType . VertexArray && Gdx . graphics . isGL20Available ( ) )
 + type = VertexDataType . VertexBufferObject ;
 +
 if ( type == VertexDataType . VertexBufferObject ) {
 vertices = new VertexBufferObject ( isStatic , maxVertices , attributes ) ;
 indices = new IndexBufferObject ( isStatic , maxIndices ) ;


<nb> public abstract class Plugin implements IPlugin {
 public void onActivityResult ( int requestCode , int resultCode , Intent intent ) {
 }

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 public boolean onOverrideUrlLoading ( String url ) {
 return false ;
 }

Add comment for method onOverrideUrlLoading


<nb> public class PingThread extends Thread
 SINGLE
 response = connection . sendAction ( new PingAction ( ) , timeout ) ;
 SINGLE
 - logger . debug ( STRING0 + response ) ;
 + SINGLE
 }
 }
 catch ( Exception e )
 {
 - System . out . println ( STRING1 ) ;
 + SINGLE
 logger . warn ( STRING2 , e ) ;
 }
 }


<nb> public final class TypeFactory
 SINGLE
 throw new IllegalArgumentException ( STRING0 + ( ( type == null ) ? STRING1 : type . toString ( ) ) ) ;
 }
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - if ( _modifiers != null && ! resultType . isContainerType ( ) ) {
 + COMMENT
 + if ( _modifiers != null ) {
 TypeBindings b = resultType . getBindings ( ) ;
 if ( b == null ) {
 b = EMPTY_BINDINGS ;

When applying type modifiers don t ignore container types


<nb> final class SettingsEditor extends AbstractEditor implements DataProvider {
 size . width = myTreeView . getWidth ( ) - NUMBER0 ;
 mySearch . setPreferredSize ( size ) ;
 mySearch . setSize ( size ) ;
 + mySearch . revalidate ( ) ;
 + mySearch . repaint ( ) ;
 }
 } ) ;
 myEditor = new ConfigurableEditor ( this , null , true ) {


<nb>

 package NAMESPACE ;

 - import NAMESPACE ;
 -
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;


<nb> public class ServerInit
 final long memoryNeeded = ( long ) config . intermediateComputeSizeBytes ( ) * ( config . getNumThreads ( ) + NUMBER0 ) ;
 if ( maxDirectMemory < memoryNeeded ) {
 throw new ISE (
 - STRING0
 + STRING1
 + STRING2 ,
 maxDirectMemory , memoryNeeded , config . intermediateComputeSizeBytes ( ) , config . getNumThreads ( )
 ) ;

Fix direct memory vm option name in warning message


<nb> public class ActivityShare extends Activity {
 SINGLE
 List < Boolean > oldState = mListRestartStates . get ( lastUid ) ;
 List < Boolean > newState = PrivacyManager . getListStateRestartHooks ( lastUid , null ) ;
 - if ( ! newState . equals ( oldState ) )
 - mAppAdapter . setMessage ( lastUid , getString ( R . string . msg_restart ) ) ;

 SINGLE
 - mAppAdapter . setState ( lastUid , STATE_SUCCESS , null ) ;
 + mAppAdapter . setState ( lastUid , STATE_SUCCESS ,
 + ! newState . equals ( oldState ) ? getString ( R . string . msg_restart ) : null ) ;
 }
 }


<nb> public class UsageViewImpl implements UsageView , UsageModelTracker . UsageModelTra
 public void setSearchInProgress ( boolean searchInProgress ) {
 mySearchInProgress = searchInProgress ;
 if ( ! myPresentation . isDetachedMode ( ) ) {
 - UIUtil . invokeLaterIfNeeded ( new Runnable ( ) {
 + myTransferToEDTQueue . offer ( new Runnable ( ) {
 @ override
 public void run ( ) {
 if ( isDisposed ) return ;

expand the usage view tree when creating it with predefined usages e g from Goto Class


<nb> public class BindingTest {
 }
 }

 - @ ignore SINGLE
 - @ test ( expected = PersistenceException . class )
 + @ test SINGLE
 public void shouldFailWhenSelectingOneBlogWithNonExistentNestedParam ( ) {
 SqlSession session = sqlSessionFactory . openSession ( ) ;
 try {


<nb> public class ContextMenuUtilsTest extends TerasologyTestingEnvironment {
 }

 private Class getNodeType ( JsonTree node ) {
 - return NUIEditorNodeUtils . getNodeInfo ( node , context . get ( NUIManager . class ) ) ;
 + return NUIEditorNodeUtils . getNodeInfo ( node , context . get ( NUIManager . class ) ) . getNodeClass ( ) ;
 }
 }


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;

 import NAMESPACE ;

 <nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - @ mediumtest
 public class AbstractInjectorGrapherTest extends TestCase {
 private static final String TEST_STRING = STRING0 ;

Remove MediumTest annotation since it is not available on the build classpath


<nb> public class GlobalSettings {
 new V ( NUMBER0 , new BooleanSetting ( false ) )
 ) ) ;
 s . put ( STRING0 , Settings . versions (
 - new V ( NUMBER1 , new BooleanSetting ( false ) )
 + new V ( NUMBER2 , new BooleanSetting ( false ) )
 ) ) ;
 s . put ( STRING1 , Settings . versions (
 new V ( NUMBER3 , new BooleanSetting ( true ) )
 <nb> public class Settings {
 COMMENT
 COMMENT
 COMMENT
 - public static final int VERSION = NUMBER1 ;
 + public static final int VERSION = NUMBER2 ;

 public static Map < String , Object > validate ( int version , Map < String ,
 TreeMap < Integer , SettingsDescription > > settings ,

Readjust settings version number based on current master


<nb> public final class Detector {
 }
 }
 }
 + start ++ ;

 SINGLE
 int end = center ;
 <nb> public final class Detector {
 }
 }
 }
 + end -- ;

 if ( end > start ) {
 return new int [ ] { start , end } ;

Address a small but clear bug in detector logic


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 - import NAMESPACE ;
 -
 import static NAMESPACE ;

 public class GoHighlightingAnnotator implements Annotator {
 <nb> public class GoHighlightingAnnotator implements Annotator {
 public void annotate ( @ notnull PsiElement o , @ notnull AnnotationHolder holder ) {
 if ( ! o . isValid ( ) ) return ;
 if ( o instanceof GoImportSpec && ( ( GoImportSpec ) o ) . isDot ( ) ) {
 - List < ? extends PsiElement > importUsers = o . getUserData ( GoReference . IMPORT_USERS ) ;
 - if ( importUsers != null ) {
 - importUsers . clear ( ) ;
 - }
 + o . putUserData ( GoReference . IMPORT_USERS , null ) ;
 }
 else if ( o instanceof GoLiteral ) {
 if ( ( ( GoLiteral ) o ) . getHex ( ) != null || ( ( GoLiteral ) o ) . getOct ( ) != null ) {


<nb> public class ThemeBrowserFragment extends Fragment implements RecyclerListener ,
 protected static final int THEME_FILTER_FREE_INDEX = NUMBER0 ;
 protected static final int THEME_FILTER_PREMIUM_INDEX = NUMBER1 ;

 + protected SwipeToRefreshHelper mSwipeToRefreshHelper ;
 private String mCurrentThemeId ;
 private HeaderGridView mGridView ;
 private RelativeLayout mEmptyView ;
 <nb> public class ThemeBrowserFragment extends Fragment implements RecyclerListener ,
 private Spinner mSpinner ;
 private ThemeBrowserFragmentCallback mCallback ;
 private int mPage = NUMBER0 ;
 - private SwipeToRefreshHelper mSwipeToRefreshHelper ;
 private boolean mShouldRefreshOnStart ;
 private TextView mEmptyTextView ;

Fixing swipeToRefreshHelper access for ThemeSearchFragment


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;

 COMMENT
 COMMENT
 <nb> public class ComponentManager {
 }
 }

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + public void sendPacket ( Packet packet ) {
 + PacketRouter router ;
 + try {
 + router = ( PacketRouterImpl ) ServiceLookupFactory . getLookup ( ) . lookup ( PacketRouterImpl . class ) ;
 + if ( router != null ) {
 + SINGLE
 + }
 + }
 + catch ( UnauthorizedException e ) {
 + Log . error ( e ) ;
 + }
 + }
 +
 private String validateJID ( String jid ) {
 jid = jid . trim ( ) . toLowerCase ( ) ;
 return jid ;

Removing impl classes and updating admin


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class CppLinkActionTest extends BuildViewTestCase {
 scratch . file ( STRING0 ) ;

 ConfiguredTarget configuredTarget = getConfiguredTarget ( STRING1 ) ;
 - CppLinkAction linkAction = ( CppLinkAction ) getGeneratingAction ( configuredTarget , STRING2 ) ;
 + CppLinkAction linkAction = ( CppLinkAction ) getGeneratingAction ( configuredTarget , STRING2
 + + OsUtils . executableExtension ( ) ) ;

 List < String > arguments = linkAction . getLinkCommandLine ( ) . arguments ( ) ;


<nb> public class MessageView extends K9Activity implements OnClickListener {
 private void clearMessageDisplay ( ) {
 mTopView . setVisibility ( View . GONE ) ;
 mTopView . scrollTo ( NUMBER0 , NUMBER0 ) ;
 - mMessageView . setLoadPictures ( false ) ;
 -
 mMessageView . resetView ( ) ;

 }
 <nb> public class SingleMessageView extends LinearLayout {

 public void resetView ( ) {
 -
 + setLoadPictures ( false ) ;
 mMessageContentView . scrollTo ( NUMBER0 , NUMBER0 ) ;
 mHeaderContainer . setVisibility ( View . GONE ) ;
 mMessageContentView . clearView ( ) ;


<nb> public class TestQueryRecordLockUnlock {
 db . close ( ) ;
 }
 }
 - System . out . println ( Thread . currentThread ( ) . getName ( ) + STRING0 ) ;
 }
 } ) ;
 }
 <nb> public class TestQueryRecordLockUnlock {
 db . close ( ) ;
 }
 }
 - System . out . println ( Thread . currentThread ( ) . getName ( ) + STRING0 ) ;
 }
 } ) ;
 }
 <nb> public class TestQueryRecordLockUnlock {
 }
 }
 }
 - System . out . println ( Thread . currentThread ( ) . getName ( ) + STRING0 ) ;
 }
 } ) ;
 }

removed not useful system out from test cases


<nb> public class FactoryImpl implements HazelcastInstance {
 proxyFactory = node . initializer . getProxyFactory ( ) ;
 logger = node . getLogger ( FactoryImpl . class . getName ( ) ) ;
 hazelcastInstanceProxy = new HazelcastInstanceProxy ( this ) ;
 - locksMapProxy = proxyFactory . createMapProxy ( Prefix . LOCKS_MAP_HAZELCAST ) ;
 node . start ( ) ;
 if ( ! node . isActive ( ) ) {
 node . connectionManager . shutdown ( ) ;
 throw new IllegalStateException ( STRING0 ) ;
 }
 + locksMapProxy = proxyFactory . createMapProxy ( Prefix . MAP_HAZELCAST + STRING1 ) ;
 + node . clusterService . enqueueAndReturn ( new Processable ( ) {
 + public void process ( ) {
 + node . concurrentMapManager . getOrCreateMap ( locksMapProxy . getLongName ( ) ) ;
 + }
 + } ) ;

 final Set < Member > members = node . getClusterImpl ( ) . getMembers ( ) ;
 if ( members . size ( ) > NUMBER0 ) {

Fix NPE while calling lock from lite member


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;

 COMMENT
 COMMENT
 <nb> public class ConnectHandler implements CommandHandler {

 if ( port >= NUMBER0 ) {
 try {
 - ModelControllerClient client = ModelControllerClient . Factory . create ( InetAddress . getByName ( host ) , port ) ;
 + ModelControllerClient client = ModelControllerClient . Factory . create ( Type . STANDALONE , InetAddress . getByName ( host ) , port ) ;
 ctx . setModelControllerClient ( client ) ;
 ctx . log ( STRING0 + host + STRING1 + port ) ;
 } catch ( UnknownHostException e ) {

Temporarily use Type STANDALONE for the CLI client


<nb> public class ThriftToPig < M extends TBase < ? , ? > > {
 case TType . SET :
 return new FieldSchema ( fieldName , singleFieldToTupleSchema ( fieldName + STRING0 , field . getSetElemField ( ) ) , DataType . BAG ) ;
 case TType . MAP :
 - SINGLE
 if ( field . getMapKeyField ( ) . getType ( ) != TType . STRING
 && field . getMapKeyField ( ) . getType ( ) != TType . ENUM ) {
 LOG . warn ( STRING1 + field . getName ( )


<nb> public class HttpHeaders {
 return httpHeaderList ;
 }

 - public String get ( Object key ) {
 - throw new UnsupportedOperationException ( ) ;
 - }
 -
 public String put ( String key , String value ) {
 headers . put ( key , value ) ;
 return value ;

Removed HttpHeaders get legacy of Map implementation


<nb> public class GridActivity extends Activity {
 public static final String EXTRA_STAGGERED = STRING0 ;
 public static final String SELECT_ACTION = STRING1 ;

 - static final int DEFAULT_LAYOUT_RESOURCE_ID = R . layout . horizontal_grid ;
 static final int DEFAULT_NUM_ITEMS = NUMBER0 ;
 static final boolean DEFAULT_STAGGERED = true ;

 <nb> public class GridActivity extends Activity {
 protected void onCreate ( Bundle savedInstanceState ) {
 Intent intent = getIntent ( ) ;

 - mLayoutId = intent . getIntExtra ( EXTRA_LAYOUT_RESOURCE_ID , DEFAULT_LAYOUT_RESOURCE_ID ) ;
 + mLayoutId = intent . getIntExtra ( EXTRA_LAYOUT_RESOURCE_ID , R . layout . horizontal_grid ) ;
 mStaggered = intent . getBooleanExtra ( EXTRA_STAGGERED , DEFAULT_STAGGERED ) ;
 mItemLengths = intent . getIntArrayExtra ( EXTRA_ITEMS ) ;
 if ( mItemLengths == null ) {


<nb> public class CompilerOptions {
 this . closurePass = closurePass ;
 }

 - @ deprecated
 - public void setPreserveGoogRequires ( boolean preserveGoogProvidesAndRequires ) {
 - setPreserveGoogProvidesAndRequires ( preserveGoogProvidesAndRequires ) ;
 - }
 -
 public void setPreserveGoogProvidesAndRequires ( boolean preserveGoogProvidesAndRequires ) {
 this . preserveGoogProvidesAndRequires = preserveGoogProvidesAndRequires ;
 }
 <nb> public final class RefactoringDriver {
 options . setCheckTypes ( true ) ;
 options . setClosurePass ( true ) ;
 options . setGenerateExports ( true ) ;
 - options . setPreserveGoogRequires ( true ) ;
 + options . setPreserveGoogProvidesAndRequires ( true ) ;

 options . setWarningLevel ( DiagnosticGroups . MISSING_REQUIRE , CheckLevel . ERROR ) ;

 <nb> public final class CodePrinterTest extends CodePrinterTestBase {
 compilerOptions . setCheckTypes ( true ) ;
 compilerOptions . setClosurePass ( true ) ;
 compilerOptions . setIdeMode ( true ) ;
 - compilerOptions . setPreserveGoogRequires ( true ) ;
 + compilerOptions . setPreserveGoogProvidesAndRequires ( true ) ;
 Compiler compiler = new Compiler ( ) ;
 compiler . disableThreads ( ) ;
 compiler . compile (

Remove deprecated method setPreserveGoogRequires


<nb> public class ConnectivityService extends IConnectivityManager . Stub {
 mInetConditionChangeInFlight = false ;
 SINGLE
 SINGLE
 + updateNetworkSettings ( thisNet ) ;
 }
 thisNet . setTeardownRequested ( false ) ;
 - updateNetworkSettings ( thisNet ) ;
 updateMtuSizeSettings ( thisNet ) ;
 handleConnectivityChange ( newNetType , false ) ;
 sendConnectedBroadcastDelayed ( info , getConnectivityChangeDelay ( ) ) ;
 <nb> public class ConnectivityService extends IConnectivityManager . Stub {
 case NetworkStateTracker . EVENT_NETWORK_SUBTYPE_CHANGED : {
 info = ( NetworkInfo ) msg . obj ;
 int type = info . getType ( ) ;
 - updateNetworkSettings ( mNetTrackers [ type ] ) ;
 + if ( mNetConfigs [ type ] . isDefault ( ) ) updateNetworkSettings ( mNetTrackers [ type ] ) ;
 break ;
 }
 }

Only apply tcp buffer sizes for default net


<nb>
 COMMENT
 package NAMESPACE ;

 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 <nb> public interface EmbeddedTokenTypesProvider {

 String getName ( ) ;
 IElementType getElementType ( ) ;
 + Language getLanguage ( ) ;
 }

added getLanguage for embeddedTokenTypesProviders


<nb> public class AuthConfig {

 @ override
 public String getAuthorizationUrl ( OAuthConfig arg0 ) {
 - SINGLE
 return null ;
 }

 @ override
 public String getAccessTokenEndpoint ( ) {
 - SINGLE
 return null ;
 }
 } ;


<nb> package NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;

 import NAMESPACE ;

 <nb> import NAMESPACE ;
 COMMENT
 COMMENT
 @ incubating
 - public interface BasicGradleProject {
 + public interface BasicGradleProject extends Model {
 COMMENT
 COMMENT
 COMMENT

Remove false extensions of Model interface


<nb>
 package NAMESPACE ;

 - import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 import NAMESPACE ;
 <nb> class ZLSwingPanel extends JPanel {

 public void paint ( Graphics g ) {
 super . paint ( g ) ;
 + ( ( Graphics2D ) g ) . setRenderingHint ( RenderingHints . KEY_ANTIALIASING , RenderingHints . VALUE_ANTIALIAS_ON ) ;
 ZLView view = myViewWidget . getView ( ) ;
 ZLSwingPaintContext context = ( ZLSwingPaintContext ) view . getContext ( ) ;
 context . setGraphics ( g ) ;

Anti aliasing is switched on in swing paint context


<nb> public class AstridActivity extends FragmentActivity
 SINGLE
 long taskId = intent . getLongExtra ( NotificationFragment . TOKEN_ID , NUMBER0 ) ;
 TaskEditFragment tef = getTaskEditFragment ( ) ;
 - if ( tef != null && tef . getTaskIdInProgress ( ) == taskId )
 + if ( tef != null )
 return ;

 if ( taskId > NUMBER0 ) {

Don t pop up the in app reminders when editing a task


<nb> import NAMESPACE ;
 COMMENT
 public final class Tools {

 + private static Calendar cal = Calendar . getInstance ( ) ;
 +
 private Tools ( ) { }

 COMMENT
 <nb> public final class Tools {
 java . util . Collections . sort ( list ) ;
 return list ;
 }
 +
 + SINGLE
 + SINGLE
 + public static String buildElasticSearchTimeFormat ( double timestamp ) {
 + cal . setTimeInMillis ( System . currentTimeMillis ( ) ) ;

 + return String . format ( STRING0 , cal ) ; SINGLE
 + }
 +
 }


<nb> public final class Model implements Comparable < Model > {
 }

 public Model removeCharacteristic ( Characteristic characteristic ) {
 - characteristic . setEnabled ( false ) ;
 + if ( characteristic . getId ( ) == null ) {
 + characteristics . remove ( characteristic ) ;
 + for ( Characteristic parent : characteristic . getParents ( ) ) {
 + parent . removeChild ( characteristic ) ;
 + }
 + } else {
 + characteristic . setEnabled ( false ) ;
 + }
 for ( Characteristic child : characteristic . getChildren ( ) ) {
 removeCharacteristic ( child ) ;
 }

removeCharacteristic must support disabled characteristics


<nb> public class ConsoleExecuteActionHandler {
 public void finishExecution ( ) {
 }

 + public final boolean isProcessTerminated ( ) {
 + final ProcessHandler handler = getProcessHandler ( ) ;
 + return handler == null || handler . isProcessTerminated ( ) ;
 + }
 +
 public String getEmptyExecuteAction ( ) {
 return STRING0 ;
 }


<nb> public class Sample {
 return ( m0 < m1 ) ? m0 : m1 ;
 }

 + public double evalWalkDistance ( ShortestPathTree spt ) {
 + State s0 = spt . getState ( v0 ) ;
 + State s1 = spt . getState ( v1 ) ;
 + double m0 = Double . NaN ;
 + double m1 = Double . NaN ;
 + SINGLE
 + SINGLE
 + double walkSpeed = spt . getOptions ( ) . walkSpeed ;
 + if ( s0 != null )
 + m0 = ( s0 . getWalkDistance ( ) + t0 * walkSpeed ) ;
 + if ( s1 != null )
 + m1 = ( s1 . getWalkDistance ( ) + t1 * walkSpeed ) ;
 + return ( m0 < m1 ) ? m0 : m1 ;
 + }
 +
 COMMENT
 public long eval ( TimeSurface surf ) {
 int m0 = Integer . MAX_VALUE ;


<nb> public class MyDecorator implements Greeting {

 @ override
 public String greet ( String name ) {
 - System . out . println ( getClass ( ) . getName ( ) + STRING0 ) ;
 - return greeting . greet ( name + name ) ;
 + return greeting . greet ( name + STRING1 ) ;
 }

 }

Made the decorator slightly more meaningful


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class PreviewImageActivity extends FileActivity implements

 switch ( item . getItemId ( ) ) {
 case android . R . id . home :
 - backToDisplayActivity ( ) ;
 + if ( mDrawerLayout . isDrawerOpen ( GravityCompat . START ) ) {
 + mDrawerLayout . closeDrawer ( GravityCompat . START ) ;
 + } else {
 + backToDisplayActivity ( ) ;
 + }
 returnValue = true ;
 break ;
 default :

Fixed home button in action bar for PreviewImageActvitiy when navigation drawer is shown


<nb> import NAMESPACE ;
 @ incubating
 public interface PublishingExtension {

 + COMMENT
 + COMMENT
 + COMMENT
 + String NAME = STRING0 ;
 +
 RepositoryHandler getRepositories ( ) ;

 void repositories ( Action < RepositoryHandler > configure ) ;
 <nb> public class PublishingPlugin implements Plugin < Project > {
 public void apply ( Project project ) {
 RepositoryHandler repositories = artifactPublicationServices . getRepositoryHandler ( ) ;
 PublicationContainer publications = instantiator . newInstance ( DefaultPublicationContainer . class , instantiator ) ;
 - project . getExtensions ( ) . create ( STRING0 , DefaultPublishingExtension . class , repositories , publications ) ;
 + project . getExtensions ( ) . create ( PublishingExtension . NAME , DefaultPublishingExtension . class , repositories , publications ) ;
 }
 }

Use a constant for the publishing extension name


<nb> public class SliceQueryFilter implements IDiskAtomFilter
 container . addColumn ( column ) ;
 }

 - Tracing . trace ( STRING0 , columnCounter . live ( ) , columnCounter . ignored ( ) ) ;
 + Tracing . trace ( STRING1 , columnCounter . live ( ) , columnCounter . ignored ( ) ) ;
 }

 public int getLiveCount ( ColumnFamily cf )


<nb> class BackupManagerService extends IBackupManager . Stub {
 mTransports . put ( name , transport ) ;
 } else {
 mTransports . remove ( name ) ;
 - if ( ( mCurrentTransport != null ) && mCurrentTransport . equals ( name ) ) {
 - mCurrentTransport = null ;
 - }
 SINGLE
 return ;
 }

Don t assume that transport unbind transport invalid


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;


<nb> public class SaslServerFactoryImpl implements SaslServerFactory
 {
 allMechanisms = new HashSet < > ( ) ;
 allMechanisms . add ( new Mechanism ( STRING0 , true , true ) ) ;
 - allMechanisms . add ( new Mechanism ( STRING1 , false , false ) ) ;
 + allMechanisms . add ( new Mechanism ( STRING2 , false , false ) ) ;
 allMechanisms . add ( new Mechanism ( STRING3 , true , false ) ) ;
 allMechanisms . add ( new Mechanism ( STRING4 , false , false ) ) ;
 }
 <nb> public class SaslServerFactoryImpl implements SaslServerFactory
 }
 return new SaslServerPlainImpl ( protocol , serverName , props , cbh ) ;

 - case STRING1 :
 + case STRING2 :
 return new ScramSha1SaslServer ( ) ;

 case STRING5 :


<nb> public class UpgradeReallyOldIndexTest extends ElasticsearchIntegrationTest {
 File dataDir = prepareBackwardsDataDir ( new File ( getClass ( ) . getResource ( STRING0 ) . toURI ( ) ) ) ;
 internalCluster ( ) . startNode ( ImmutableSettings . builder ( )
 . put ( STRING1 , dataDir . getPath ( ) )
 - . put ( STRING2 , STRING3 )
 . put ( STRING4 , STRING5 ) SINGLE
 . put ( InternalNode . HTTP_ENABLED , true )
 . build ( ) ) ;

TEST Remove explicit network mode not needed here


<nb> public class BsdArchiver implements Archiver {

 if ( descriptorsSize > NUMBER0 ) {

 - SINGLE
 - if ( descriptorsSize > NUMBER1 ) {
 - file . position ( file . position ( ) + descriptorsSize - NUMBER1 ) ;
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + int lastSymbolNameOffset = NUMBER0 ;
 + for ( int i = NUMBER0 ; i < descriptorsSize / NUMBER1 ; i ++ ) {
 + lastSymbolNameOffset =
 + Math . max (
 + lastSymbolNameOffset ,
 + ObjectFileScrubbers . getLittleEndian32BitLong ( file ) ) ;
 + SINGLE
 + ObjectFileScrubbers . getLittleEndian32BitLong ( file ) ;
 }

 - int lastSymbolNameOffset = ObjectFileScrubbers . getLittleEndian32BitLong ( file ) ;
 - SINGLE
 - ObjectFileScrubbers . getLittleEndian32BitLong ( file ) ;
 -
 int symbolNameTableSize = ObjectFileScrubbers . getLittleEndian32BitLong ( file ) ;
 int endOfSymbolNameTableOffset = file . position ( ) + symbolNameTableSize ;

Make BsdScrubber work with sorted symbol tables


<nb> public class Interceptors extends BlockJUnit4ClassRunner {
 @ override
 protected Statement withBefores ( FrameworkMethod method , Object target ,
 Statement statement ) {
 - SINGLE
 return super . withBefores ( method , target , intercept ( statement , target , method ) ) ;
 }

 <nb> public class TestWatchman implements StatementInterceptor {
 public void succeeded ( FrameworkMethod method ) {
 }

 - SINGLE
 - SINGLE
 public void failed ( Throwable e , FrameworkMethod method ) {
 }

 <nb> public class MaxCore {
 } finally {
 try {
 fHistory . save ( ) ;
 - } catch ( FileNotFoundException e ) {
 - SINGLE
 - e . printStackTrace ( ) ;
 } catch ( IOException e ) {
 SINGLE
 e . printStackTrace ( ) ;


<nb> public class RouteCalculationResult {
 RouteDirectionInfo info = new RouteDirectionInfo ( s . getSegmentSpeed ( ) , turn ) ;
 if ( routeInd < list . size ( ) ) {
 int lind = routeInd ;
 - if ( turn . isRoundAbout ( ) && routeInd + NUMBER0 < list . size ( ) ) {
 - SINGLE
 - lind = routeInd + NUMBER0 ;
 + if ( turn . isRoundAbout ( ) ) {
 + SINGLE
 + while ( lind < list . size ( ) - NUMBER0 && list . get ( lind ) . getObject ( ) . roundabout ( ) ) {
 + lind ++ ;
 + }
 }
 RouteSegmentResult next = list . get ( lind ) ;
 info . setRef ( next . getObject ( ) . getRef ( ) ) ;


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class JmsComponent extends DefaultComponent implements ApplicationContext
 SINGLE
 String strategy = getAndRemoveParameter ( parameters , STRING0 , String . class ) ;
 if ( strategy != null ) {
 - if ( isReferenceParameter ( strategy ) ) {
 + if ( EndpointHelper . isReferenceParameter ( strategy ) ) {
 String key = strategy . substring ( NUMBER0 ) ;
 endpoint . setJmsKeyFormatStrategy ( lookup ( key , JmsKeyFormatStrategy . class ) ) ;
 } else {
 <nb> public class JmsComponent extends DefaultComponent implements ApplicationContext
 endpoint . setHeaderFilterStrategy ( getHeaderFilterStrategy ( ) ) ;

 return endpoint ;
 - }
 + }

 COMMENT
 COMMENT


<nb> public class Drawer {
 }
 }

 + SINGLE
 + if ( mFooterView != null ) {
 + if ( mListView == null ) {
 + throw new RuntimeException ( STRING0 ) ;
 + }
 +
 + if ( mHeaderDivider ) {
 + LinearLayout footerContainer = ( LinearLayout ) mActivity . getLayoutInflater ( ) . inflate ( R . layout . drawer_item_footer , null , false ) ;
 + footerContainer . addView ( mFooterView , NUMBER0 ) ;
 + mListView . addFooterView ( footerContainer ) ;
 + } else {
 + mListView . addFooterView ( mFooterView ) ;
 + }
 + }
 +
 SINGLE
 if ( mAdapter != null ) {
 SINGLE


<nb> public class NewWallpaperNotificationReceiver extends BroadcastReceiver {
 int width = options . outWidth ;
 int height = options . outHeight ;
 int shortestLength = Math . min ( width , height ) ;
 - options = new BitmapFactory . Options ( ) ;
 + options . inJustDecodeBounds = false ;
 int largeIconHeight = context . getResources ( )
 . getDimensionPixelSize ( android . R . dimen . notification_large_icon_height ) ;
 options . inSampleSize = ImageUtil . calculateSampleSize ( shortestLength , largeIconHeight ) ;

Remove unnecessary creation of new BitmapFactory Options


<nb> public class OGraphDatabase extends ODatabaseDocumentTx {
 delete ( edge ) ;
 }
 }
 - edges . clear ( ) ;
 - iVertex . field ( VERTEX_FIELD_OUT , edges ) ;
 }

 SINGLE
 <nb> public class OGraphDatabase extends ODatabaseDocumentTx {
 delete ( edge ) ;
 }
 }
 - edges . clear ( ) ;
 - iVertex . field ( VERTEX_FIELD_IN , edges ) ;
 }

 SINGLE

Committed patch by Thomas about OGraphDatabase removeVertex to leave the edge collection and let to the hooks to manage it


<nb> public abstract class AbstractOutputBuffer < S > implements OutputBuffer {
 COMMENT
 COMMENT
 COMMENT
 - protected final OutputBuffer outputStreamOutputBuffer ;
 + protected OutputBuffer outputStreamOutputBuffer ;

 COMMENT
 COMMENT


<nb> public abstract class TripTimes {
 Trip trip = this . getTrip ( ) ;
 BannedStopSet banned = options . bannedTrips . get ( trip . getId ( ) ) ;
 if ( banned != null ) {
 - if ( banned . contains ( stopIndex ) || banned == BannedStopSet . ALL ) {
 + if ( banned . contains ( stopIndex ) ) {
 return false ;
 }
 }


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 - import NAMESPACE ;
 -
 import static NAMESPACE ;

 COMMENT


<nb> public class PluginResolverFactory implements Factory < PluginResolver > {
 }

 resolvers . add ( pluginResolutionServiceResolver ) ;
 - if ( System . getProperties ( ) . containsKey ( STRING0 ) ) {
 - resolvers . add ( customRepositoryPluginResolver ) ;
 - }
 + resolvers . add ( customRepositoryPluginResolver ) ;
 }
 }

Don t check custom plugin repo url too early


<nb> public class DelayerTest extends ContextTestSupport {
 MockEndpoint resultEndpoint = resolveMandatoryEndpoint ( STRING0 , MockEndpoint . class ) ;
 resultEndpoint . expectedMessageCount ( NUMBER0 ) ;
 SINGLE
 - resultEndpoint . setMinimumResultWaitTime ( NUMBER1 ) ;
 + resultEndpoint . setMinimumResultWaitTime ( NUMBER2 ) ;
 template . sendBody ( STRING1 , STRING2 ) ;
 resultEndpoint . assertIsSatisfied ( ) ;
 }


<nb> public abstract class CallPeerMediaHandler
 for ( MediaType mediaType : MediaType . values ( ) )
 {
 MediaStream stream = getStream ( mediaType ) ;
 +
 + if ( stream == null )
 + continue ;
 +
 MediaDevice oldDevice = stream . getDevice ( ) ;

 if ( oldDevice != null )

Fixes a NullPointerException which prevented establishing calls


<nb> public class PatternAlight extends AbstractEdge {
 c . set ( Calendar . MILLISECOND , NUMBER0 ) ;
 return c . getTime ( ) ;
 }
 +
 + public TripPattern getPattern ( ) {
 + return pattern ;
 + }
 +
 + public int getStopIndex ( ) {
 + return stopIndex ;
 + }
 }
 <nb> public class PatternBoard extends AbstractEdge {
 c . set ( Calendar . MILLISECOND , NUMBER0 ) ;
 return c . getTime ( ) ;
 }
 +
 + public TripPattern getPattern ( ) {
 + return pattern ;
 + }
 +
 + public int getStopIndex ( ) {
 + return stopIndex ;
 + }
 }
 <nb> public final class TripPattern implements Serializable {
 Vector < Integer > stopDwellTimes = dwellTimes [ stopIndex ] ;
 stopDwellTimes . set ( pattern , dwellTime ) ;
 }
 +
 + public Vector < Integer > getDepartureTimes ( int stopIndex ) {
 + return departureTimes [ stopIndex ] ;
 + }
 }

oops forgot these changes which are necessary for gui


<nb> public class UIUtil {
 }

 final TreePath pressedPath = getClosestPathForLocation ( tree , e . getX ( ) , e . getY ( ) ) ;
 - if ( tree . isPathSelected ( pressedPath ) ) return ;
 + if ( tree . isPathSelected ( pressedPath ) && ( e . getModifiers ( ) & MouseEvent . META_MASK ) != MouseEvent . META_MASK ) return ;

 if ( pressedPath != null ) {
 Rectangle bounds = getPathBounds ( tree , pressedPath ) ;
 <nb> public class UIUtil {

 tree . setShowsRootHandles ( true ) ;
 tree . addMouseListener ( mySelectionListener ) ;
 +
 + SINGLE
 + SINGLE
 }

 @ override

Command click no longer unselects item when multiple selected


<nb> public class ParticipantJoinRecordEvent extends AbstractParticipantRecordEvent {
 eventMap . put ( STRING0 , userId ) ;
 }

 + public void setName ( String name ) {
 + eventMap . put ( STRING1 , name ) ;
 + }
 +
 COMMENT
 COMMENT
 COMMENT
 <nb> public class ParticipantsEventRecorder implements IRoomListener {
 ParticipantJoinRecordEvent ev = new ParticipantJoinRecordEvent ( ) ;
 ev . setTimestamp ( System . currentTimeMillis ( ) ) ;
 ev . setUserId ( p . getInternalUserID ( ) . toString ( ) ) ;
 + ev . setName ( p . getName ( ) ) ;
 ev . setMeetingId ( session ) ;
 ev . setStatus ( p . getStatus ( ) . toString ( ) ) ;
 ev . setRole ( p . getRole ( ) ) ;

Added username for record in participants module


<nb> public class SplitterWithScannerIoExceptionTest extends ContextTestSupport {
 return ;
 }

 - getMockEndpoint ( STRING0 ) . expectedMessageCount ( NUMBER0 ) ;
 + getMockEndpoint ( STRING0 ) . expectedMinimumMessageCount ( NUMBER1 ) ;
 getMockEndpoint ( STRING1 ) . expectedMessageCount ( NUMBER2 ) ;
 getMockEndpoint ( STRING1 ) . setSleepForEmptyTest ( NUMBER3 ) ;
 getMockEndpoint ( STRING2 ) . expectedMessageCount ( NUMBER4 ) ;


<nb> public class TurnVertex extends StreetVertex {
 }

 public TurnEdge makeTurnEdge ( StreetVertex tov ) {
 + if ( tov instanceof TurnVertex ) {
 + return new TurnEdge ( this , ( TurnVertex ) tov ) ;
 + }
 return new TurnEdge ( this , tov ) ;
 }
 }

We have the type system we deserve not the type system we need


<nb> public abstract class Drawable {

 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT


<nb>
 package NAMESPACE ;

 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

Updated query test for new bson positions


<nb> public class DataSourceFactory {
 this . validationQueryTimeout = validationQueryTimeout ;
 }

 - public ManagedDataSource build ( MetricRegistry metricRegistry ,
 - String name ) throws ClassNotFoundException {
 + public ManagedDataSource build ( MetricRegistry metricRegistry , String name ) {
 final Properties properties = new Properties ( ) ;
 for ( Map . Entry < String , String > property : this . properties . entrySet ( ) ) {
 properties . setProperty ( property . getKey ( ) , property . getValue ( ) ) ;


<nb> public class AIMSICD extends BaseActivity implements AsyncResponse {
 }

 final String PERSIST_SERVICE = mContext . getString ( R . string . pref_persistservice_key ) ;
 - boolean persistService = prefs . getBoolean ( PERSIST_SERVICE , true ) ;
 + boolean persistService = prefs . getBoolean ( PERSIST_SERVICE , false ) ;
 if ( ! persistService ) {
 Intent intent = new Intent ( mContext , AimsicdService . class ) ;
 stopService ( intent ) ;

Fixed issue of having to check and uncheck Persistent Service in Preferences after fresh install


<nb> public class BCryptPasswordAlgorithm implements PasswordAlgorithm {

 @ override
 public boolean matches ( String hashedPasswordAndSalt , String otherPassword ) {
 - final Splitter splitter = Splitter . on ( SALTPREFIX ) ;
 - final List < String > splitted = splitter . splitToList ( hashedPasswordAndSalt ) ;
 - final String salt = splitted . get ( NUMBER0 ) ;
 + if ( supports ( hashedPasswordAndSalt ) ) {
 + final Splitter splitter = Splitter . on ( SALTPREFIX ) ;
 + final List < String > splitted = splitter . splitToList ( hashedPasswordAndSalt ) ;
 + final String salt = splitted . get ( NUMBER0 ) ;

 - return hash ( otherPassword , salt ) . equals ( hashedPasswordAndSalt ) ;
 + return hash ( otherPassword , salt ) . equals ( hashedPasswordAndSalt ) ;
 + } else {
 + throw new IllegalArgumentException ( STRING0 + this . PREFIX ) ;
 + }
 }
 }

Throwing exception if hashed password is not supported


<nb> public interface Project extends Comparable < Project > , ExtensionAware , PluginAwar
 COMMENT
 COMMENT
 COMMENT
 + @ incubating
 ModuleHandler getModules ( ) ;

 COMMENT
 <nb> public interface Project extends Comparable < Project > , ExtensionAware , PluginAwar
 COMMENT
 COMMENT
 COMMENT
 + @ incubating
 void modules ( Closure configureClosure ) ;

 COMMENT
 <nb>
 COMMENT
 package NAMESPACE ;

 + import NAMESPACE ;
 import NAMESPACE ;

 - SINGLE
 -
 COMMENT
 COMMENT
 COMMENT
 COMMENT
 + @ incubating
 public interface ModuleDetails {
 COMMENT
 COMMENT
 <nb>
 package NAMESPACE ;

 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 COMMENT
 COMMENT
 COMMENT
 + @ incubating
 public interface ModuleHandler {
 COMMENT
 COMMENT


<nb>
 COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 package NAMESPACE ;

 import NAMESPACE ;


<nb> public final class EditorImpl extends UserDataHolderBase implements EditorEx , Hi
 public void attributesChanged ( @ notnull RangeHighlighterEx highlighter , boolean renderersChanged ) {
 if ( myDocument . isInBulkUpdate ( ) ) return ; SINGLE

 - if ( renderersChanged ) {
 + if ( myUseNewRendering && renderersChanged ) {
 updateGutterSize ( ) ;
 }

 boolean errorStripeNeedsRepaint = renderersChanged || highlighter . getErrorStripeMarkColor ( ) != null ;
 - if ( myDocumentChangeInProgress ) {
 + if ( myUseNewRendering && myDocumentChangeInProgress ) {
 SINGLE
 SINGLE
 myErrorStripeNeedsRepaint |= errorStripeNeedsRepaint ;
 <nb> public final class EditorImpl extends UserDataHolderBase implements EditorEx , Hi
 ( ( EditorMarkupModelImpl ) getMarkupModel ( ) ) . repaint ( start , end ) ;
 }

 + if ( ! myUseNewRendering && renderersChanged ) {
 + updateGutterSize ( ) ;
 + }
 +
 updateCaretCursor ( ) ;
 }
 } ;

use new logic only when new rendering flag is enabled


<nb> public class SpillingResettableIterator < T extends Record > implements ResettableI
 }

 public void close ( ) {
 - if ( ! fitsIntoMem ) {
 + if ( ioReader != null ) {
 try {
 ioReader . close ( ) ;
 ioReader . deleteChannel ( ) ;

fixed NullPointerException in cancel behavior of SpillingResettableIterator


<nb> public class GitUntrackedFilesHolder implements Disposable , BulkFileListener {

 SINGLE
 if ( allChanged ) {
 - LOG . info ( String . format ( STRING0 , myRoot ) ) ;
 + LOG . debug ( String . format ( STRING0 , myRoot ) ) ;
 myDirtyScopeManager . dirDirtyRecursively ( myRoot ) ;
 synchronized ( LOCK ) {
 myReady = false ;


<nb> public class BootstrapCliParserTests extends CliToolTestCase {
 parser . parse ( STRING0 , new String [ ] { STRING1 , STRING2 } ) ;
 fail ( STRING3 ) ;
 } catch ( IllegalArgumentException e ) {
 - assertThat ( e . getMessage ( ) , containsString ( STRING4 ) ) ;
 + assertThat ( e . getMessage ( ) , containsString ( STRING5 ) ) ;
 }
 }

Fix broken test in BootstrapCliParserTests


<nb> public class GLM2 extends ModelJob {
 _wgiven = beta ;
 this . alpha = new double [ ] { alpha } ;
 this . n_folds = nfolds ;
 + source = dinfo . _adaptedFrame ;
 + response = dinfo . _adaptedFrame . lastVec ( ) ;
 }

 static String arrayToString ( double [ ] arr ) {
 <nb> public class Frame extends Iced {
 return res ;
 }

 + public Vec lastVec ( ) {
 + final Vec [ ] vecs = vecs ( ) ;
 + return vecs [ vecs . length - NUMBER0 ] ;
 + }
 COMMENT
 public Vec anyVec ( ) {
 if ( _col0 != null ) return _col0 ;

Fixed logStart NPE in GLM2 so that tests pass


<nb> public class ZenModeControllerImpl implements ZenModeController {

 private int mUserId ;
 private boolean mRequesting ;
 + private boolean mRegistered ;

 public ZenModeControllerImpl ( Context context , Handler handler ) {
 mContext = context ;
 <nb> public class ZenModeControllerImpl implements ZenModeController {
 @ override
 public void setUserId ( int userId ) {
 mUserId = userId ;
 + if ( mRegistered ) {
 + mContext . unregisterReceiver ( mReceiver ) ;
 + }
 mContext . registerReceiverAsUser ( mReceiver , new UserHandle ( mUserId ) ,
 new IntentFilter ( AlarmManager . ACTION_NEXT_ALARM_CLOCK_CHANGED ) , null , null ) ;
 + mRegistered = true ;
 }

 private void fireNextAlarmChanged ( ) {


<nb> public class ProjectEditingPreferencesPane extends ProjectPreferencesPane
 public ProjectEditingPreferencesPane ( final SourceServerOperations server )
 {
 SINGLE
 - enableCodeIndexing_ = new CheckBox ( STRING0 , false ) ;
 + enableCodeIndexing_ = new CheckBox ( STRING1 , false ) ;
 enableCodeIndexing_ . addStyleName ( RESOURCES . styles ( ) . enableCodeIndexing ( ) ) ;
 add ( enableCodeIndexing_ ) ;

make code indexing pref more generic not just for R source files


<nb> public class AnnotatorPool {
 newAnnotator = true ;

 SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 annotators . remove ( name ) ;
 }
 SINGLE


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class RssEndpoint extends FeedEndpoint {
 public RssEndpoint ( String endpointUri , FeedComponent component , String feedUri ) {
 super ( endpointUri , component , feedUri ) ;
 }
 +
 + @ override
 + public Producer createProducer ( ) throws Exception {
 + throw new UnsupportedOperationException ( STRING0 ) ;
 + }

 @ override
 public Exchange createExchange ( Object feed ) {

RssEndpoint throw meaningful exception when creating the producer


<nb> public class CentralAuthenticationServiceImplTests extends AbstractCentralAuthen
 @ test
 public void verifyValidateServiceTicketReturnAllAttributes ( ) throws Exception {
 final Service service = getService ( STRING0 ) ;
 - final UsernamePasswordCredential cred = TestUtils . getCredentialsWithSameUsernameAndPassword ( ) ;
 final AuthenticationResult ctx = TestUtils . getAuthenticationResult ( getAuthenticationSystemSupport ( ) , service ) ;
 final TicketGrantingTicket ticketGrantingTicket = getCentralAuthenticationService ( ) . createTicketGrantingTicket ( ctx ) ;
 final ServiceTicket serviceTicket = getCentralAuthenticationService ( ) . grantServiceTicket ( ticketGrantingTicket . getId ( ) ,
 <nb> public class CentralAuthenticationServiceImplTests extends AbstractCentralAuthen
 final Assertion assertion = getCentralAuthenticationService ( ) . validateServiceTicket ( serviceTicket . getId ( ) ,
 service ) ;
 final Authentication auth = assertion . getPrimaryAuthentication ( ) ;
 - assertEquals ( NUMBER0 , auth . getPrincipal ( ) . getAttributes ( ) . size ( ) ) ;
 + assertEquals ( NUMBER1 , auth . getPrincipal ( ) . getAttributes ( ) . size ( ) ) ;
 }

 @ test


<nb> public class Base {
 COMMENT
 public int handleConfirmAndInstallLibrary ( File libFile ) {
 if ( libraryManagerFrame == null ) libraryManagerFrame = new LibraryManager ( ) ;
 - return libraryManagerFrame . confirmAndInstallLibrary ( activeEditor , libFile ) ;
 + return libraryManagerFrame . confirmAndInstallLibrary ( activeEditor , libFile ) . size ( ) ;
 }

 SINGLE


<nb> public class HttpRequestHeader extends HttpHeader {
 COMMENT
 public boolean isImage ( ) {
 try {
 + SINGLE
 final String path = getURI ( ) . getPath ( ) ;
 if ( path != null ) {
 return ( patternImage . matcher ( path ) . find ( ) ) ;


<nb> public class KeyguardViewManager implements KeyguardWindowController {
 SINGLE
 SINGLE
 if ( mKeyguardView != null ) {
 + final View lastView = mKeyguardView ;
 mKeyguardHost . postDelayed ( new Runnable ( ) {
 public void run ( ) {
 - mKeyguardHost . removeView ( mKeyguardView ) ;
 - mKeyguardView . cleanUp ( ) ;
 - mKeyguardView = null ;
 + synchronized ( KeyguardViewManager . this ) {
 + if ( mKeyguardView == lastView ) {
 + mKeyguardHost . removeView ( mKeyguardView ) ;
 + mKeyguardView . cleanUp ( ) ;
 + mKeyguardView = null ;
 + }
 + }
 }
 } , NUMBER0 ) ;
 }

Fix potential race when removing keyguard view


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class PythonSdkType extends SdkType {
 for ( String s : inside ) {
 if ( PYTHON_NN_RE . matcher ( s ) . matches ( ) ) {
 File py_lib_root = new File ( lib_root , s ) ;
 - String [ ] flag_files = py_lib_root . list ( new FilenameFilter ( ) {
 - @ override
 - public boolean accept ( File file , String s ) {
 - return STRING0 . equals ( s ) ;
 - }
 - } ) ;
 - if ( flag_files != null ) return ; SINGLE
 + if ( new File ( py_lib_root , STRING0 ) . exists ( ) ) return ; SINGLE
 }
 }
 }

don t use File list to find file by name


<nb> public class StorageManager {

 COMMENT
 public static File maybeTranslateEmulatedPathToInternal ( File path ) {
 - SINGLE
 + final IMountService mountService = IMountService . Stub . asInterface (
 + ServiceManager . getService ( STRING0 ) ) ;
 + try {
 + final VolumeInfo [ ] vols = mountService . getVolumes ( NUMBER0 ) ;
 + for ( VolumeInfo vol : vols ) {
 + if ( ( vol . getType ( ) == VolumeInfo . TYPE_EMULATED
 + || vol . getType ( ) == VolumeInfo . TYPE_PUBLIC ) && vol . isMountedReadable ( ) ) {
 + final File internalPath = FileUtils . rewriteAfterRename ( vol . getPath ( ) ,
 + vol . getInternalPath ( ) , path ) ;
 + if ( internalPath != null && internalPath . exists ( ) ) {
 + return internalPath ;
 + }
 + }
 + }
 + } catch ( RemoteException e ) {
 + throw e . rethrowFromSystemServer ( ) ;
 + }
 return path ;
 }

Revert Remove old FUSE bypass now that we have sdcardfs


<nb>
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 +
 package NAMESPACE ;

 import NAMESPACE ;
 <nb>
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 +
 package NAMESPACE ;

 import NAMESPACE ;
 <nb>
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 +
 package NAMESPACE ;

 import NAMESPACE ;

Added class header to concurrent package


<nb> public class AnnotateStackTraceAction extends AnAction implements DumbAware {
 public String getToolTip ( int line , Editor editor ) {
 final LastRevision revision = cache . get ( line ) ;
 if ( revision != null ) {
 - return XmlStringUtil . wrapInHtml (
 - revision . getAuthor ( ) +
 - STRING0 +
 - DateFormatUtil . formatDateTime ( revision . getDate ( ) ) +
 - STRING1 +
 + return XmlStringUtil . escapeString (
 + revision . getAuthor ( ) + STRING0 + DateFormatUtil . formatDateTime ( revision . getDate ( ) ) + STRING2 +
 revision . getMessage ( )
 ) ;
 }

annotate stacktrace fix tooltips for multiline commit messages


<nb> public class Kernel32UtilTest extends TestCase {
 }

 public final void testGetLogicalProcessorInformation ( ) {
 - WinNT . SYSTEM_LOGICAL_PROCESSOR_INFORMATION informationArray = Kernel32Util . getLogicalProcessorInformation ( ) ;
 - assertTrue ( informationArray >= NUMBER0 ) ; SINGLE
 + WinNT . SYSTEM_LOGICAL_PROCESSOR_INFORMATION [ ] informationArray = Kernel32Util . getLogicalProcessorInformation ( ) ;
 + assertTrue ( informationArray . length >= NUMBER0 ) ; SINGLE
 for ( WinNT . SYSTEM_LOGICAL_PROCESSOR_INFORMATION information : informationArray ) {
 SINGLE
 SINGLE

Fixing compilation issues in Kernel32UtilTest


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class RequestProcessor {
 } ;
 request . setRequestProgressListener ( requestProgressListener ) ;

 - if ( request . getRequestCacheKey ( ) != null ) {
 + if ( request . getRequestCacheKey ( ) != null && request . getCacheDuration ( ) != DurationInMillis . ALWAYS_EXPIRED ) {
 SINGLE
 try {
 Ln . d ( STRING0 + request ) ;

Skip cache lookup if cache duration DurationInMillis ALWAYS_EXPIRED


<nb> public class PropertyPhysicalToLogicalConverter
 if ( block == null )
 return null ;

 - Object value = block . getType ( ) . getValue ( block , propertyStore ) ;
 - if ( value instanceof String )
 - {
 - String stringValue = ( String ) value ;
 - if ( stringValue . startsWith ( STRING0 ) )
 - {
 - stringValue = ( String ) block . getType ( ) . getValue ( block , propertyStore ) ;
 - System . out . println ( STRING1 + stringValue ) ;
 - }
 - }
 - return value ;
 + return block . getType ( ) . getValue ( block , propertyStore ) ;
 }
 }


<nb> public class ResultSetViewer extends Viewer
 }

 model . setUpdateInProgress ( false ) ;
 - if ( dataFilter != null ) {
 + if ( error == null && dataFilter != null ) {
 model . updateDataFilter ( dataFilter ) ;
 activePresentation . refreshData ( false , false ) ;
 }


<nb> public class MediaNames {

 SINGLE
 public static final String STREAM_H264_480_360_1411k =
 - STRING0 ;
 + STRING1 ;
 public static final String STREAM_WMV =
 - STRING2 ;
 + STRING3 ;
 public static final String STREAM_H263_176x144_325k =
 - STRING4 ;
 + STRING5 ;
 public static final String STREAM_H264_352x288_1536k =
 - STRING6 ;
 + STRING7 ;
 public static final String STREAM_MP3 =
 - STRING8 ;
 + STRING9 ;
 public static final String STREAM_MPEG4_QVGA_128k =
 - STRING10 ;
 + STRING11 ;
 public static final int STREAM_H264_480_360_1411k_DURATION = NUMBER0 ;
 public static final int VIDEO_H263_AAC_DURATION = NUMBER1 ;
 }


<nb> public class Spider implements Runnable , Task {
 }
 SINGLE
 if ( page . getHtml ( ) == null ) {
 - addRequest ( page ) ;
 + extractAndAddRequests ( page ) ;
 sleep ( site . getSleepTime ( ) ) ;
 return ;
 }
 pageProcessor . process ( page ) ;
 - addRequest ( page ) ;
 + extractAndAddRequests ( page ) ;
 if ( ! page . getResultItems ( ) . isSkip ( ) ) {
 for ( Pipeline pipeline : pipelines ) {
 pipeline . process ( page . getResultItems ( ) , this ) ;
 <nb> public class Spider implements Runnable , Task {
 }
 }

 - protected void addRequest ( Page page ) {
 + protected void extractAndAddRequests ( Page page ) {
 if ( CollectionUtils . isNotEmpty ( page . getTargetRequests ( ) ) ) {
 for ( Request request : page . getTargetRequests ( ) ) {
 addRequest ( request ) ;


<nb> package NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class PluginRunConfiguration extends RunConfigurationBase {
 }
 } ;

 - state . setConsoleBuilder ( TextConsoleBuidlerFactory . getInstance ( ) . createBuilder ( getProject ( ) ) ) ;
 + state . setConsoleBuilder ( TextConsoleBuilderFactory . getInstance ( ) . createBuilder ( getProject ( ) ) ) ;
 state . setModulesToCompile ( getModules ( ) ) ; SINGLE
 return state ;
 }


<nb> public class PackagesPane extends WorkbenchPane implements Packages . Display
 SINGLE
 packratSeparator_ . setVisible ( packratBootstrapButton_ . isVisible ( ) ||
 packratMenuButton_ . isVisible ( ) ) ;
 +
 + SINGLE
 + prePackratSeparator_ . setVisible ( true ) ;
 }

 @ override
 <nb> public class PackagesPane extends WorkbenchPane implements Packages . Display

 SINGLE
 toolbar . addLeftWidget ( commands_ . updatePackages ( ) . createToolbarButton ( ) ) ;
 - toolbar . addLeftSeparator ( ) ;
 - toolbar . addLeftSeparator ( ) ;
 + prePackratSeparator_ = toolbar . addLeftSeparator ( ) ;

 SINGLE
 SINGLE
 <nb> public class PackagesPane extends WorkbenchPane implements Packages . Display
 private ToolbarButton packratBootstrapButton_ ;
 private ToolbarButton packratMenuButton_ ;
 private Widget packratSeparator_ ;
 + private Widget prePackratSeparator_ ;
 private ResizeLayoutPanel packagesTableContainer_ ;
 private int gridRenderRetryCount_ ;
 private PackratContext packratContext_ ;

fix missing separator preceding Packrat commands in packages pane


<nb> public class LockMBean extends HazelcastMBean < ILock > {
 return lockObject == null ? null : lockObject . toString ( ) ;
 }

 + @ managedannotation ( STRING0 )
 + @ manageddescription ( STRING1 )
 + public String getPartitionKey ( ) {
 + return managedObject . getPartitionKey ( ) ;
 + }

 }

Exposed the partitionkey attribute on the lockmbean


<nb> public class SearchDialog extends Dialog implements OnItemClickListener , OnItemS
 return ;
 }
 try {
 + SINGLE
 + SINGLE
 + ( ( SearchManager ) getContext ( ) . getSystemService ( Context . SEARCH_SERVICE ) ) .
 + stopSearch ( ) ;
 +
 if ( mSearchable . getVoiceSearchLaunchWebSearch ( ) ) {
 getContext ( ) . startActivity ( mVoiceWebSearchIntent ) ;
 } else if ( mSearchable . getVoiceSearchLaunchRecognizer ( ) ) {
 - Intent appSearchIntent = createVoiceAppSearchIntent ( mVoiceAppSearchIntent ) ;
 -
 - SINGLE
 - SINGLE
 - ( ( SearchManager ) getContext ( ) . getSystemService ( Context . SEARCH_SERVICE ) ) .
 - stopSearch ( ) ;
 -
 + Intent appSearchIntent = createVoiceAppSearchIntent ( mVoiceAppSearchIntent ) ;
 getContext ( ) . startActivity ( appSearchIntent ) ;
 }
 } catch ( ActivityNotFoundException e ) {

Close the search dialog before starting voice search in all cases i e


<nb> public final class SamlService extends AbstractWebApplicationService {
 COMMENT
 protected static String getRequestBody ( final HttpServletRequest request ) {
 final StringBuilder builder = new StringBuilder ( ) ;
 - BufferedReader reader = null ;
 - try {
 - reader = request . getReader ( ) ;
 -
 + try ( final BufferedReader reader = request . getReader ( ) ) {
 String line ;
 while ( ( line = reader . readLine ( ) ) != null ) {
 builder . append ( line ) ;
 }
 return builder . toString ( ) ;
 } catch ( final Exception e ) {
 + LOGGER . error ( STRING0 , e ) ;
 return null ;
 - } finally {
 - IOUtils . closeQuietly ( reader ) ;
 }
 }
 }
 <nb> public class X509SubjectAlternativeNameUPNPrincipalResolver extends AbstractX509
 } catch ( final IOException e ) {
 logger . error ( STRING1 , e ) ;
 }
 - return null ;
 + return null ;
 }
 }


<nb> public class UndertowDeploymentInfoService implements Service < DeploymentInfo > {
 d . setDisplayName ( mergedMetaData . getDescriptionGroup ( ) . getDisplayName ( ) ) ;
 }
 d . setDeploymentName ( deploymentName ) ;
 + d . setHostName ( host . getValue ( ) . getName ( ) ) ;
 final ServletContainerService servletContainer = container . getValue ( ) ;
 try {
 SINGLE

ServletContext getVirtualServerName always returns localhost


<nb> public class TestLuceneIndexRecordReader extends EasyMockSupport {
 ( ( Progressable ) context ) . progress ( ) ; SINGLE
 expectLastCall ( ) . atLeastOnce ( ) ;
 replay ( context ) ;
 - SINGLE

 LuceneIndexInputFormat . setQueries ( queryStrings , conf ) ;


<nb> public class ImageUtils {
 paint . setXfermode ( new PorterDuffXfermode ( PorterDuff . Mode . SRC_IN ) ) ;
 canvas . drawBitmap ( bitmap , rect , rect , paint ) ;

 - SINGLE
 - paint . setStyle ( Paint . Style . STROKE ) ;
 - paint . setStrokeWidth ( FLOAT0 ) ;
 - paint . setColor ( Color . DKGRAY ) ;
 - canvas . drawOval ( rectF , paint ) ;
 -
 return output ;
 }

Rounds all WPNetworkImageViews with AVATAR type


<nb> public class PrivacyService {
 mSettingCache . put ( key , key ) ;
 }
 }
 +
 + if ( setting . name . startsWith ( STRING0 ) )
 + synchronized ( mRestrictionCache ) {
 + mRestrictionCache . clear ( ) ;
 + }
 } catch ( Throwable ex ) {
 Util . bug ( null , ex ) ;
 throw new RemoteException ( ex . toString ( ) ) ;

setSettingInternal clears restriction cache when storing a whitelist


<nb> public class Config
 public RequestSchedulerId request_scheduler_id ;
 public RequestSchedulerOptions request_scheduler_options ;

 - public EncryptionOptions encryption_options ;
 + public EncryptionOptions encryption_options = new EncryptionOptions ( ) ;

 public Integer index_interval = NUMBER0 ;

 <nb> public final class MessagingService implements MessagingServiceMBean
 private List < ServerSocket > getServerSocket ( InetAddress localEp ) throws IOException , ConfigurationException
 {
 final List < ServerSocket > ss = new ArrayList < ServerSocket > ( ) ;
 - if ( DatabaseDescriptor . getEncryptionOptions ( ) != null && DatabaseDescriptor . getEncryptionOptions ( ) . internode_encryption != EncryptionOptions . InternodeEncryption . none )
 + if ( DatabaseDescriptor . getEncryptionOptions ( ) . internode_encryption != EncryptionOptions . InternodeEncryption . none )
 {
 ss . add ( SSLFactory . getServerSocket ( DatabaseDescriptor . getEncryptionOptions ( ) , localEp , DatabaseDescriptor . getSSLStoragePort ( ) ) ) ;
 SINGLE

Prevent NPE when encryption options are missing


<nb>
 package NAMESPACE ;

 public class Debug {
 - public static final boolean DEBUG_ENABLED = true ;
 + public static final boolean DEBUG_ENABLED = false ;

 public static void onConnectionStart ( ) {
 if ( DEBUG_ENABLED )


<nb> public class ShareUtils {
 if ( savedInstanceState != null ) {
 input . setText ( savedInstanceState . getString ( STRING0 ) ) ;
 } else {
 - input . setText ( episodestring + STRING1 ) ;
 + input . setText ( episodestring ) ;
 }

 return new AlertDialog . Builder ( getActivity ( ) ) . setTitle ( getString ( R . string . comment ) )

Remove the SeriesGuide tag from GetGlue check ins as the website now


<nb> public class AndroidDisplayer extends AbsDisplayer < Canvas , Typeface > {
 }

 @ override
 - public void drawDanmaku ( BaseDanmaku danmaku , Canvas canvas , float left , float top ,
 + public synchronized void drawDanmaku ( BaseDanmaku danmaku , Canvas canvas , float left , float top ,
 boolean fromWorkerThread ) {
 float _left = left ;
 float _top = top ;


<nb> public class TestCometProcessor extends TomcatBaseTest {
 return e ;
 }

 - public void clearResponse ( ) {
 - response = new StringBuilder ( ) ;
 - }
 -
 public String getResponse ( ) {
 return response . toString ( ) ;
 }


<nb> public abstract class AbstractAjpParser {
 while ( length < stringLength ) {
 if ( ! buf . hasRemaining ( ) ) {
 state . stringLength = stringLength ;
 + state . containsUrlCharacters = containsUrlCharacters ;
 return new StringHolder ( null , false , false ) ;
 }
 char c = ( char ) buf . get ( ) ;
 <nb> public abstract class AbstractAjpParser {
 state . containsUrlCharacters = false ;
 return new StringHolder ( builder . toString ( ) , true , containsUrlCharacters ) ;
 } else {
 + state . stringLength = stringLength ;
 + state . containsUrlCharacters = containsUrlCharacters ;
 return new StringHolder ( null , false , false ) ;
 }
 }


<nb> public final class FileChooserUtil {
 }
 else if ( toSelect != null && lastPath != null ) {
 if ( Boolean . TRUE . equals ( descriptor . getUserData ( PathChooserDialog . PREFER_LAST_OVER_EXPLICIT ) ) ) {
 - return toSelect ;
 + return lastPath ;
 }
 else {
 - return lastPath ;
 + return toSelect ;
 }
 }
 else if ( toSelect == null ) {


<nb>
 package NAMESPACE ;

 import NAMESPACE ;
 - import NAMESPACE ;
 - import NAMESPACE ;

 - import NAMESPACE ;
 import NAMESPACE ;

 - import NAMESPACE ;
 -
 COMMENT
 COMMENT
 COMMENT
 <nb> public interface ParameterInfoUIContext {
 boolean isUIComponentEnabled ( ) ;
 void setUIComponentEnabled ( boolean enabled ) ;

 - boolean isLastParameterOwner ( ) ;
 int getCurrentParameterIndex ( ) ;
 PsiElement getParameterOwner ( ) ;


<nb> public final class LineageDataManagerTest {
 List < Long > persistedFiles = ( List < Long > ) Whitebox . getInternalState ( manager , STRING0 ) ;
 Assert . assertEquals ( Lists . newArrayList ( fileId ) , persistedFiles ) ;

 - SINGLE
 + SINGLE
 PowerMockito . verifyStatic ( Mockito . times ( NUMBER0 ) ) ;
 BufferUtils . fastCopy ( Mockito . any ( ReadableByteChannel . class ) ,
 Mockito . any ( WritableByteChannel . class ) ) ;


<nb>
 COMMENT
 package NAMESPACE ;

 - import static NAMESPACE ;
 - import static NAMESPACE ;
 - import static NAMESPACE ;
 - import static NAMESPACE ;
 + import static NAMESPACE ;
 + import static NAMESPACE ;

 import NAMESPACE ;
 import NAMESPACE ;
 <nb> import NAMESPACE ;
 import NAMESPACE ;

 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> import NAMESPACE ;
 COMMENT
 public class BehaviorSubject < T > extends Subject < T , T > {

 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 public static < T > BehaviorSubject < T > createWithDefaultValue ( T defaultValue ) {
 final ConcurrentHashMap < Subscription , Observer < T > > observers = new ConcurrentHashMap < Subscription , Observer < T > > ( ) ;

Improved documentation of the BehaviourSubject


<nb> public class FragmentListView extends SherlockFragment implements
 mList = ( ExtendedListView ) ( v . findViewById ( R . id . list_root ) ) ;
 mList . setOnItemClickListener ( this ) ;
 mList . setOnItemLongClickListener ( this ) ;
 - mList . setEmptyView ( v . findViewById ( R . id . empty_list_view ) ) ;
 + SINGLE
 mList . setDivider ( getResources ( ) . getDrawable ( R . drawable . uploader_list_separator ) ) ;
 mList . setDividerHeight ( NUMBER0 ) ;
 return v ;

Undone the background message in empty folders


<nb> public class GroupByQueryQueryToolChest extends QueryToolChest < Row , GroupByQuery
 }

 SINGLE
 - final GroupByQuery innerQuery = new GroupByQuery . Builder ( query )
 + final GroupByQuery innerQuery = new GroupByQuery . Builder ( subquery )
 . setAggregatorSpecs ( aggs )
 . setInterval ( subquery . getIntervals ( ) )
 . setPostAggregatorSpecs ( Lists . < PostAggregator > newArrayList ( ) )


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 COMMENT
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public abstract class DateTimeZone implements Serializable {

 static final long serialVersionUID = NUMBER0 ;

 - COMMENT
 + COMMENT
 public static final DateTimeZone UTC = new FixedDateTimeZone ( STRING0 , STRING0 , NUMBER1 , NUMBER1 ) ;

 private static Provider cProvider ;
 <nb> public abstract class DateTimeZone implements Serializable {
 return new Stub ( iID ) ;
 }

 - static class UTCProvider implements Provider {
 - public DateTimeZone getDateTimeZone ( String id ) {
 - if ( STRING0 . equals ( id ) ) {
 - return UTC ;
 - }
 - return null ;
 - }
 -
 - public Set getAvailableIDs ( ) {
 - return Collections . singleton ( STRING0 ) ;
 - }
 - }
 -
 COMMENT
 COMMENT
 COMMENT


<nb> public class PowerNotificationWarnings implements PowerUI . WarningsUI {
 nb . setContentIntent ( pendingBroadcast ( ACTION_SHOW_BATTERY_SETTINGS ) ) ;
 }
 if ( ! mSaver ) {
 - nb . addAction ( R . drawable . ic_power_saver ,
 + nb . addAction ( NUMBER0 ,
 mContext . getString ( R . string . battery_saver_start_action ) ,
 pendingBroadcast ( ACTION_START_SAVER ) ) ;
 } else {
 <nb> public class PowerNotificationWarnings implements PowerUI . WarningsUI {
 }

 private void addStopSaverAction ( Notification . Builder nb ) {
 - nb . addAction ( R . drawable . ic_power_saver ,
 + nb . addAction ( NUMBER0 ,
 mContext . getString ( R . string . battery_saver_notification_action_text ) ,
 pendingBroadcast ( ACTION_STOP_SAVER ) ) ;
 }


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class SingleUseDaemonClient extends DaemonClient {
 return ( T ) monitorBuild ( build , connection ) . getValue ( ) ;
 } else if ( firstResult instanceof Failure ) {
 SINGLE
 - throw ( ( Failure ) firstResult ) . getValue ( ) ;
 + throw UncheckedException . asUncheckedException ( ( ( Failure ) firstResult ) . getValue ( ) ) ;
 } else if ( firstResult instanceof DaemonBusy ) {
 throw new GradleException ( STRING0 ) ;
 } else if ( firstResult == null ) {


<nb> public class FastResultSetHandler implements ResultSetHandler {
 }

 protected boolean shouldProcessMoreRows ( ResultSet rs , ResultContext context , RowBounds rowBounds ) throws SQLException {
 - return rs . next ( ) && context . getResultCount ( ) < rowBounds . getLimit ( ) && ! context . isStopped ( ) ;
 + return ! context . isStopped ( ) && rs . next ( ) && context . getResultCount ( ) < rowBounds . getLimit ( ) ;
 }

 protected void skipRows ( ResultSet rs , RowBounds rowBounds ) throws SQLException {

FastResultSetHandler shouldProcessMoreRows should check isStopped first


<nb> public class ThemeBrowserFragment extends Fragment implements RecyclerListener ,
 }

 @ override
 + public void onDetach ( ) {
 + super . onDetach ( ) ;
 + mCallback = null ;
 + }
 +
 + @ override
 public View onCreateView ( LayoutInflater inflater , ViewGroup container , Bundle savedInstanceState ) {
 View view = inflater . inflate ( R . layout . theme_browser_fragment , container , false ) ;


<nb> abstract class PoolBase
 private static final int FALSE = NUMBER0 ;

 private int networkTimeout ;
 - private int transactionIsolation ;
 private int isNetworkTimeoutSupported ;
 private int isQueryTimeoutSupported ;
 private Executor netTimeoutExecutor ;
 <nb> abstract class PoolBase
 private final String catalog ;
 private final boolean isReadOnly ;
 private final boolean isAutoCommit ;
 + private final int transactionIsolation ;
 +
 private final boolean isUseJdbc4Validation ;
 private final boolean isIsolateInternalQueries ;
 private final AtomicReference < Throwable > lastConnectionFailure ;


<nb> public class BinaryMapIndexReader {
 case OsmandOdb . MapTree . BASEID_FIELD_NUMBER :
 case OsmandOdb . MapTree . OLDBASEID_FIELD_NUMBER :
 long baseId = codedIS . readUInt64 ( ) ;
 -
 if ( lastIndexResult != - NUMBER0 ) {
 for ( int i = lastIndexResult ; i < req . searchResults . size ( ) ; i ++ ) {
 BinaryMapDataObject rs = req . searchResults . get ( i ) ;
 <nb> public class BinaryMapIndexReader {
 int top = NUMBER1 ;
 int bottom = NUMBER1 ;

 - long baseId = NUMBER1 ;
 -
 - List < String > stringTable = null ;
 - List < MapTree > subTrees = null ;
 -
 }


<nb> public class MatchPatchPaths {
 for ( VirtualFile file : files ) {
 Pair < VirtualFile , Integer > pair = compareNamesImpl ( strings , file , i ) ;
 if ( pair != null && pair . getSecond ( ) < i ) {
 - if ( best == null || pair . getSecond ( ) > best . getSecond ( ) ) {
 + if ( best == null || pair . getSecond ( ) < best . getSecond ( ) ) {
 best = pair ;
 }
 }


<nb> public class PApplet extends Applet
 SINGLE
 if ( revalidateMethod != null ) {
 try {
 - revalidateMethod . invoke ( this ) ;
 + revalidateMethod . invoke ( PApplet . this ) ;
 } catch ( Exception ex ) {
 ex . printStackTrace ( ) ;
 revalidateMethod = null ;

wrong this being passed into method invocation


<nb> public class DriverConductor extends Agent

 private void onCheckConnections ( )
 {
 - final long now = timerWheel . now ( ) ;
 + final long now = timerWheel . now ( ) ; SINGLE

 connections . forEach (
 ( connection ) - >
 <nb> public class DriverConductor extends Agent
 rescheduleTimeout ( CHECK_TIMEOUT_MS , TimeUnit . MILLISECONDS , connectionCheckTimer ) ;
 }

 - SINGLE
 private void onLivenessCheckClients ( )
 {
 final long now = timerWheel . now ( ) ;


<nb> public abstract class TestCluster implements Iterable < Client > , Closeable {
 assertAcked ( client ( ) . admin ( ) . indices ( ) . prepareDelete ( concreteIndices . toArray ( String . class ) ) ) ;
 }
 }
 + } catch ( AssertionError ae ) {
 + SINGLE
 + logger . info ( STRING0 ) ;
 + ElasticsearchTestCase . printStackDump ( logger ) ;
 + logger . info ( STRING1 ) ;
 + throw ae ;
 }
 }
 }

dump all threads when delete index fails during test cleanup


<nb> import static NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 - import NAMESPACE ;

 import NAMESPACE ;
 import NAMESPACE ;


<nb> public class ActivityShare extends Activity {
 mAppAdapter . setMessage ( uid , getString ( R . string . msg_restart ) ) ;

 SINGLE
 - mAppAdapter . setMessage ( mListAbortedUid . get ( NUMBER0 ) , getString ( R . string . msg_aborted ) ) ;
 + if ( mListAbortedUid . size ( ) > NUMBER0 )
 + mAppAdapter . setMessage ( mListAbortedUid . get ( NUMBER0 ) , getString ( R . string . msg_aborted ) ) ;

 mAppAdapter . notifyDataSetChanged ( ) ;
 }


<nb> public class UpdateBase extends AbstractBaseTest {
 }

 @ test
 - public void Update_With_TempateExpression_In_Batch ( ) {
 + public void Update_With_TemplateExpression_In_Batch ( ) {
 update ( survey )
 . set ( survey . id , NUMBER0 )
 . set ( survey . name , Expressions . stringTemplate ( STRING0 ) )


<nb> public class FileResource extends Resource
 if ( ! abs . equals ( can ) )
 {
 LOG . debug ( STRING0 , abs , can ) ;
 - return new File ( can ) . toURI ( ) ;
 +
 + URI alias = new File ( can ) . toURI ( ) ;
 + SINGLE
 + return new URI ( STRING1 + URIUtil . encodePath ( alias . getPath ( ) ) ) ;
 }
 }
 - catch ( IOException e )
 + catch ( Exception e )
 {
 LOG . warn ( STRING2 , file , e . toString ( ) ) ;
 LOG . debug ( e ) ;


<nb> public class YoutubeChannelExtractor extends ChannelExtractor {
 if ( ! isAjaxPage ) {
 Element el = doc . select ( STRING0 ) . first ( ) . select ( STRING1 ) . first ( ) ;
 String cssContent = el . html ( ) ;
 - String url = STRING2 + Parser . matchGroup1 ( STRING3 , cssContent ) ;
 + String url = STRING2 + Parser . matchGroup1 ( STRING4 , cssContent ) ;
 if ( url . contains ( STRING5 ) ) {
 bannerUrl = null ;
 } else {


<nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 + COMMENT
 COMMENT
 COMMENT
 @ finegrainedlazysingleton
 <nb> import NAMESPACE ;

 COMMENT
 COMMENT
 + COMMENT
 COMMENT
 public class EurekaJacksonCodec {


<nb>
 package NAMESPACE ;

 import static NAMESPACE ;
 + import static NAMESPACE ;

 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class MarkdownUtils {
 COMMENT
 COMMENT
 public static String transformMarkdown ( String markdown , LinkRenderer linkRenderer ) {
 - PegDownProcessor pd = new PegDownProcessor ( ALL ) ;
 + PegDownProcessor pd = new PegDownProcessor ( ALL & ~ SMARTYPANTS ) ;
 String html = pd . markdownToHtml ( markdown , linkRenderer == null ? new LinkRenderer ( ) : linkRenderer ) ;
 return html ;
 }

Disable the SMARTYPANTS Markdown extension


<nb> public final class CameraCharacteristics extends CameraMetadata < CameraCharacteri
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class CameraCharacteristics extends CameraMetadata < CameraCharacteri
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class CameraCharacteristics extends CameraMetadata < CameraCharacteri
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 COMMENT
 COMMENT
 COMMENT
 <nb> public final class CameraCharacteristics extends CameraMetadata < CameraCharacteri
 COMMENT
 COMMENT
 COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT

Remove FREEFORM cropping requirement from FULL


<nb> import NAMESPACE ;

 import NAMESPACE ;

 + import NAMESPACE ;
 import NAMESPACE ;

 COMMENT
 <nb> public final class Strings {
 COMMENT
 COMMENT
 COMMENT
 + @ checkreturnvalue
 public static String nullToEmpty ( @ nullable String string ) {
 return ( string == null ) ? STRING0 : string ;
 }

Add CheckReturnValue to Strings nullToEmpty


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 COMMENT
 COMMENT
 - COMMENT
 + COMMENT
 + COMMENT
 + COMMENT
 COMMENT
 COMMENT
 COMMENT


<nb> public class LoggingConfigurationTest {
 assertThat ( file . getThreshold ( ) ,
 is ( Level . ALL ) ) ;

 + assertThat ( file . isArchive ( ) ,
 + is ( true ) ) ;
 +
 assertThat ( file . getCurrentLogFilename ( ) ,
 is ( STRING0 ) ) ;


<nb> import NAMESPACE ;
 COMMENT
 COMMENT
 COMMENT
 + COMMENT
 COMMENT
 public class DatabaseReconciliator {
 private static final Logger logger = Logger . getLogger ( DatabaseReconciliator . class . getSimpleName ( ) ) ;


<nb> final class ActivityStack {
 r . app = null ;
 }
 lastTask = r . task ;
 - finishActivityLocked ( r , Activity . RESULT_CANCELED , null , STRING0 , true ) ;
 + if ( finishActivityLocked ( r , Activity . RESULT_CANCELED , null , STRING0 ,
 + true ) ) {
 + SINGLE
 + -- numActivities ;
 + -- activityNdx ;
 + }
 }
 }
 }

Handle case where finishActivity removes activity


<nb> public class GenericDijkstra {
 }

 public ShortestPathTree getShortestPathTree ( State initialState ) {
 - Vertex target = initialState . getOptions ( ) . rctx . target ;
 + Vertex target = null ;
 + if ( options . rctx != null ) {
 + target = initialState . getOptions ( ) . rctx . target ;
 + }
 ShortestPathTree spt = createShortestPathTree ( options ) ;
 OTPPriorityQueue < State > queue = createPriorityQueue ( ) ;


<nb> public class GitRootScanner implements BulkFileListener , ModuleRootListener , Dis
 @ override
 public void run ( ) {
 myProjectIsInitialized = true ;
 + scanIfReady ( ) ;
 }
 } ) ;

 <nb> public class GitRootScanner implements BulkFileListener , ModuleRootListener , Dis
 @ override
 public void directoryMappingChanged ( ) {
 myMappingsAreReady = true ;
 + scanIfReady ( ) ;
 }

 private void scanIfReady ( ) {


<nb> public class PGL extends processing . opengl . PGL {
 COMMENT
 protected static final int MIN_ARRAYCOPY_SIZE = NUMBER0 ;

 + COMMENT
 + COMMENT
 + protected static final float STROKE_DISPLACEMENT = FLOAT0 ;
 +
 protected static int request_depth_bits = NUMBER1 ;
 protected static int request_stencil_bits = NUMBER2 ;
 protected static int request_alpha_bits = NUMBER2 ;

Added STROKE_DISPLACEMENT to PGL in LWJGL


<nb> public class OkHttpDownloader implements Downloader {

 int responseCode = connection . getResponseCode ( ) ;
 if ( responseCode >= NUMBER0 ) {
 + connection . disconnect ( ) ;
 return null ;
 }

 <nb> public class UrlConnectionDownloader implements Downloader {

 int responseCode = connection . getResponseCode ( ) ;
 if ( responseCode >= NUMBER0 ) {
 + connection . disconnect ( ) ;
 return null ;
 }

Disconnect the connection if we are existing early


<nb> public class ContractionHierarchy implements Serializable {

 path . edges = flatten ( path . edges ) ;
 SINGLE
 + double savedMaxWalkDistance = options . maxWalkDistance ;
 + options . maxWalkDistance = Double . MAX_VALUE ; SINGLE
 if ( options . isArriveBy ( ) ) {
 cleanPathEdgesBack ( init , path , options ) ;
 } else {
 cleanPathEdges ( init , path , options ) ;
 }
 path . optimize ( ) ;
 + options . maxWalkDistance = savedMaxWalkDistance ;
 return path ;
 }

turn off walk distance checking in CH path merging


<nb> public class SliceQueryFilter implements IFilter
 }
 }

 - if ( toRemote != null )
 + if ( toRemove != null )
 {
 for ( ByteBuffer columnName : toRemove )
 cf . remove ( columnName ) ;


<nb> public class Build {
 List unknownTasks = buildExecuter . unknownTasks ( startParameter . getTaskNames ( ) , startParameter . isRecursive ( ) ,
 projectLoader . getCurrentProject ( ) ) ;
 if ( GUtil . isTrue ( unknownTasks ) ) {
 - throw new UnknownTaskException ( STRING0 ) ;
 + throw new UnknownTaskException ( STRING1 + unknownTasks + STRING2 ) ;
 }
 unknownTaskCheck = true ;
 }


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 public class ApplyProjectRolesDecorator implements Decorator {
 <nb> public class ApplyProjectRolesDecorator implements Decorator {
 }

 private boolean isProject ( Resource resource ) {
 - if ( Resource . QUALIFIER_PROJECT . equals ( resource . getQualifier ( ) ) ||
 - Resource . QUALIFIER_VIEW . equals ( resource . getQualifier ( ) ) ||
 - Resource . QUALIFIER_SUBVIEW . equals ( resource . getQualifier ( ) ) ) {
 + if ( Qualifiers . PROJECT . equals ( resource . getQualifier ( ) ) ||
 + Qualifiers . VIEW . equals ( resource . getQualifier ( ) ) ||
 + Qualifiers . SUBVIEW . equals ( resource . getQualifier ( ) ) ) {
 return resource instanceof Project ;
 }
 return false ;


<nb> public @ interface NotEmpty {

 public int sequence ( ) default - NUMBER0 ;
 public int messageResId ( ) default - NUMBER0 ;
 - public String message ( ) default STRING0 ;
 + public String message ( ) default STRING1 ;
 }


<nb> public class NextUnreadRedirectPage extends WebPage {
 List < FeedCategory > children = feedCategoryDAO
 . findAllChildrenCategories ( user , category ) ;
 statuses = feedEntryStatusDAO . findUnreadByCategories ( children ,
 - null , NUMBER0 , NUMBER1 , ReadingOrder . desc , false ) ;
 + null , NUMBER0 , NUMBER1 , ReadingOrder . desc , true ) ;
 }
 }

fix next unread bookmarklet for categories


<nb> package NAMESPACE ;

 public enum TreeParserToken {
 + Ignorable ,
 StartDocument ,
 EndDocument ,
 StartEntity ,
 <nb> public class XmlParser implements TreeParser {
 case XMLStreamConstants . CHARACTERS : return TreeParserToken . Value ;
 case XMLStreamConstants . START_DOCUMENT : return TreeParserToken . StartDocument ;
 case XMLStreamConstants . END_DOCUMENT : return TreeParserToken . EndDocument ;
 +
 SINGLE
 - default : throw new ServletException ( STRING0 ) ;
 + default :
 + return TreeParserToken . Ignorable ;
 + SINGLE
 }
 }

Comments in XML file caused the record detection code to fail


<nb> public class PropertyContainerLocker
 else if ( container instanceof Relationship )
 {
 statement . readOperations ( ) . acquireShared ( ResourceTypes . RELATIONSHIP , ( ( Relationship ) container ) . getId ( ) ) ;
 - return new CoreAPILock ( stmtProvider , ResourceTypes . RELATIONSHIP , ( ( Node ) container ) . getId ( ) )
 + return new CoreAPILock ( stmtProvider , ResourceTypes . RELATIONSHIP , ( ( Relationship ) container ) . getId ( ) )
 {
 @ override
 void release ( Statement statement , Locks . ResourceType type , long resourceId )
 <nb> public class PhysicalTransactionCursor implements IOCursor
 {
 return false ;
 }
 - assert entry instanceof LogEntry . Start ;
 + assert entry instanceof LogEntry . Start : STRING0 + entry + STRING1 ;
 LogEntry . Start startEntry = ( LogEntry . Start ) entry ;
 LogEntry . Commit commitEntry ;
 while ( true )


<nb> public abstract class AbstractEmulatorMojo extends AbstractAndroidMojo {
 private static final String START_EMULATOR_MSG = STRING0 ;
 private static final String START_EMULATOR_WAIT_MSG = STRING1 ;
 private static final String NO_EMULATOR_RUNNING = STRING2 ;
 + private static final String NO_DEMON_RUNNING_MACOSX = STRING3 ;

 COMMENT
 private static final String scriptFolder = System . getProperty ( STRING4 ) ;
 <nb> public abstract class AbstractEmulatorMojo extends AbstractAndroidMojo {
 }

 String emulatorName = getRunningEmulatorName ( ) ;
 - if ( emulatorName . equals ( NO_EMULATOR_RUNNING ) )
 + SINGLE
 + SINGLE
 + SINGLE
 + if ( emulatorName . equals ( NO_EMULATOR_RUNNING ) || emulatorName . startsWith ( NO_DEMON_RUNNING_MACOSX ) )
 {
 getLog ( ) . info ( START_EMULATOR_MSG + filename ) ;
 executor . executeCommand ( filename , null ) ;

added special clause for starting emulator within intellij on macosx


<nb> public class Cpp98Generator implements CodeGenerator
 ) ) ;

 sb . append ( String . format (
 - STRING0 +
 - STRING1 +
 + STRING2 +
 + STRING3 +
 STRING4 +
 STRING5 +
 STRING6 +
 <nb> public class Cpp98Generator implements CodeGenerator
 STRING7 +
 STRING8 +
 STRING9 ,
 + namespaceName . toUpperCase ( ) ,
 className . toUpperCase ( )
 ) ) ;

Adding namespace to include guard in order to avoid name collisions


<nb> public class MapActivityActions implements DialogProvider {
 settings . insertIntermediatePoint ( lat , lon , name , NUMBER0 , true ) ;
 }
 targetPointsHelper . updatePointsFromSettings ( ) ;
 - SINGLE
 - openIntermediatePointsDialog ( ) ;
 - SINGLE
 + SINGLE
 + MapActivity . launchMapActivityMoveToTop ( act ) ;
 }
 } ) ;
 builder . show ( ) ;
 } else {
 settings . setPointToNavigate ( lat , lon , true , name ) ;
 targetPointsHelper . updatePointsFromSettings ( ) ;
 - SINGLE
 - openIntermediatePointsDialog ( ) ;
 - SINGLE
 + SINGLE
 + MapActivity . launchMapActivityMoveToTop ( act ) ;
 }
 }


<nb> public class Application extends ActorSDKApplication {
 @ nullable
 @ override
 public AbsAttachFragment fragmentForAttachMenu ( Peer peer ) {
 - return new AttachFragmentEx ( ) ;
 + return new AttachFragmentEx ( peer ) ;
 }

 SINGLE
 <nb> import NAMESPACE ;

 import NAMESPACE ;

 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 public class AttachFragmentEx extends AttachFragment {
 +
 + public AttachFragmentEx ( Peer peer ) {
 + super ( peer ) ;
 + }
 +
 + public AttachFragmentEx ( ) {
 + }
 +
 @ override
 protected List < ShareMenuField > onCreateFields ( ) {
 List < ShareMenuField > res = super . onCreateFields ( ) ;

fix example app attach menu custom fragment


<nb> public class MotionPath implements Savable {
 COMMENT
 public float interpolatePath ( float time , MotionTrack control ) {

 - float val ;
 float traveledDistance = NUMBER0 ;
 TempVars vars = TempVars . get ( ) ;
 Vector3f temp = vars . vect1 ;
 <nb> public class MotionPath implements Savable {
 return traveledDistance ;
 }

 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - COMMENT
 - private float getDist ( MotionTrack control , Vector3f temp , Vector3f store ) {
 - store . set ( temp ) ;
 - return store . subtractLocal ( control . getSpatial ( ) . getLocalTranslation ( ) ) . length ( ) ;
 - }
 -
 private void attachDebugNode ( Node root ) {
 if ( debugNode == null ) {
 debugNode = new Node ( ) ;

Removed some unused variable and method in MotionPath


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 import static NAMESPACE ;
 import static NAMESPACE ;

 + @ ignore ( STRING0 )
 public class MaxConcurrentStreamTest extends AbstractTest
 {
 @ test


<nb> public class OracleSqlStatementBuilder extends SqlStatementBuilder {
 COMMENT
 COMMENT
 COMMENT
 - private static final Pattern KEYWORDS_BEFORE_STRING_LITERAL_REGEX = Pattern . compile ( STRING0 ) ;
 + private static final Pattern KEYWORDS_BEFORE_STRING_LITERAL_REGEX = Pattern . compile ( STRING1 ) ;

 COMMENT
 COMMENT
 <nb> public class OracleSqlStatementBuilderSmallTest {
 builder . addLine ( STRING2 ) ;
 assertTrue ( builder . isTerminated ( ) ) ;
 }
 +
 + @ test
 + public void quotedStringEndingWithN ( ) {
 + builder . addLine ( STRING3 ) ;
 + assertTrue ( builder . isTerminated ( ) ) ;
 + }
 }


<nb> public class RealmMigrationTests extends AndroidTestCase {
 @ override
 protected void setUp ( ) throws Exception {
 super . setUp ( ) ;
 - Realm . setSchema ( null ) ;
 Realm . deleteRealmFile ( getContext ( ) ) ;
 }

 <nb> public class RealmMigrationTests extends AndroidTestCase {
 if ( realm != null ) {
 realm . close ( ) ;
 }
 + Realm . setSchema ( null ) ;
 }

 public void testRealmClosedAfterMigrationException ( ) throws IOException {


<nb> public final class BatchEntryConsumerTest
 Claimer < StubEntry > claimer = ringBuffer . createClaimer ( NUMBER0 , batchEntryConsumer ) ;
 claimer . claimNext ( ) . commit ( ) ;

 - while ( batchEntryConsumer . getSequence ( ) != NUMBER0 )
 - {
 - Thread . yield ( ) ;
 - }
 + latch . await ( ) ;

 batchEntryConsumer . halt ( ) ;
 thread . join ( ) ;


<nb> class DefaultRequestDispatcher implements RequestDispatcher {
 }
 }
 } catch ( Exception e ) {
 - log . warn ( STRING0 , e ) ;
 + log . debug ( STRING0 , e ) ;
 }

 try {

Make ssh agent error message debug instead of warn


<nb> public abstract class PersistHdfs {
 conf . addResource ( new Path ( p . getAbsolutePath ( ) ) ) ;
 System . out . println ( STRING0 + p . getAbsolutePath ( ) + STRING1 ) ;
 } else {
 + conf = new Configuration ( ) ;
 if ( ! Strings . isNullOrEmpty ( H2O . OPT_ARGS . hdfs ) ) {
 - conf = new Configuration ( ) ;
 SINGLE
 conf . set ( STRING2 , H2O . OPT_ARGS . hdfs ) ;
 SINGLE


<nb> public class MyFirebaseMessagingService extends FirebaseMessagingService {
 SINGLE
 @ override
 public void onMessageReceived ( RemoteMessage remoteMessage ) {
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 + SINGLE
 +
 SINGLE
 - SINGLE
 - SINGLE
 - SINGLE
 + SINGLE
 Log . d ( TAG , STRING0 + remoteMessage . getFrom ( ) ) ;
 Log . d ( TAG , STRING1 + remoteMessage . getNotification ( ) . getBody ( ) ) ;
 +
 + SINGLE
 + SINGLE
 }
 SINGLE


<nb> public abstract class BaseMultiLayerNetwork implements Serializable , Persistable

 if ( this . dist == null )
 dist = new NormalDistribution ( rng , NUMBER0 , FLOAT0 , NormalDistribution . DEFAULT_INVERSE_ABSOLUTE_ACCURACY ) ;
 + synchonrizeRng ( ) ;

 this . layers = new NeuralNetwork [ nLayers ] ;

 <nb> public abstract class BaseMultiLayerNetwork implements Serializable , Persistable

 dimensionCheck ( ) ;
 applyTransforms ( ) ;
 - synchonrizeRng ( ) ;
 initCalled = true ;

 }


<nb> import NAMESPACE ;
 import NAMESPACE ;

 import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb> public class RMarkdownPreferencesPane extends PreferencesPane
 prefs_ . showRmdChunkOutputInline ( ) ) ;
 add ( rmdInlineOutput ) ;

 + add ( spacedBefore ( headerLabel ( STRING0 ) ) ) ;
 +
 SINGLE
 final CheckBox autoExecuteSetupChunk = checkboxPref (
 STRING1 ,
 <nb> public class RMarkdownPreferencesPane extends PreferencesPane
 STRING2 ,
 prefs_ . hideConsoleOnChunkExecute ( ) ) ;
 add ( notebookHideConsole ) ;
 +
 + add ( spacedBefore ( new HelpLink ( STRING3 , STRING4 ) ) ) ;
 }

 @ override


<nb> public class CordovaWebView extends WebView {
 if ( android . os . Build . VERSION . SDK_INT > android . os . Build . VERSION_CODES . ICE_CREAM_SANDWICH_MR1 )
 Level16Apis . enableUniversalAccess ( settings ) ;
 SINGLE
 - settings . setDatabaseEnabled ( true ) ;
 + SINGLE
 String databasePath = this . cordova . getActivity ( ) . getApplicationContext ( ) . getDir ( STRING0 , Context . MODE_PRIVATE ) . getPath ( ) ;
 - settings . setDatabasePath ( databasePath ) ;
 + if ( android . os . Build . VERSION . SDK_INT < android . os . Build . VERSION_CODES . HONEYCOMB )
 + {
 + settings . setDatabaseEnabled ( true ) ;
 + settings . setDatabasePath ( databasePath ) ;
 + }
 +
 settings . setGeolocationDatabasePath ( databasePath ) ;

 SINGLE

Fixing deleted database for ChildBrowser


<nb> public class OsmandSettings {

 @ override
 public void resetToDefault ( ) {
 - set ( getDefaultValue ( ) ) ;
 + T o = defaultValue ;
 + if ( defaultValues != null && defaultValues . containsKey ( currentMode ) ) {
 + o = defaultValues . get ( currentMode ) ;
 + }
 + set ( o ) ;
 }

 @ override
 <nb> public class EditPOIFilterActivity extends OsmandListActivity {
 filter . setTypeToAccept ( model , false ) ;
 helper . editPoiFilter ( filter ) ;
 }
 + notifyDataSetChanged ( ) ;
 }
 } ) ;
 }
 <nb> public class MapWidgetRegistry {
 public boolean onContextMenuClick ( ArrayAdapter < ? > a , int itemId , int pos , boolean isChecked ) {
 pref . set ( ! pref . get ( ) ) ;
 map . updateApplicationModeSettings ( ) ;
 - a . notifyDataSetInvalidated ( ) ;
 + a . notifyDataSetChanged ( ) ; ;
 return false ;
 }
 } ;


<nb> public final class Config {
 public static final Bitmap . CompressFormat AVATAR_FORMAT = Bitmap . CompressFormat . WEBP ;

 public static final int IMAGE_SIZE = NUMBER0 ;
 - public static final Bitmap . CompressFormat IMAGE_FORMAT = Bitmap . CompressFormat . WEBP ;
 + public static final Bitmap . CompressFormat IMAGE_FORMAT = Bitmap . CompressFormat . JPEG ;
 public static final int IMAGE_QUALITY = NUMBER1 ;

 public static final int MESSAGE_MERGE_WINDOW = NUMBER2 ;


<nb> public class MetaGenerator {
 generator . appendLn ( STRING0 + minorVersion + STRING1 ) ;
 generator . appendLn ( ) ;

 - generator . appendLn ( STRING2 ) ;
 + generator . appendLn ( STRING3 ) ;
 generator . appendLn ( STRING4 ) ;

 generator . decreaseDepth ( ) ;
 <nb> public final class ApiVersion {
 public static int VERSION_MAJOR = NUMBER0 ;
 public static int VERSION_MINOR = NUMBER1 ;

 - private Version ( ) {
 + private ApiVersion ( ) {
 }
 }


<nb> public class DataStructures {

 private static final int NUMBER_OF_TESTS = NUMBER0 ;
 private static final Random RANDOM = new Random ( ) ;
 - private static final int ARRAY_SIZE = NUMBER1 ;
 + private static final int ARRAY_SIZE = NUMBER2 ;

 private static Integer [ ] unsorted = null ;
 private static Integer [ ] reversed = null ;
 <nb> public class DataStructures {
 return false ;
 }

 - SINGLE
 + passed = testSkipList ( ) ;
 if ( ! passed ) {
 System . err . println ( STRING0 ) ;
 return false ;


<nb> import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

 - import NAMESPACE ;
 -
 COMMENT
 COMMENT
 COMMENT
 <nb>

 package NAMESPACE ;

 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 <nb>

 package NAMESPACE ;

 - import NAMESPACE ;
 -
 COMMENT
 COMMENT
 COMMENT
 <nb>

 package NAMESPACE ;

 - import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;
 import NAMESPACE ;

Source formatting remove unnecessary imports


<nb> public class Status implements Serializable {
 this . status = status ;
 }

 + @ nullable
 public Long getPid ( ) {
 return pid ;
 }
 <nb> public class DaemonStopEvent implements Serializable {
 return timestamp ;
 }

 + @ nullable
 public Long getPid ( ) {
 return pid ;
 }

Added Nullable to getters to be consistent


<nb> public class ManageCodeStyleSchemesDialog extends DialogWrapper {
 VirtualFile [ ] selection = fileChooser . choose ( CodeStyleSchemesUIConfiguration . Util . getRecentImportFile ( ) , null ) ;
 if ( selection . length == NUMBER0 ) {
 VirtualFile selectedFile = selection [ NUMBER1 ] ;
 + selectedFile . refresh ( false , false ) ;
 CodeStyleSchemesUIConfiguration . Util . setRecentImportFile ( selectedFile ) ;
 try {
 InputStream nameInputStream = selectedFile . getInputStream ( ) ;

import the same xml does not pick up changes until manual synchronization


<nb> public final class SpdyConnection implements Closeable {
 SINGLE
 SINGLE
 synchronized ( stream ) {
 - synchronized ( this ) {
 + synchronized ( SpdyConnection . this ) {
 stream . receiveSettings ( settings ) ;
 }
 }


<nb> import NAMESPACE ;
 COMMENT
 public interface MapServiceContextInterceptorSupport {

 - void interceptAfterGet ( String mapNname , Object value ) ;
 + void interceptAfterGet ( String mapName , Object value ) ;

 Object interceptPut ( String mapName , Object oldValue , Object newValue ) ;

Fixed typo in MapServiceContextInterceptorSupport


<nb> import NAMESPACE ;
 import NAMESPACE ;

 import NAMESPACE ;
 - import NAMESPACE ;
 + import NAMESPACE ;
 + import NAMESPACE ;
 import NAMESPACE ;

 import NAMESPACE ;
 <nb> public class BooksIntegrationTest {

 private String bookId ;

 + @ afterclass
 + public static void tearDown ( ) {
 + Spark . stop ( ) ;
 + }
 +
 @ after
 - public void tearDown ( ) {
 + public void clearBooks ( ) {
 Books . books . clear ( ) ;
 - Spark . stop ( ) ;
 }

 - @ before
 - public void setup ( ) {
 + @ beforeclass
 + public static void setup ( ) {
 before ( ( request , response ) - > {
 response . header ( STRING0 , STRING1 ) ;
 } ) ;

use BeforeClass AfterClass to improve test executing speed


<nb> public class NameUtil {
 }
 index ++ ;
 }
 + if ( upperCaseCount == NUMBER0 && lowerCaseCount == NUMBER0 && digitCount == NUMBER0 ) continue ;
 String word = name . substring ( wordStart , index ) ;
 array . add ( word ) ;
 }


<nb> public class CachedAuthenticatedSessionHandler implements HttpHandler {
 HttpSessionImpl httpSession = servletContext . getSession ( notification . getExchange ( ) , false ) ;
 switch ( eventType ) {
 case AUTHENTICATED :
 - if ( httpSession != null ) {
 + if ( httpSession != null && ! httpSession . isNew ( ) && ! httpSession . isInvalid ( ) ) {
 ServletRequestContext src = notification . getExchange ( ) . getAttachment ( ServletRequestContext . ATTACHMENT_KEY ) ;
 src . getOriginalRequest ( ) . changeSessionId ( ) ;
 }


<nb> public class NewsAdapter extends RecyclerView . Adapter < NewsAdapter . CardViewHolder

 private DialogInterface . OnClickListener makeGoToZhihuDialogClickListener ( Context context , DailyNews dailyNews ) {
 return ( dialog , which ) - > {
 - String questionTitle = dailyNews . getQuestions ( ) . get ( which ) . getTitle ( ) ,
 - questionUrl = dailyNews . getQuestions ( ) . get ( which ) . getUrl ( ) ;
 + String questionUrl = dailyNews . getQuestions ( ) . get ( which ) . getUrl ( ) ;

 - shareQuestion ( context , questionTitle , questionUrl ) ;
 + goToZhihu ( context , questionUrl ) ;
 } ;
 }


<nb> public class VcsHistoryDialog extends DialogWrapper implements DataProvider {
 return new SimpleDiffRequest ( null , content1 , content2 , title1 , title2 ) ;
 }
 catch ( VcsException e ) {
 - canNotLoadRevisionMessage ( e ) ;
 return new MessageDiffRequest ( canNoLoadMessage ( e ) ) ;
 }
 }


<nb> public class HdfsComponentConfigurationAndDocumentationTest extends CamelTestSup
 @ test
 public void testComponentConfiguration ( ) throws Exception {
 HdfsComponent comp = context . getComponent ( STRING0 , HdfsComponent . class ) ;
 - EndpointConfiguration conf = comp . createConfiguration ( STRING1 +
 - STRING2 ) ;
 + EndpointConfiguration conf = comp . createConfiguration ( STRING1
 + + STRING2 ) ;

 assertEquals ( STRING3 , conf . getParameter ( STRING4 ) ) ;
 assertEquals ( STRING5 , conf . getParameter ( STRING6 ) ) ;