diff
stringlengths
38
1.78k
msg_token
stringlengths
9
190
<nb> import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; + import NAMESPACE ; COMMENT <nb> public class EpisodeDetailsFragment extends SherlockListFragment implements } @ override + public void onPrepareOptionsMenu ( Menu menu ) { + SINGLE + SINGLE + boolean isDrawerOpen = ( ( BaseActivity ) getActivity ( ) ) . getMenu ( ) . getDrawerState ( ) == MenuDrawer . STATE_OPEN ; + menu . findItem ( R . id . menu_manage_lists ) . setVisible ( ! isDrawerOpen ) ; + menu . findItem ( R . id . menu_share ) . setVisible ( ! isDrawerOpen ) ; + super . onPrepareOptionsMenu ( menu ) ; + } + + @ override public boolean onOptionsItemSelected ( MenuItem item ) { int itemId = item . getItemId ( ) ; if ( itemId == R . id . menu_rate_trakt ) {
Hide actions of episode details fragment
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class CrateTestCluster implements Iterable < Client > { . put ( STRING0 , MockFSIndexStoreModule . class . getName ( ) ) SINGLE . put ( IndexEngineModule . EngineSettings . ENGINE_TYPE , MockEngineModule . class . getName ( ) ) . put ( STRING1 , clusterName ) + . put ( DiskThresholdDecider . CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED , false ) SINGLE . put ( STRING2 , STRING3 ) . put ( STRING4 , STRING5 )
disable disk threshold allocation decider for crate test cluster
<nb> public class KdTree < T extends KdTree . XYZPoint > { public static class XYZPoint implements Comparable < XYZPoint > { - private final double x ; - private final double y ; - private final double z ; + protected final double x ; + protected final double y ; + protected final double z ; public XYZPoint ( double x , double y ) { this . x = x ;
Changed kdTree s XYZPoint fields into protected
<nb> public class FindManagerImpl extends FindManager implements PersistentStateCompo private static boolean isWholeWord ( CharSequence text , int startOffset , int endOffset ) { boolean isWordStart = startOffset == NUMBER0 || ! Character . isJavaIdentifierPart ( text . charAt ( startOffset - NUMBER1 ) ) || + ! Character . isJavaIdentifierPart ( text . charAt ( startOffset ) ) || startOffset > NUMBER1 && text . charAt ( startOffset - NUMBER2 ) == STRING0 ; boolean isWordEnd = endOffset == text . length ( ) ||
relax whole word criterion
<nb> COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> import NAMESPACE ; COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT COMMENT COMMENT + COMMENT + COMMENT + COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> import NAMESPACE ; COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT
Clarify EnableScheduling javadoc
<nb> public class ContextualUndoAdapter extends BaseAdapterDecorator implements Conte contextualUndoView . findViewById ( mUndoActionId ) . setOnClickListener ( new UndoListener ( contextualUndoView ) ) ; } - View contentView = super . getView ( position , contextualUndoView . getContentView ( ) , parent ) ; + View contentView = super . getView ( position , contextualUndoView . getContentView ( ) , contextualUndoView ) ; contextualUndoView . updateContentView ( contentView ) ; long itemId = getItemId ( position ) ;
Fix contentView parent
<nb> public class SsoWebViewClient extends WebViewClient { } } ) ; } - } else { - Log . d ( TAG , STRING0 + url + STRING1 + mTargetUrl ) ; - } + } }
Delete a log line in SsoWebViewClient
<nb> public class ProgressBar extends View { int left = NUMBER0 ; if ( mIndeterminateDrawable != null ) { - if ( mOnlyIndeterminate ) { + SINGLE + if ( mOnlyIndeterminate && ! ( mIndeterminateDrawable instanceof AnimationDrawable ) ) { SINGLE SINGLE final int intrinsicWidth = mIndeterminateDrawable . getIntrinsicWidth ( ) ;
Fixed ProgressBar logic for AnimationDrawables
<nb> public class Platform { Method setUseSessionTickets ; Method setHostname ; try { - openSslSocketClass = Class . forName ( STRING0 ) ; + try { + openSslSocketClass = Class . forName ( STRING1 ) ; + } catch ( ClassNotFoundException ignored ) { + SINGLE + openSslSocketClass = Class . forName ( + STRING0 ) ; + } + setUseSessionTickets = openSslSocketClass . getMethod ( STRING2 , boolean . class ) ; setHostname = openSslSocketClass . getMethod ( STRING3 , String . class ) ;
Add current AOSP class name for OpenSSLSocketImpl
<nb> public class LogBufferDescriptor { HIGH_WATER_MARK_OFFSET = NUMBER0 ; TAIL_COUNTER_OFFSET = HIGH_WATER_MARK_OFFSET + SIZE_OF_INT ; - STATUS_OFFSET = TAIL_COUNTER_OFFSET + SIZE_OF_INT ; - STATE_BUFFER_LENGTH = CACHE_LINE_SIZE ; + STATUS_OFFSET = TAIL_COUNTER_OFFSET + CACHE_LINE_SIZE ; + STATE_BUFFER_LENGTH = CACHE_LINE_SIZE * NUMBER1 ; } COMMENT
Move log buffer status field onto its own cacheline
<nb> public class ZWaveConfiguration implements OpenHABConfigurationService , ZWaveEve node . setName ( value ) ; if ( splitDomain [ NUMBER0 ] . equals ( STRING0 ) ) node . setLocation ( value ) ; + + SINGLE + ZWaveNodeSerializer nodeSerializer = new ZWaveNodeSerializer ( ) ; + nodeSerializer . SerializeNode ( node ) ; } else if ( splitDomain . length == NUMBER1 ) { if ( splitDomain [ NUMBER0 ] . equals ( STRING1 ) ) { ZWaveConfigurationCommandClass configurationCommandClass = ( ZWaveConfigurationCommandClass ) node
Save XML after setting names
<nb> public class LambdaExpressionCompatibilityConstraint implements ConstraintFormul for ( PsiParameter parameter : parameters ) { final PsiType type = session . substituteWithInferenceVariables ( substitutor . substitute ( parameter . getType ( ) ) ) ; if ( ! session . isProperType ( type ) ) { - SINGLE + SINGLE return false ; } } <nb> public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm for ( PsiType paramType : signature . getParameterTypes ( ) ) { if ( ! session . isProperType ( paramType ) ) { - SINGLE + SINGLE return false ; } }
fix commented code
<nb> public class LiveUsers { userTracker . getModifiedDate ( ) , userTracker . getRemoteAddr ( ) , userTracker . getRemoteHost ( ) , userTracker . getUserAgent ( ) , userTracker . getPaths ( ) ) ; - } } catch ( Exception e ) { if ( _log . isWarnEnabled ( ) ) {
Fix nullpointer in liveusers
<nb> public class ClassID { continue ; } - String [ ] parts = line . split ( STRING0 ) ; + String [ ] parts = line . split ( STRING1 ) ; if ( parts . length == NUMBER0 ) { int id = Integer . parseInt ( parts [ NUMBER1 ] ) ;
Allow any whitespaces as separator
<nb> public class TestGremlin implements GraphHolder private static WrappingNeoServerBootstrapper server ; @ test - @ ignore @ title ( STRING0 ) @ documented ( STRING1 ) @ graph ( value = { STRING2 } ) <nb> public class TestGremlin implements GraphHolder @ graph ( value = { STRING2 } ) public void testGremlinPostJSON ( ) { + assertTrue ( data . get ( ) . size ( ) == NUMBER0 ) ; + server = new WrappingNeoServerBootstrapper ( graphdb ) ; server . start ( ) ; String response = gen . get ( ) . expectedStatus ( Status . OK . getStatusCode ( ) ) - . payload ( STRING3 ) + . payload ( STRING4 ) . payloadType ( MediaType . APPLICATION_JSON_TYPE ) . post ( STRING5 ) . entity ( ) ;
working integration tests
<nb> public class UIServiceImpl logger . info ( STRING0 ) ; - if ( ! ( pluginComponent . getComponent ( ) instanceof Component ) ) + if ( pluginComponent . getComponent ( ) == null + || ! ( pluginComponent . getComponent ( ) instanceof Component ) ) { logger . error ( STRING1 + STRING2 ) ; <nb> public class UIServiceImpl COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> public class UIServiceImpl Object containerConstraints ) { Object layoutConstraint = null ; + if ( containerConstraints == null ) + return null ; + if ( containerConstraints . equals ( Container . START ) ) layoutConstraint = BorderLayout . LINE_START ; else if ( containerConstraints . equals ( Container . END ) )
Check if the pluginComponent is null before proceeding and firing events
<nb> public abstract class FileInputFormat < OT > implements InputFormat < OT , FileInputSp COMMENT COMMENT COMMENT - private static final String ENUMERATE_NESTED_FILES_FLAG = STRING0 ; + public static final String ENUMERATE_NESTED_FILES_FLAG = STRING0 ; SINGLE
quickfix Made recursive enumeration parameter flag public in FileInputFormat
<nb> public class Activity extends ContextThemeWrapper if ( isAppDebuggable || isDlwarningEnabled ) { String dlwarning = getDlWarning ( ) ; if ( dlwarning != null ) { - String appName = getString ( mApplication . getApplicationInfo ( ) . labelRes ) ; + String appName = getApplicationInfo ( ) . loadLabel ( getPackageManager ( ) ) + . toString ( ) ; String warning = STRING0 + STRING1 + dlwarning ; if ( isAppDebuggable ) {
Fix crash for showing linker errors for apps with no label
<nb> public class GLMModel extends SupervisedModel < GLMModel , GLMModel . GLMParameters , GL @ override protected boolean toJavaCheckTooBig ( ) { - if ( beta ( ) . length > NUMBER0 ) { + if ( beta ( ) != null && beta ( ) . length > NUMBER0 ) { Log . warn ( STRING0 ) ; return true ; }
Prevent NPE in GLM POJO creation
<nb> public class DeepLearningModel extends SupervisedModel < DeepLearningModel , DeepLea } public static class DeepLearningModelOutput extends SupervisedModel . SupervisedOutput { + @ override public int nfeatures ( ) { + return _names . length - ( autoencoder ? NUMBER0 : NUMBER1 ) ; + } public DeepLearningModelOutput ( ) { super ( ) ; } public DeepLearningModelOutput ( DeepLearning b ) { super ( b ) ; } boolean autoencoder ; <nb> public class DeepLearningModel extends SupervisedModel < DeepLearningModel , DeepLea return super . scoreImpl ( orig , adaptedFr , destination_key ) ; } else { SINGLE - final int len = model_info ( ) . data_info ( ) . fullN ( ) ; String prefix = STRING0 ; assert ( model_info ( ) . data_info ( ) . _responses == NUMBER0 ) ;
Override nfeatures method in DLModelOutput
<nb> public abstract class LocalActor < Message , V > extends ActorImpl < Message > implemen private volatile Object globalId ; private ActorMonitor monitor ; private ActorSpec < ? , Message , V > spec ; + private Object aux ; public LocalActor ( Object name , MailboxConfig mailboxConfig ) { super ( name , new Mailbox ( mailboxConfig ) ) ; <nb> public abstract class LocalActor < Message , V > extends ActorImpl < Message > implemen this . spec = spec ; } + Object getAux ( ) { + return aux ; + } + + void setAux ( Object aux ) { + verifyInActor ( ) ; + this . aux = aux ; + } + @ override public String toString ( ) { String className = getClass ( ) . getSimpleName ( ) ;
Added aux field to LocalActor used by Pulsar
<nb> public class PsiDirectoryNode extends BasePsiNode < PsiDirectory > implements Navig public PsiDirectoryNode ( Project project , PsiDirectory value , ViewSettings viewSettings ) { super ( project , value , viewSettings ) ; } + + protected boolean shouldShowModuleName ( ) { + return ! PlatformUtils . isCidr ( ) ; + } protected void updateImpl ( PresentationData data ) { final Project project = getProject ( ) ; <nb> public class PsiDirectoryNode extends BasePsiNode < PsiDirectory > implements Navig data . setPresentableText ( directoryFile . getName ( ) ) ; if ( module != null ) { if ( ! ( parentValue instanceof Module ) ) { - if ( Comparing . equal ( module . getName ( ) , directoryFile . getName ( ) ) ) { + if ( Comparing . equal ( module . getName ( ) , directoryFile . getName ( ) ) || shouldShowModuleName ( ) ) { data . addText ( directoryFile . getName ( ) , SimpleTextAttributes . REGULAR_BOLD_ATTRIBUTES ) ; } else {
confusing bold ProjectName string for projects linked from outside r akirillin
<nb> public class FeedForwardToCnnPreProcessor implements InputPreProcessor { this . numChannels = NUMBER0 ; } - public FeedForwardToCnnPreProcessor ( ) { } - @ override public INDArray preProcess ( INDArray input ) { this . shape = input . shape ( ) ;
Removed unused api in ff to cnn processor
<nb> public class DefaultServlet extends HttpServlet { directory . getWebappPath ( ) + readmeFile ) ; if ( resource . isFile ( ) ) { StringWriter buffer = new StringWriter ( ) ; - InputStream is = resource . getInputStream ( ) ; - copyRange ( new InputStreamReader ( is ) , - new PrintWriter ( buffer ) ) ; + try ( InputStream is = resource . getInputStream ( ) ; + InputStreamReader reader = new InputStreamReader ( is ) ) { + copyRange ( reader , new PrintWriter ( buffer ) ) ; + } catch ( IOException ignored ) { + } return buffer . toString ( ) ; } else { if ( debug > NUMBER0 )
Close the inputstream that was used to get the content of
<nb> class OPDSLinkXMLReader extends OPDSXMLReader implements OPDSConstants { } if ( siteName != null && title != null && infos . getInfo ( UrlInfo . Type . Catalog ) != null ) { - myLinks . add ( link ( id , siteName , title , summary , language , infos ) ) ; + final INetworkLink l = link ( id , siteName , title , summary , language , infos ) ; + if ( l != null ) { + myLinks . add ( l ) ; + } } return false ; }
fixed possible NPE
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class PolicyMonitorTest @ test public void testSimpleReloading ( ) throws Exception { + if ( OS . IS_WINDOWS ) + { + return ; + } + final AtomicInteger count = new AtomicInteger ( NUMBER0 ) ; PolicyMonitor monitor = new PolicyMonitor ( MavenTestingUtils . getTestResourceDir ( STRING0 ) . getAbsolutePath ( ) ) <nb> public class PolicyMonitorTest File permFile = MavenTestingUtils . getTestResourceFile ( STRING1 ) ; permFile . setLastModified ( System . currentTimeMillis ( ) ) ; - + monitor . waitForScan ( ) ; Assert . assertEquals ( NUMBER1 , count . get ( ) ) ;
removing test on windows
<nb> final class ResolveContext { } static AbstractConfigValue resolve ( AbstractConfigValue value , AbstractConfigObject root , - ConfigResolveOptions options , Path restrictToChildOrNull ) { + ConfigResolveOptions options ) { ResolveContext context = new ResolveContext ( root , options , null COMMENT ) ; try { <nb> final class ResolveContext { STRING0 , e ) ; } } - - static AbstractConfigValue resolve ( AbstractConfigValue value , AbstractConfigObject root , - ConfigResolveOptions options ) { - return resolve ( value , root , options , null ) ; - } }
remove unused variant of ResolveContext resolve static method
<nb> public interface Path < C > { Path < ? > getRoot ( ) ; EBoolean isnotnull ( ) ; EBoolean isnull ( ) ; - + public static abstract class PArray < D > extends Expr < D [ ] > implements Path < D [ ] > , CollectionType < D > { protected final Class < D [ ] > arrayType ; protected final Class < D > componentType ;
added better index usage code
<nb> public class FindManagerImpl extends FindManager implements PersistentStateCompo public Set < Language > compute ( ) { THashSet < Language > result = new THashSet < Language > ( ) ; - for ( Project project : ProjectManager . getInstance ( ) . getOpenProjects ( ) ) { - FileViewProvider viewProvider = PsiManager . getInstance ( project ) . findViewProvider ( file ) ; - if ( viewProvider != null ) { - result . addAll ( viewProvider . getLanguages ( ) ) ; - break ; - } + FileViewProvider viewProvider = PsiManager . getInstance ( myProject ) . findViewProvider ( file ) ; + if ( viewProvider != null ) { + result . addAll ( viewProvider . getLanguages ( ) ) ; } if ( result . isEmpty ( ) ) {
use existing project
<nb> public class ExternalSystemAutoImporter implements BulkFileListener , DocumentLis for ( String path : entry . getValue ( ) ) { final ExternalSystemTask resolveTask = processingManager . findTask ( ExternalSystemTaskType . RESOLVE_PROJECT , entry . getKey ( ) , path ) ; final ExternalSystemTaskState taskState = resolveTask == null ? null : resolveTask . getState ( ) ; - if ( taskState == null || taskState . isStopped ( ) || - ( taskState == ExternalSystemTaskState . IN_PROGRESS && resolveTask . cancel ( ) ) ) { + if ( taskState == null || taskState . isStopped ( ) ) { ExternalSystemUtil . refreshProject ( myProject , entry . getKey ( ) , path , myRefreshCallback , false , ProgressExecutionMode . IN_BACKGROUND_ASYNC , false ) ; }
do not cancel import task during auto import
<nb> public class GraphRequest { Bundle parameters = new Bundle ( ) ; if ( accessToken == null ) { + if ( attributionIdentifiers == null ) { + throw new FacebookException ( STRING0 ) ; + } SINGLE SINGLE String udid = attributionIdentifiers . getAttributionId ( ) != null <nb> public class GraphRequest { SINGLE SINGLE if ( FacebookSdk . getLimitEventAndDataUsage ( context ) - || attributionIdentifiers . isTrackingLimited ( ) ) { + || ( attributionIdentifiers != null && attributionIdentifiers . isTrackingLimited ( ) ) ) { parameters . putString ( STRING1 , STRING2 ) ; }
Throw FacebookException if attributionIdentifiers is null when it is needed and protect against null if it is optional
<nb> public class RenderScript { SINGLE public void contextBindRootScript ( Script s ) { - nContextBindRootScript ( s . mID ) ; + int id = NUMBER0 ; + if ( s != null ) { + id = s . mID ; + } + nContextBindRootScript ( id ) ; } SINGLE
Allow null to be re bound as a root script
<nb> public class TextEditingTarget implements private RmdSelectedTemplate getSelectedTemplate ( ) { - SINGLE - SINGLE - String yaml = getRmdFrontMatter ( ) ; - if ( yaml == null ) + SINGLE + SINGLE + SINGLE + SINGLE + SINGLE + SINGLE + try + { + SINGLE + SINGLE + String yaml = getRmdFrontMatter ( ) ; + if ( yaml == null ) + return null ; + return rmarkdownHelper_ . getTemplateFormat ( yaml ) ; + } + catch ( Exception ex ) + { + Debug . log ( STRING0 + ex . getMessage ( ) ) ; return null ; - return rmarkdownHelper_ . getTemplateFormat ( yaml ) ; + } } private void updateRmdFormatList ( )
prevent editor load issues associated with yaml parsing
<nb> public abstract class BaseOpenInBrowserAction extends DumbAwareAction { StringBuilder builder = new StringBuilder ( description ) ; builder . append ( STRING0 ) ; Shortcut [ ] shortcuts = KeymapManager . getInstance ( ) . getActiveKeymap ( ) . getShortcuts ( STRING1 ) ; - if ( shortcuts . length > NUMBER0 ) { - builder . append ( KeymapUtil . getShortcutText ( shortcuts [ NUMBER0 ] ) ) ; - } + boolean exists = shortcuts . length > NUMBER0 ; + if ( exists ) builder . append ( KeymapUtil . getShortcutText ( shortcuts [ NUMBER0 ] ) ) ; if ( HtmlUtil . isHtmlFile ( result . first . getFile ( ) ) ) { - builder . append ( STRING2 ) ; + builder . append ( exists ? STRING3 : STRING4 ) . append ( STRING5 ) ; } builder . append ( STRING6 ) ; description = builder . toString ( ) ;
don t append comma in case of no shortcuts
<nb> public class PreDexMergeStepTest { private String createDxCommandPrefix ( ) { String dxJvmArgs = STRING0 ; - return STRING1 + dxJvmArgs + STRING2 ; + return STRING3 + dxJvmArgs + STRING2 ; } private static DexWithClasses createDexWithClasses ( String pathToDexFile ,
Fix a test
<nb> public class CompletionProgressIndicator extends ProgressIndicatorBase implement if ( ! isRunning ( ) ) return ; ProgressManager . getInstance ( ) . checkCanceled ( ) ; - if ( ! ApplicationManager . getApplication ( ) . isUnitTestMode ( ) ) { + final boolean unitTestMode = ApplicationManager . getApplication ( ) . isUnitTestMode ( ) ; + if ( ! unitTestMode ) { assert ! ApplicationManager . getApplication ( ) . isDispatchThread ( ) ; } <nb> public class CompletionProgressIndicator extends ProgressIndicatorBase implement if ( myCount == NUMBER0 ) { myQueue . setMergingTimeSpan ( NUMBER1 ) ; } else { - myQueue . queue ( myUpdate ) ; + if ( ! unitTestMode ) myQueue . queue ( myUpdate ) ; } }
avoiding OOM due to scheduled update of completion progress
<nb> public class XmppConnectionService extends Service implements OnPhoneContactsLoa } } } + if ( Config . DOMAIN_LOCK != null && ! hosts . contains ( Config . DOMAIN_LOCK ) ) { + hosts . add ( Config . DOMAIN_LOCK ) ; + } + if ( Config . MAGIC_CREATE_DOMAIN != null && ! hosts . contains ( Config . MAGIC_CREATE_DOMAIN ) ) { + hosts . add ( Config . MAGIC_CREATE_DOMAIN ) ; + } return hosts ; }
add lock domain and magic create domain to known hosts
<nb> public class ModuleGraphWriter if ( ! module . getIniTemplate ( ) . isEmpty ( ) ) { - List < String > inis = module . getDefaultConfig ( ) ; + List < String > inis = module . getIniTemplate ( ) ; writeModuleDetailHeader ( out , STRING0 , inis . size ( ) ) ; }
Using correct section
<nb> public class AssetFileTreeCellRenderer extends DefaultTreeCellRenderer { private void formatObjectData ( ObjectData objectData ) { int id = objectData . getPath ( ) . getPathID ( ) ; String size = FileUtils . byteCountToDisplaySize ( objectData . getBuffer ( ) . capacity ( ) ) ; - setText ( String . format ( STRING0 , id , size ) ) ; + String name = objectData . getName ( ) ; + if ( name == null ) { + setText ( String . format ( STRING1 , id , size ) ) ; + } else { + setText ( String . format ( STRING2 , id , name , size ) ) ; + } } private void formatAssetBundleEntry ( AssetBundleEntry entry ) {
Improved object namel formatting
<nb> package NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> import static NAMESPACE ; COMMENT COMMENT @ esintegtestcase.clusterscope ( scope = ESIntegTestCase . Scope . TEST , numDataNodes = NUMBER0 ) + @ lucenetestcase.awaitsfix ( bugUrl = STRING0 ) public class DelayedAllocationIT extends ESIntegTestCase { COMMENT
Disable RecoveryWhileUnderLoadIT for now
<nb> package NAMESPACE ; COMMENT COMMENT public interface InternalTaskProgressEvent extends InternalBuildProgressEvent { + COMMENT + COMMENT + COMMENT + COMMENT + COMMENT InternalTaskDescriptor getDescriptor ( ) ; }
Add missing Javadoc
<nb> public class TextEditingTarget implements EditingTarget event . stopPropagation ( ) ; jumpToNextFunction ( ) ; } + else if ( ( ne . getKeyCode ( ) == KeyCodes . KEY_ESCAPE ) && + ! prefs_ . useVimMode ( ) . getValue ( ) ) + { + event . preventDefault ( ) ; + event . stopPropagation ( ) ; + commands_ . interruptR ( ) . execute ( ) ; + } } } ) ;
allow esc key to interrupt the console even if used in the source pane
<nb> public class JBScrollPane extends JScrollPane { } private void updateViewportBorder ( ) { - setViewportBorder ( new ViewportBorder ( myViewportBorderWidth >= NUMBER0 ? myViewportBorderWidth : NUMBER1 ) ) ; + if ( getViewportBorder ( ) instanceof ViewportBorder ) { + setViewportBorder ( new ViewportBorder ( myViewportBorderWidth >= NUMBER0 ? myViewportBorderWidth : NUMBER1 ) ) ; + } } public static ViewportBorder createIndentBorder ( ) { <nb> public class NotificationsManagerImpl extends NotificationsManager { if ( text . getCaret ( ) != null ) { text . setCaretPosition ( NUMBER0 ) ; } - JScrollPane pane = new JScrollPane ( text ) ; SINGLE - pane . setBorder ( BorderFactory . createEmptyBorder ( ) ) ; + JScrollPane pane = ScrollPaneFactory . createScrollPane ( text , true ) ; SINGLE pane . setOpaque ( false ) ; pane . getViewport ( ) . setOpaque ( false ) ; content . add ( pane , BorderLayout . CENTER ) ;
Do not update viewport border for custom border
<nb> import NAMESPACE ; public class OffsetTranslator implements Disposable { static final Key < OffsetTranslator > RANGE_TRANSLATION = Key . create ( STRING0 ) ; + private final PsiFile myOriginalFile ; private final Document myCopyDocument ; private final LinkedList < DocumentEvent > myTranslation = new LinkedList < DocumentEvent > ( ) ; public OffsetTranslator ( final Document originalDocument , final PsiFile originalFile , Document copyDocument ) { + myOriginalFile = originalFile ; myCopyDocument = copyDocument ; myCopyDocument . putUserData ( RANGE_TRANSLATION , this ) ; <nb> public class OffsetTranslator implements Disposable { } private boolean isUpToDate ( ) { - return this == myCopyDocument . getUserData ( RANGE_TRANSLATION ) ; + return this == myCopyDocument . getUserData ( RANGE_TRANSLATION ) && myOriginalFile . isValid ( ) ; } @ override
don t track offsets after completion when psi has become invalid
<nb> public class DrawHandler extends Handler { private void quitUpdateThread ( ) { if ( mThread != null ) { + synchronized ( drawTask ) { + drawTask . notifyAll ( ) ; + } mThread . quit ( ) ; + try { + mThread . join ( ) ; + } catch ( InterruptedException e ) { + e . printStackTrace ( ) ; + } mThread = null ; } }
Fix sometimes dead sleep after seekTo
<nb> public class StatusBarPolicy { final int ringerMode = audioManager . getRingerMode ( ) ; final boolean visible = ringerMode == AudioManager . RINGER_MODE_SILENT || ringerMode == AudioManager . RINGER_MODE_VIBRATE ; - final int iconId = audioManager . shouldVibrate ( AudioManager . VIBRATE_TYPE_RINGER ) + final int iconId = ( ringerMode == AudioManager . RINGER_MODE_VIBRATE ) ? com . android . internal . R . drawable . stat_sys_ringer_vibrate : com . android . internal . R . drawable . stat_sys_ringer_silent ;
Make the silent vibrate status icon reflect overall device state
<nb> public class ParallelUniverse implements ParallelUniverseInterface { resourceLoader = systemResourceLoader ; } - Security . insertProviderAt ( new BouncyCastleProvider ( ) , NUMBER0 ) ; + if ( Security . getProvider ( BouncyCastleProvider . PROVIDER_NAME ) == null ) { + Security . insertProviderAt ( new BouncyCastleProvider ( ) , NUMBER0 ) ; + } shadowsAdapter . setSystemResources ( systemResourceLoader ) ; String qualifiers = addVersionQualifierToQualifiers ( config . qualifiers ( ) ) ;
Only create BouncyCastleProvider the first time
<nb> COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> COMMENT package NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class TypeMayBeWeakenedInspection extends BaseInspection { containingClass . isInterface ( ) ) { return ; } + if ( JavaHighlightUtil . isSerializationRelatedMethod ( method , containingClass ) ) { + return ; + } if ( MethodUtils . hasSuper ( method ) ) { SINGLE SINGLE
Type may be weakened readObject writeObject
<nb> class WindowStateAnimator { || w . mDecorFrame . isEmpty ( ) ) { SINGLE w . mSystemDecorRect . set ( NUMBER0 , NUMBER0 , w . mCompatFrame . width ( ) , w . mCompatFrame . height ( ) ) ; + } else if ( w . mAttrs . type == LayoutParams . TYPE_WALLPAPER && mAnimator . mAnimating ) { + SINGLE + SINGLE + mTmpClipRect . set ( w . mSystemDecorRect ) ; + applyDecorRect ( w . mDecorFrame ) ; + w . mSystemDecorRect . union ( mTmpClipRect ) ; } else { SINGLE applyDecorRect ( w . mDecorFrame ) ;
Fix bars jumping to black on activity launch
<nb> public interface Input { public boolean isKeyPressed ( int key ) ; COMMENT - COMMENT - COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> public interface Input { public void getTextInput ( TextInputListener listener , String title , String text ) ; COMMENT - COMMENT - COMMENT - COMMENT + COMMENT + COMMENT COMMENT COMMENT COMMENT
fixed Input javadocs
<nb> public class Emma COMMENT private String outputMetaFile ; + private String filters ; + + public String getFilters ( ) + { + return filters ; + } + public Boolean isEnable ( ) { return enable ; <nb> public class EmmaMojo extends AbstractAndroidMojo + parsedEmmaClassFolders ) ; getLog ( ) . debug ( STRING0 + parsedOutputMetadataFile ) ; InstrProcessor processor = InstrProcessor . create ( ) ; + if ( emma . getFilters ( ) != null ) + { + processor . setInclExclFilter ( emma . getFilters ( ) . split ( STRING1 ) ) ; + } processor . setInstrPath ( parsedEmmaClassFolders , true ) ; processor . setInstrOutDir ( parsedEmmaClassFolders [ NUMBER0 ] ) ; SINGLE processor . setMetaOutFile ( parsedOutputMetadataFile ) ;
added emma filter settings
<nb> abstract class AbstractTFS extends FileSystem { boolean asyncEnabled = mTachyonConf . getBoolean ( Constants . ASYNC_ENABLED , true ) ; if ( ! asyncEnabled ) { TachyonURI path = new TachyonURI ( Utils . getPathWithoutScheme ( cPath ) ) ; - if ( mTFS . exist ( path ) ) { + if ( mTFS . exist ( path ) && overwrite && ! mTFS . getFileStatus ( - NUMBER0 , path ) . isFolder ) { if ( ! mTFS . delete ( path , false ) ) { throw new IOException ( STRING0 + cPath ) ; }
Create should respect overwrite
<nb> package NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; public interface ResponseHandler extends ConfigApplier < ResponseHandler > { void writeToResponse ( final SessionContext context ) ; <nb> package NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; + import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import static NAMESPACE ; import static NAMESPACE ; - public class ContentRequestExtractor extends HttpRequestExtractor < String > { + public class ContentRequestExtractor implements RequestExtractor < String > { @ override - protected Optional < String > doExtract ( HttpRequest request ) { + public Optional < String > extract ( final Request request ) { String content = request . getContent ( ) ; return isNullOrEmpty ( content ) ? Optional . < String > absent ( ) : of ( content ) ; }
used request extractor interface for content extractor
<nb> public class SmoothProgressDrawable extends Drawable implements Animatable { COMMENT public void progressiveStart ( int index ) { resetProgressiveStart ( index ) ; - start ( ) ; } private void resetProgressiveStart ( int index ) { checkColorIndex ( index ) ; + mCurrentOffset = NUMBER0 ; mFinishing = false ; mStartSection = NUMBER0 ; mCurrentSections = NUMBER0 ;
The progressStart now also reset the current offset
<nb> import static NAMESPACE ; import static NAMESPACE ; import static NAMESPACE ; import static NAMESPACE ; + import static NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class PhoneWindow extends Window implements MenuBuilder . Callback { setFlags ( FLAG_FULLSCREEN , FLAG_FULLSCREEN & ( ~ getForcedWindowFlags ( ) ) ) ; } + if ( a . getBoolean ( com . android . internal . R . styleable . Window_windowShowWallpaper , false ) ) { + setFlags ( FLAG_SHOW_WALLPAPER , FLAG_SHOW_WALLPAPER & ( ~ getForcedWindowFlags ( ) ) ) ; + } + WindowManager . LayoutParams params = getAttributes ( ) ; if ( ! hasSoftInputMode ( ) ) {
Add support for new wallpaper theme attribute
<nb> public class PyStubsTest extends PyTestCase { assertNull ( STRING0 , fileStub ) ; FileBasedIndex . getInstance ( ) . ensureUpToDate ( StubUpdatingIndex . INDEX_ID , myFixture . getProject ( ) , null ) ; - fileImpl . unloadContent ( ) ; + new WriteCommandAction ( myFixture . getProject ( ) , fileImpl ) { + @ override + protected void run ( Result result ) throws Throwable { + fileImpl . unloadContent ( ) ; + } + } . execute ( ) ; assertNull ( fileImpl . getTreeElement ( ) ) ; SINGLE fileStub = fileImpl . getStub ( ) ;
Fixed PyStubsTest testRenamingUpdatesTheStub
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; @ atmosphereannotation ( BroadcasterCacheInspectorService . class ) - public class BroadcasterCacheInspectorServiceProcessor implements Processor < BroadcasterCache > { + public class BroadcasterCacheInspectorServiceProcessor implements Processor < BroadcasterCacheInspector > { private static final Logger logger = LoggerFactory . getLogger ( BroadcasterCacheInspectorServiceProcessor . class ) ; @ override - public void handle ( AtmosphereFramework framework , Class < BroadcasterCache > annotatedClass ) { + public void handle ( AtmosphereFramework framework , Class < BroadcasterCacheInspector > annotatedClass ) { try { - framework . addBroadcasterCacheInjector ( ( BroadcasterCacheInspector ) framework . newClassInstance ( BroadcasterCache . class , annotatedClass ) ) ; + framework . addBroadcasterCacheInjector ( framework . newClassInstance ( BroadcasterCacheInspector . class , annotatedClass ) ) ; } catch ( Throwable e ) { logger . warn ( STRING0 , e ) ; }
Fix cut paste stupid mistake
<nb> public class ContentView extends FrameLayout { public void onProgressChanged ( WebView webView , int progress ) { SINGLE + SINGLE + SINGLE + SINGLE mEventHandler . onProgressChanged ( progress ) ; SINGLE <nb> public class ProgressIndicator extends FrameLayout { SINGLE SINGLE + COMMENT if ( mProgress >= FLOAT0 && progressN < FLOAT0 && mUrl . equals ( urlAsString ) ) { - mUrl = urlAsString ; + Log . d ( STRING0 , STRING1 + mProgress + STRING2 + url . getHost ( ) ) ; + SINGLE return ; - } + COMMENT mUrl = urlAsString ; mProgress = progressN ;
Remove early exit to not update ProgressIndicator
<nb> package NAMESPACE ; COMMENT COMMENT public class ParameterException extends Exception { - + private static final long serialVersionUID = NUMBER0 ; + public Message message ; public ParameterException ( Message message ) {
Remove warning by adding serialVersionUid
<nb> public class BottomSheetBehavior < V extends View > extends CoordinatorLayout . Behav COMMENT COMMENT + COMMENT + COMMENT + COMMENT COMMENT public static final int PEEK_HEIGHT_AUTO = - NUMBER0 ;
Add javadoc for PEEK_HEIGHT_AUTO
<nb> public class DefaultLenientConfiguration implements LenientConfiguration { private CacheLockingManager cacheLockingManager ; private final Configuration configuration ; private ResolvedConfigurationResults results ; - SINGLE - private final CachingDirectedGraphWalker < ResolvedDependency , ResolvedArtifact > walker - = new CachingDirectedGraphWalker < ResolvedDependency , ResolvedArtifact > ( new ResolvedDependencyArtifactsGraph ( ) ) ; public DefaultLenientConfiguration ( Configuration configuration , ResolvedConfigurationResults results , CacheLockingManager cacheLockingManager ) { this . configuration = configuration ; <nb> public class DefaultLenientConfiguration implements LenientConfiguration { return results . getArtifacts ( ) ; } + CachingDirectedGraphWalker < ResolvedDependency , ResolvedArtifact > walker + = new CachingDirectedGraphWalker < ResolvedDependency , ResolvedArtifact > ( new ResolvedDependencyArtifactsGraph ( ) ) ; + Set < ResolvedDependency > firstLevelModuleDependencies = getFirstLevelModuleDependencies ( dependencySpec ) ; Set < ResolvedArtifact > artifacts = new LinkedHashSet < ResolvedArtifact > ( ) ;
Avoided increased memory consumption
<nb> public class LogFormatter implements ExchangeFormatter { SINGLE Exception exception = exchange . getException ( ) ; boolean caught = false ; - if ( showCaughtException && exception == null ) { + if ( ( showAll || showCaughtException ) && exception == null ) { SINGLE exception = exchange . getProperty ( Exchange . EXCEPTION_CAUGHT , Exception . class ) ; caught = true ;
Added missing showAll for caught exception
<nb> public abstract class IQ extends Packet { COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT
Modified comment that said the IQ packets couldn t have extensions
<nb> public class ActionAnnotation < A extends Annotation > extends AnnotationDataReader ad . method = readStringElement ( annotation , STRING0 ) ; + ad . result = readStringElement ( annotation , STRING1 ) ; + return ad ; }
read madvoc annotation result
<nb> public class CompileDriver { final VirtualFile file = item . getFile ( ) ; if ( file == null ) { LOG . error ( STRING0 + adapter . getCompiler ( ) . getDescription ( ) ) ; + continue ; } final String url = file . getUrl ( ) ; allUrls . add ( url ) ;
avoid induced NPE
<nb> public class WarClassloadingDependencyProcessor implements DeploymentUnitProcess private static final ModuleIdentifier JAVAX_EE_API = ModuleIdentifier . create ( STRING0 ) ; private static final ModuleIdentifier JBOSS_WEB = ModuleIdentifier . create ( STRING1 ) ; - private static final ModuleIdentifier SYSTEM = ModuleIdentifier . create ( STRING2 ) ; private static final ModuleIdentifier LOG = ModuleIdentifier . create ( STRING3 ) ; public void deploy ( DeploymentPhaseContext phaseContext ) throws DeploymentUnitProcessingException { <nb> public class WarClassloadingDependencyProcessor implements DeploymentUnitProcess SINGLE SINGLE moduleSpecification . addDependency ( new ModuleDependency ( moduleLoader , JBOSS_WEB , false , false , false ) ) ; - SINGLE - moduleSpecification . addDependency ( new ModuleDependency ( moduleLoader , SYSTEM , false , false , false ) ) ; moduleSpecification . addDependency ( new ModuleDependency ( moduleLoader , LOG , false , false , false ) ) ; if ( deploymentUnit . getParent ( ) != null ) {
Don t use system module
<nb> public class CallerInfo { public long contactIdOrZero ; public boolean needUpdate ; public Uri contactRefUri ; + public String lookupKey ; COMMENT COMMENT <nb> public class CallerInfo { SINGLE } + SINGLE + columnIndex = cursor . getColumnIndex ( PhoneLookup . LOOKUP_KEY ) ; + if ( columnIndex != - NUMBER0 ) { + info . lookupKey = cursor . getString ( columnIndex ) ; + } + SINGLE columnIndex = cursor . getColumnIndex ( PhoneLookup . PHOTO_URI ) ; if ( ( columnIndex != - NUMBER0 ) && ( cursor . getString ( columnIndex ) != null ) ) {
Add lookup key to callerInfo
<nb> public class TourViewActivity extends SherlockFragmentActivity { protected void onResume ( ) { super . onResume ( ) ; + SINGLE if ( afterDownload ) { if ( customization . getTourInformations ( ) . isEmpty ( ) ) { customization . onIndexingFiles ( IProgress . EMPTY_PROGRESS , new LinkedHashMap < String , String > ( ) ) ; <nb> public class TourViewActivity extends SherlockFragmentActivity { public Drawable getDrawable ( String s ) { Bitmap file = customization . getSelectedTour ( ) . getImageBitmapFromPath ( s ) ; Drawable bmp = new BitmapDrawable ( getResources ( ) , file ) ; + SINGLE int imagewidth = bmp . getIntrinsicWidth ( ) ; if ( size . x - NUMBER0 > imagewidth ) { bmp . setBounds ( NUMBER1 , NUMBER1 , bmp . getIntrinsicWidth ( ) , bmp . getIntrinsicHeight ( ) ) ;
added some comments
<nb> public class BuildFileASTTest extends EvaluationTestCase { public void testWithSyntaxErrorsDoesNotPrintDollarError ( ) throws Exception { setFailFast ( false ) ; BuildFileAST buildFile = parseBuildFile ( - STRING0 , + STRING1 , STRING2 , STRING3 , STRING4 , SINGLE
Remove nonexistent global variable from test
<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 ; - import NAMESPACE ; + import NAMESPACE ; COMMENT
Removed unused imports
<nb> public class PersistitTransaction extends AbstractStoreTransaction { private Transaction tx ; private SessionId sessionId ; - private Map < String , Exchange > exchangeCache = new HashMap < String , Exchange > ( ) ; + SINGLE public PersistitTransaction ( Persistit p , ConsistencyLevel level ) throws StorageException { super ( level ) ; <nb> public class PersistitTransaction extends AbstractStoreTransaction { } public Exchange getExchange ( String treeName , Boolean create ) throws StorageException { - Exchange exchange = exchangeCache . get ( treeName ) ; - if ( exchange != null ) { - return exchange ; - } + Exchange exchange ; + SINGLE + SINGLE + SINGLE + SINGLE + SINGLE try { assign ( ) ; exchange = db . getExchange ( VOLUME_NAME , treeName , create ) ; - exchangeCache . put ( treeName , exchange ) ; + SINGLE return exchange ; } catch ( PersistitException ex ) { throw new PermanentStorageException ( ex ) ;
disabling the exchange cache it was causing the concurrent tests to fail
<nb> public class SessionManager extends BasicModule implements ClusterEventListener , @ override public Iterator < DiscoItem > getItems ( String name , String node , JID senderJID ) { try { - SINGLE - if ( server . getUserManager ( ) . isRegisteredUser ( senderJID ) && name . equals ( senderJID . getNode ( ) ) || server . getPresenceManager ( ) . canProbePresence ( senderJID , name ) ) { + SINGLE + if ( name != null && senderJID != null && + server . getUserManager ( ) . isRegisteredUser ( senderJID ) && + ( name . equals ( senderJID . getNode ( ) ) || server . getPresenceManager ( ) . canProbePresence ( senderJID , name ) ) ) { Collection < DiscoItem > discoItems = new ArrayList < DiscoItem > ( ) ; for ( ClientSession clientSession : getSessions ( name ) ) { discoItems . add ( new DiscoItem ( clientSession . getAddress ( ) , null , null , null ) ) ;
Fix NPE if from to is missing
<nb> public class ValueAnimator extends Animator { long currentPlayTime = currentTime - mStartTime ; long timeLeft = mDuration - currentPlayTime ; mStartTime = currentTime - timeLeft ; + } else if ( mStarted ) { + end ( ) ; } else { start ( true ) ; }
Reversing immediately after starting animator ends it
<nb> public class PushLog extends JPanel implements TypeSafeDataProvider { } Object userObject = ( ( DefaultMutableTreeNode ) value ) . getUserObject ( ) ; ColoredTreeCellRenderer renderer = getTextRenderer ( ) ; - renderer . setBorder ( null ) ; if ( value instanceof CustomRenderedTreeNode ) { ( ( CustomRenderedTreeNode ) value ) . render ( renderer ) ; }
push Don t nullize border in renderer
<nb> public class ImpassibleRoadsMenuController extends MenuController { } } ; rightTitleButtonController . caption = getMapActivity ( ) . getString ( R . string . shared_string_delete ) ; - rightTitleButtonController . leftIconId = R . drawable . map_pin_avoid_road ; + rightTitleButtonController . leftIconId = R . drawable . ic_action_delete_dark ; } @ override <nb> public class ImpassibleRoadsMenuController extends MenuController { @ override public Drawable getLeftIcon ( ) { - return getMapActivity ( ) . getResources ( ) . getDrawable ( R . drawable . ic_action_road_works_dark ) ; + return getMapActivity ( ) . getResources ( ) . getDrawable ( R . drawable . map_pin_avoid_road ) ; } }
Fixed Avoid icon for context menu
<nb> public class AbstractMetaDataExportMojo extends AbstractMojo { this . project = project ; } + public void setServer ( String server ) { + this . server = server ; + } + public void setJdbcDriver ( String jdbcDriver ) { this . jdbcDriver = jdbcDriver ; }
Add setter for server parameter
<nb> public class GroupTest { SINGLE assertEquals ( NUMBER0 , group . getTableCount ( ) ) ; - assertEquals ( TestEmployeeTable . class . getCanonicalName ( ) , + assertEquals ( TestEmployeeTable . class . getSimpleName ( ) , group . getTableName ( NUMBER1 ) ) ; - assertTrue ( group . hasTable ( TestEmployeeTable . class . getCanonicalName ( ) ) ) ; + assertTrue ( group . hasTable ( TestEmployeeTable . class . getSimpleName ( ) ) ) ; assertFalse ( group . hasTable ( STRING0 ) ) ; SINGLE
Fixed tablename test
<nb> public class AppLog { private static class LogEntry { LogLevel mLogLevel ; String mLogText ; + java . util . Date mDate ; T mLogTag ; public LogEntry ( LogLevel logLevel , String logText , T logTag ) { mLogLevel = logLevel ; - mLogText = logText ; - if ( mLogText == null ) { + mDate = DateTimeUtils . nowUTC ( ) ; + if ( logText == null ) { mLogText = STRING0 ; + } else { + mLogText = logText ; } mLogTag = logTag ; }
Add date to LogEntry
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class DescriptorComposer extends HTMLComposerImpl { anchor . append ( STRING0 ) ; } - String descriptionTemplate = description . getDescriptionTemplate ( ) ; + String descriptionTemplate = XmlStringUtil . stripHtml ( description . getDescriptionTemplate ( ) ) ; SINGLE final String reference = STRING1 ; final boolean containsReference = descriptionTemplate . contains ( reference ) ; <nb> public class DescriptorComposer extends HTMLComposerImpl { } res = res . replaceAll ( location , lineAnchor . toString ( ) ) ; } - buf . append ( res ) ; + buf . append ( res . replace ( STRING2 , STRING3 ) . replace ( STRING4 , STRING3 ) ) ; buf . append ( BR ) . append ( BR ) ; composeAdditionalDescription ( buf , refElement ) ; }
trim html headers from template remove end and treeend directives
<nb> public class Downloader { try { final URL targetUrl = new URL ( url ) ; urlConnection = ( HttpURLConnection ) targetUrl . openConnection ( ) ; - urlConnection = ( HttpURLConnection ) targetUrl . openConnection ( ) ; urlConnection . setDoInput ( true ) ; urlConnection . setDoOutput ( false ) ; urlConnection . setUseCaches ( false ) ;
Fix a typo in flickr Downloader
<nb> public class FrodoBridge { . putExtra ( SEND_STATUS_EXTRA_HASHTAG_NAME , hashTagName ) ; } - public static Intent makeIntent ( String className ) { + private static Intent makeIntent ( String className ) { return new Intent ( ) . setComponent ( new ComponentName ( FRODO_PACKAGE_NAME , FRODO_PACKAGE_NAME + className ) ) ; } - public static boolean startActivity ( Intent intent , Context context ) { + private static boolean startActivity ( Intent intent , Context context ) { try { context . startActivity ( intent ) ; return true ;
Fix method access
<nb> import NAMESPACE ; COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> import NAMESPACE ; COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT <nb> import NAMESPACE ; COMMENT COMMENT COMMENT - COMMENT + COMMENT COMMENT COMMENT COMMENT
Fix javadoc of org sonar api server ws WebService
<nb> public class StringUtilsTest { public void testUTF8Charset ( ) { assertEquals ( UTF8 . displayName ( ) , STRING0 ) ; } + + @ test + public void testReplace ( ) { + assertEquals ( STRING1 , StringUtils . replace ( STRING2 , STRING3 , STRING4 ) ) + } }
Added test for StringUtils replace
<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 ; + COMMENT COMMENT COMMENT <nb> public class KafkaEndpoint extends DefaultEndpoint implements MultipleConsumersS try { if ( getCamelContext ( ) != null ) { ClassResolver resolver = getCamelContext ( ) . getClassResolver ( ) ; - replaceWithClass ( props , STRING0 , resolver , Serializer . class ) ; - replaceWithClass ( props , STRING1 , resolver , Serializer . class ) ; + replaceWithClass ( props , ProducerConfig . KEY_SERIALIZER_CLASS_CONFIG , resolver , Serializer . class ) ; + replaceWithClass ( props , ProducerConfig . VALUE_SERIALIZER_CLASS_CONFIG , resolver , Serializer . class ) ; + replaceWithClass ( props , ConsumerConfig . KEY_DESERIALIZER_CLASS_CONFIG , resolver , Deserializer . class ) ; + replaceWithClass ( props , ConsumerConfig . VALUE_DESERIALIZER_CLASS_CONFIG , resolver , Deserializer . class ) ; try { SINGLE
Added deserializers to class loader resolver
<nb> public final class CipherSuiteConverter { STRING0 + SINGLE STRING1 + STRING2 + - STRING3 + + STRING4 + STRING5 + STRING6 + STRING7 +
Add PSK as option for second element in handshake algorithm pattern
<nb> public class ORole extends ODocumentWrapper { final byte mask = ( byte ) iCRUDOperation ; return ( access . byteValue ( ) & mask ) == mask ; - } + } else if ( parentRole != null ) + SINGLE + return parentRole . allow ( iResource , iCRUDOperation ) ; return mode == ALLOW_MODES . ALLOW_ALL_BUT ; }
Fixed bug on inheritedRole
<nb> public class ConfigurationFactory < T > { COMMENT public T build ( ConfigurationSourceProvider provider , String path ) throws IOException , ConfigurationException { try ( InputStream input = provider . open ( checkNotNull ( path ) ) ) { - final JsonNode node = mapper . readTree ( yamlFactory . createJsonParser ( input ) ) ; + final JsonNode node = mapper . readTree ( yamlFactory . createParser ( input ) ) ; return build ( node , path ) ; } }
Fix usage of deprecated jackson yaml code
<nb> public class GraphSONWriterTestSuite extends TestSuite { public void testGratefulGraphNormalized ( ) throws Exception { Graph graph = this . graphTest . generateGraph ( ) ; - if ( graph . getFeatures ( ) . supportsEdgeIteration ) { + if ( graph . getFeatures ( ) . supportsEdgeIteration && ! graph . getFeatures ( ) . ignoresSuppliedIds ) { this . stopWatch ( ) ; final String readGraphSON = readFile ( GraphSONReader . class . getResourceAsStream ( STRING0 ) , Charset . forName ( STRING1 ) ) ; new GraphSONReader ( graph ) . inputGraph ( GraphSONReader . class . getResourceAsStream ( STRING0 ) ) ;
Ignore graphs that don t support ids
<nb> public abstract class BaseLibrariesConfigurable extends BaseStructureConfigurabl myContext . getDaemonAnalyzer ( ) . removeElement ( new LibraryProjectStructureElement ( myContext , library ) ) ; return true ; } + } else { + getModelProvider ( ) . getModifiableModel ( ) . removeLibrary ( library ) ; + myContext . getDaemonAnalyzer ( ) . removeElement ( new LibraryProjectStructureElement ( myContext , library ) ) ; + return true ; } }
cannot delete a library not used in the project
<nb> public abstract class SpeedSearchBase < Comp extends JComponent > { private void manageSearchPopup ( SearchPopup searchPopup ) { final Project project ; - if ( ApplicationManager . getApplication ( ) != null ) { + if ( ApplicationManager . getApplication ( ) != null && ! ApplicationManager . getApplication ( ) . isDisposed ( ) ) { project = DataKeys . PROJECT . getData ( DataManager . getInstance ( ) . getDataContext ( myComponent ) ) ; } else {
fixed after project close exception
<nb> class PowerManagerService extends IPowerManager . Stub if ( event . values [ NUMBER0 ] == FLOAT0 ) { goToSleep ( milliseconds ) ; } else { - userActivity ( milliseconds , false ) ; + SINGLE + SINGLE + SINGLE + synchronized ( mLocks ) { + boolean savedActivityAllowed = mUserActivityAllowed ; + mUserActivityAllowed = true ; + userActivity ( milliseconds , false ) ; + mUserActivityAllowed = savedActivityAllowed ; + } } }
Fix problem waking screen from negative proximity sensor events
<nb> package NAMESPACE ; import static NAMESPACE ; import static NAMESPACE ; - import NAMESPACE ; - import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; <nb> public class BasicStubbingTest extends TestBase { } catch ( NoInteractionsWanted e ) { } } - class Base { } - class Sub extends Base { } - - interface Generic { - List < Base > getList ( ) ; - } - - @ test - public void shouldAllowStubbingWithSubtypes ( ) throws Exception { - Generic mockTwo = mock ( Generic . class ) ; - - List < Sub > subs = null ; - SINGLE - when ( mockTwo . getList ( ) ) . thenReturn ( ( List ) subs ) ; - } - @ test public void shouldAllowStubbingToString ( ) throws Exception { IMethods mockTwo = mock ( IMethods . class ) ;
removed some dead code
<nb> import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; import NAMESPACE ; import NAMESPACE ;
Fixed compilation issue was still a reference to the RemotePropagatable
<nb> public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton impleme DiffFromHistoryHandler customDiffHandler = provider . getHistoryDiffHandler ( ) ; myDiffHandler = customDiffHandler == null ? new StandardDiffFromHistoryHandler ( ) : customDiffHandler ; - final DualViewColumnInfo [ ] columns = createColumnList ( myProject , provider , session ) ; myDetails = new DetailsPanel ( myProject ) ; refreshRevisionsOrder ( ) ; myUpdateAlarm = new Alarm ( Alarm . ThreadToUse . POOLED_THREAD , myProject ) ; - final HistoryAsTreeProvider treeHistoryProvider = myHistorySession . getHistoryAsTreeProvider ( ) ; - + final DualViewColumnInfo [ ] columns = createColumnList ( myProject , provider , session ) ; @ nonnls String storageKey = STRING0 + provider . getClass ( ) . getName ( ) ; + final HistoryAsTreeProvider treeHistoryProvider = myHistorySession . getHistoryAsTreeProvider ( ) ; if ( treeHistoryProvider != null ) { myDualView = new DualView ( new TreeNodeOnVcsRevision ( null , treeHistoryProvider . createTreeOn ( myHistorySession . getRevisionList ( ) ) ) , columns , storageKey , myVcs . getProject ( ) ) ;
file history reorder statements
<nb> public class InputMethodManagerService extends IInputMethodManager . Stub for ( int i = NUMBER0 ; i < packageNum ; ++ i ) { if ( packageInfos [ i ] . equals ( imi . getPackageName ( ) ) ) { mFileManager . addInputMethodSubtypes ( imi , subtypes ) ; - buildInputMethodListLocked ( mMethodList , mMethodMap ) ; + final long ident = Binder . clearCallingIdentity ( ) ; + try { + buildInputMethodListLocked ( mMethodList , mMethodMap ) ; + } finally { + Binder . restoreCallingIdentity ( ident ) ; + } return true ; } } <nb> public class InputMethodManagerService extends IInputMethodManager . Stub return ; } - long ident = Binder . clearCallingIdentity ( ) ; + final long ident = Binder . clearCallingIdentity ( ) ; try { setInputMethodLocked ( id , subtypeId ) ; } finally {
Fix crash in setAdditionalInputMethodSubtypes
<nb> public class SparkSqlInterpreter extends Interpreter { progressInfo = getProgressFromStage_1_1x ( sparkListener , job . finalStage ( ) ) ; } else if ( sc . version ( ) . startsWith ( STRING0 ) ) { progressInfo = getProgressFromStage_1_1x ( sparkListener , job . finalStage ( ) ) ; + } else if ( sc . version ( ) . startsWith ( STRING1 ) ) { + progressInfo = getProgressFromStage_1_1x ( sparkListener , job . finalStage ( ) ) ; } else { logger . warn ( STRING2 + sc . version ( ) ) ; continue ;
Get progress information in sql interpreter
<nb> package NAMESPACE ; import NAMESPACE ; - import NAMESPACE ; + import NAMESPACE ; import NAMESPACE ; COMMENT COMMENT COMMENT - public class CellTowerGridMarkerClusterer extends GridMarkerClusterer { + public class CellTowerGridMarkerClusterer extends RadiusMarkerClusterer { protected Context mContext ; public CellTowerGridMarkerClusterer ( Context ctx ) {
Replaced deprecated GridMarkerClusterer with RadiusMarkerClusterer
<nb> public class AndroidImportantFiles implements ImportantFiles { node . setDisplayName ( STRING0 ) ; list . add ( node ) ; } + FileObject layout = project . getProjectDirectory ( ) . getFileObject ( STRING1 ) ; + if ( layout != null ) { + Node node = DataObject . find ( layout ) . getNodeDelegate ( ) ; + node . setDisplayName ( STRING2 ) ; + list . add ( node ) ; + } + FileObject strings = project . getProjectDirectory ( ) . getFileObject ( STRING3 ) ; + if ( strings != null ) { + Node node = DataObject . find ( strings ) . getNodeDelegate ( ) ; + node . setDisplayName ( STRING4 ) ; + list . add ( node ) ; + } } catch ( DataObjectNotFoundException ex ) { Exceptions . printStackTrace ( ex ) ; }
Add layout xml and strings xml to Important Files node in Android projects
<nb> public interface Service { COMMENT COMMENT COMMENT - COMMENT - COMMENT + COMMENT + COMMENT COMMENT ListenableFuture < State > start ( ) ; <nb> public interface Service { COMMENT COMMENT COMMENT - COMMENT - COMMENT + COMMENT COMMENT ListenableFuture < State > stop ( ) ;
Bring documentation of Service
<nb> public class Main { . withDescription ( STRING0 ) . create ( STRING1 ) ; - Option analysisOption = OptionBuilder . withLongOpt ( STRING2 ) + Option analysisOption = OptionBuilder . withLongOpt ( STRING3 ) . withDescription ( STRING4 ) . create ( STRING5 ) ;
remove extra from match original